Loading...
--- libmalloc/libmalloc-792.80.2/src/platform.h
+++ libmalloc/libmalloc-715.140.5/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,25 +146,35 @@
// The large last-free cache (aka. death row cache)
+#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
-#define CONFIG_LARGE_CACHE 1
# define DEFAULT_LARGE_CACHE_ENABLED true
-#else // !TARGET_OS_OSX
-#define CONFIG_LARGE_CACHE 0
+#else
# define DEFAULT_LARGE_CACHE_ENABLED false
#endif // TARGET_OS_OSX
+#else
+#define CONFIG_LARGE_CACHE 0
+#define DEFAULT_LARGE_CACHE_ENABLED false
+#endif
// Deferred reclaim
-#if (MALLOC_TARGET_IOS_ONLY && !TARGET_OS_SIMULATOR) || \
- (TARGET_OS_VISION && !TARGET_OS_SIMULATOR) || \
- (MALLOC_TARGET_64BIT && TARGET_OS_DRIVERKIT && !MALLOC_TARGET_DK_OSX) || \
- TARGET_OS_OSX
+#if CONFIG_LARGE_CACHE
+#if MALLOC_TARGET_IOS && MALLOC_TARGET_64BIT
+#define CONFIG_MAGAZINE_DEFERRED_RECLAIM 1
+#define CONFIG_XZM_DEFERRED_RECLAIM 1
+#elif TARGET_OS_OSX && !MALLOC_TARGET_DK_OSX
#define CONFIG_MAGAZINE_DEFERRED_RECLAIM 0
#define CONFIG_XZM_DEFERRED_RECLAIM 1
#else
#define CONFIG_MAGAZINE_DEFERRED_RECLAIM 0
#define CONFIG_XZM_DEFERRED_RECLAIM 0
#endif // MALLOC_TARGET_IOS && MALLOC_TARGET_64BIT
+#else
+#define CONFIG_MAGAZINE_DEFERRED_RECLAIM 0
+#define CONFIG_XZM_DEFERRED_RECLAIM 0
+#endif // CONFIG_LARGE_CACHE
#if CONFIG_MAGAZINE_DEFERRED_RECLAIM && !CONFIG_LARGE_CACHE
#error "Deferred reclaim requires large cache"
@@ -183,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
@@ -207,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
@@ -233,37 +245,6 @@
#define MALLOC_ZERO_POLICY_DEFAULT MALLOC_ZERO_ON_FREE
-#if MALLOC_TARGET_64BIT
-#define CONFIG_XZONE_MALLOC 1
-#else
-#define CONFIG_XZONE_MALLOC 0
-#endif
-
-#if CONFIG_XZONE_MALLOC && MALLOC_TARGET_IOS
-#define CONFIG_VM_USER_RANGES 1
-#else
-#define CONFIG_VM_USER_RANGES 0
-#endif
-
-#if CONFIG_XZONE_MALLOC && TARGET_CPU_ARM64 && (TARGET_OS_OSX || MALLOC_TARGET_DK_OSX)
-#define CONFIG_MACOS_RANGES 1
-#else
-#define CONFIG_MACOS_RANGES 0
-#endif
-
-#define MALLOC_XZONE_NANO_ENABLED_DEFAULT false
-
-#if CONFIG_XZONE_MALLOC && (MALLOC_TARGET_IOS || TARGET_OS_OSX || MALLOC_TARGET_DK_OSX)
-#define CONFIG_MADV_ZERO 1
-#else
-#define CONFIG_MADV_ZERO 0
-#endif
-
-#if CONFIG_XZONE_MALLOC && (MALLOC_TARGET_DK_VISIONOS || \
- MALLOC_TARGET_DK_IOS || (MALLOC_TARGET_DK_OSX && TARGET_CPU_ARM64) || \
- MALLOC_TARGET_DK_WATCH)
-#define MALLOC_XZONE_ENABLED_DEFAULT true
-#endif
#ifndef MALLOC_XZONE_ENABLED_DEFAULT
#define MALLOC_XZONE_ENABLED_DEFAULT false
@@ -275,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
@@ -287,15 +268,5 @@
#define MALLOC_SECURE_ALLOCATOR_LAUNCHD_ENABLED_DEFAULT true
-// We need to define CONFIG_MTE here in case it's not defined, as it means
-// we're compiling a target for which we're not setting it through
-// GCC_PREPROCESSOR_DEFINITIONS in the Xcode config.
-#ifndef CONFIG_MTE
-#define CONFIG_MTE 0
-#endif
-
-#ifndef HEADER_MTE
-#define HEADER_MTE CONFIG_MTE
-#endif
#endif // __PLATFORM_H