Loading...
--- libmalloc/libmalloc-317.100.9/src/platform.h
+++ libmalloc/libmalloc-166.220.1/src/platform.h
@@ -44,13 +44,12 @@
 #endif // MALLOC_TARGET_IOS
 
 // <rdar://problem/12596555>
-#define CONFIG_RECIRC_DEPOT 1
-#define CONFIG_AGGRESSIVE_MADVISE 1
-
 #if MALLOC_TARGET_IOS
-# define DEFAULT_AGGRESSIVE_MADVISE_ENABLED true
+# define CONFIG_RECIRC_DEPOT 1
+# define CONFIG_AGGRESSIVE_MADVISE 1
 #else // MALLOC_TARGET_IOS
-# define DEFAULT_AGGRESSIVE_MADVISE_ENABLED false
+# define CONFIG_RECIRC_DEPOT 1
+# define CONFIG_AGGRESSIVE_MADVISE 0
 #endif // MALLOC_TARGET_IOS
 
 // <rdar://problem/10397726>
@@ -73,18 +72,6 @@
 // This governs a last-free cache of 1 that bypasses the free-list for each region size
 #define CONFIG_TINY_CACHE 1
 #define CONFIG_SMALL_CACHE 1
-#define CONFIG_MEDIUM_CACHE 1
-
-// medium allocator enabled or disabled
-#if MALLOC_TARGET_64BIT
-#if MALLOC_TARGET_IOS
-#define CONFIG_MEDIUM_ALLOCATOR 0
-#else // MALLOC_TARGET_IOS
-#define CONFIG_MEDIUM_ALLOCATOR 1
-#endif // MALLOC_TARGET_IOS
-#else // MALLOC_TARGET_64BIT
-#define CONFIG_MEDIUM_ALLOCATOR 0
-#endif // MALLOC_TARGET_64BIT
 
 // The large last-free cache (aka. death row cache)
 #if MALLOC_TARGET_IOS
@@ -93,30 +80,22 @@
 #define CONFIG_LARGE_CACHE 1
 #endif
 
-#if CONFIG_LARGE_CACHE
-#define DEFAULT_LARGE_CACHE_ENABLED true
+// <rdar://problem/26823590> compile-time MALLOC_SMALL cut-off size
+#if MALLOC_TARGET_IOS
+#if MALLOC_TARGET_64BIT
+MALLOC_STATIC_ASSERT(PAGE_MAX_SIZE == 16 * 1024, "Expected 16k pages");
+// TODO: rdar://problem/35395572
+#define CONFIG_SMALL_CUTOFF_DYNAMIC 0
 #endif
-
-#if MALLOC_TARGET_IOS
-// The VM system on iOS forces malloc-tagged memory to never be marked as
-// copy-on-write, this would include calls we make to vm_copy. Given that the
-// kernel would just be doing a memcpy, we force it to happen in userpsace.
-#define CONFIG_REALLOC_CAN_USE_VMCOPY 0
 #else
-#define CONFIG_REALLOC_CAN_USE_VMCOPY 1
-#endif
+#define CONFIG_SMALL_CUTOFF_LARGEMEM 1
+#endif // MALLOC_TARGET_IOS
 
 // 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
-#define CONFIG_FEATUREFLAGS_SIMPLE 0
 #endif
 
 // presence of commpage memsize
@@ -126,7 +105,6 @@
 #define CONFIG_HAS_COMMPAGE_NCPUS 1
 
 // Use of hyper-shift for magazine selection.
-#define CONFIG_NANO_USES_HYPER_SHIFT 0
 #define CONFIG_TINY_USES_HYPER_SHIFT 0
 #define CONFIG_SMALL_USES_HYPER_SHIFT 0