Loading...
--- libmalloc/libmalloc-792.1.1/src/platform.h
+++ libmalloc/libmalloc-715.100.22/src/platform.h
@@ -37,10 +37,6 @@
 #ifndef MALLOC_TARGET_DK_VISIONOS
 #define MALLOC_TARGET_DK_VISIONOS 0
 #endif // MALLOC_TARGET_DK_VISIONOS
-
-#ifndef MALLOC_TARGET_DK_WATCH
-#define MALLOC_TARGET_DK_WATCH 0
-#endif // MALLOC_TARGET_DK_WATCH
 
 #ifndef MALLOC_TARGET_EXCLAVES_INTROSPECTOR
 #define MALLOC_TARGET_EXCLAVES_INTROSPECTOR 0
@@ -150,7 +146,7 @@
 
 
 // The large last-free cache (aka. death row cache)
-#if (TARGET_OS_IOS || TARGET_OS_VISION) || TARGET_OS_OSX || \
+#if (TARGET_OS_IOS && !TARGET_OS_VISION) || TARGET_OS_OSX || \
 		TARGET_OS_SIMULATOR || TARGET_OS_DRIVERKIT
 #define CONFIG_LARGE_CACHE 1
 #if TARGET_OS_OSX
@@ -165,11 +161,10 @@
 
 // Deferred reclaim
 #if CONFIG_LARGE_CACHE
-#if (MALLOC_TARGET_IOS_ONLY && !TARGET_OS_SIMULATOR) || \
-		(MALLOC_TARGET_64BIT && TARGET_OS_DRIVERKIT && !MALLOC_TARGET_DK_OSX)
+#if MALLOC_TARGET_IOS && MALLOC_TARGET_64BIT
 #define CONFIG_MAGAZINE_DEFERRED_RECLAIM 1
 #define CONFIG_XZM_DEFERRED_RECLAIM 1
-#elif TARGET_OS_OSX || (TARGET_OS_VISION && !TARGET_OS_SIMULATOR)
+#elif TARGET_OS_OSX && !MALLOC_TARGET_DK_OSX
 #define CONFIG_MAGAZINE_DEFERRED_RECLAIM 0
 #define CONFIG_XZM_DEFERRED_RECLAIM 1
 #else
@@ -194,6 +189,13 @@
 #define CONFIG_REALLOC_CAN_USE_VMCOPY 1
 #endif
 
+// memory resource exception handling
+#if MALLOC_TARGET_IOS || TARGET_OS_SIMULATOR
+#define ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING 0
+#else
+#define ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING 1
+#endif
+
 #if !TARGET_OS_DRIVERKIT && (!TARGET_OS_OSX || MALLOC_TARGET_64BIT)
 #define CONFIG_FEATUREFLAGS_SIMPLE 1
 #else
@@ -218,8 +220,7 @@
 // Support cluster-aware policies in xzone malloc
 #if ((TARGET_OS_IOS || TARGET_OS_VISION) && !TARGET_OS_SIMULATOR) || \
 		MALLOC_TARGET_DK_IOS || MALLOC_TARGET_DK_VISIONOS || \
-		TARGET_OS_OSX || MALLOC_TARGET_DK_OSX || \
-		(TARGET_OS_WATCH && !TARGET_OS_SIMULATOR) || MALLOC_TARGET_DK_WATCH
+		TARGET_OS_OSX || MALLOC_TARGET_DK_OSX
 #define CONFIG_XZM_CLUSTER_AWARE 1
 #else
 #define CONFIG_XZM_CLUSTER_AWARE 0
@@ -255,7 +256,7 @@
 #define CONFIG_EARLY_MALLOC 0
 #endif
 
-#if MALLOC_TARGET_IOS_ONLY || TARGET_OS_VISION || TARGET_OS_OSX || TARGET_OS_WATCH
+#if MALLOC_TARGET_IOS_ONLY || TARGET_OS_VISION || TARGET_OS_OSX
 #define CONFIG_MALLOC_PROCESS_IDENTITY 1
 #else
 #define CONFIG_MALLOC_PROCESS_IDENTITY 0