--- libmalloc/libmalloc-521.100.59/src/internal.h
+++ libmalloc/libmalloc-715.120.13/src/internal.h
@@ -93,6 +93,7 @@
 	uint64_t opaque[2];
 } plat_map_exclaves_t;
 #if !MALLOC_TARGET_EXCLAVES
+# include <mach/error.h>
 # include <mach/mach.h>
 # include <mach/mach_init.h>
 # include <mach/mach_time.h>
@@ -104,12 +105,16 @@
 # include <mach/vm_page_size.h>
 # include <mach/vm_param.h>
 # include <mach/vm_reclaim.h>
+# include <mach/vm_reclaim_private.h>
 # include <mach/vm_statistics.h>
 # include <machine/cpu_capabilities.h>
 
 # if !MALLOC_TARGET_EXCLAVES_INTROSPECTOR
 typedef void plat_map_t;
 # else
+#  if !defined(__x86_64__)
+#   include <l4/l4.h>
+#  endif // !defined(__x86_64__)
 typedef plat_map_exclaves_t plat_map_t;
 # endif // !MALLOC_TARGET_EXCLAVES_INTROSPECTOR
 #else
@@ -121,6 +126,7 @@
 # define vm_page_size PAGE_SIZE
 # define PAGE_MASK (PAGE_SIZE-1)
 
+typedef uint64_t mach_vm_reclaim_id_t;
 # define mach_vm_round_page(x) (((mach_vm_offset_t)(x) + PAGE_MASK) & ~((signed)PAGE_MASK))
 # define round_page(x) (((vm_offset_t)(x) + PAGE_MASK) & ~((vm_offset_t)PAGE_MASK))
 
@@ -167,6 +173,7 @@
 # include <pthread/private.h>  // _pthread_threadid_self_np_direct()
 # include <pthread/tsd_private.h>  // TSD keys
 #else
+# include <platform/platform.h>
 # include <pthread.h>
 #endif // !MALLOC_TARGET_EXCLAVES
 
@@ -202,11 +209,13 @@
 #include <sys/mman.h>
 #include <sys/queue.h>
 #if !MALLOC_TARGET_EXCLAVES
+# include <sys/codesign.h>
 # include <sys/event.h>
 # include <sys/param.h>
 # include <sys/stat.h>
 # include <sys/sysctl.h>
 # include <sys/random.h>
+# include <sys/csr.h>
 #else
 # include <vas/vas.h>
 # define howmany(x, y)   ((((x) % (y)) == 0) ? ((x) / (y)) : (((x) / (y)) + 1))
@@ -214,6 +223,7 @@
 # define roundup(x, y) ((((x) % (y)) == 0) ? \
 					   (x) : ((x) + ((y) - ((x) % (y)))))
 #endif // !MALLOC_TARGET_EXCLAVES
+#define rounddown(x,y)  (((x)/(y))*(y))
 #include <sys/types.h>
 #if !MALLOC_TARGET_EXCLAVES
 # include <sys/ulock.h>
@@ -231,7 +241,7 @@
 # define __TSD_MALLOC_ZERO_CORRUPTION_COUNTER   __PTK_LIBMALLOC_KEY1
 # define __TSD_MALLOC_THREAD_OPTIONS            __PTK_LIBMALLOC_KEY2
 # define __TSD_MALLOC_TYPE_DESCRIPTOR           __PTK_LIBMALLOC_KEY3
-# define __TSD_MALLOC_UNUSED4                   __PTK_LIBMALLOC_KEY4
+# define __TSD_MALLOC_XZONE_THREAD_CACHE        __PTK_LIBMALLOC_KEY4
 #else
 # include "liblibc_overrides.h"
 # define __TSD_MALLOC_TYPE_DESCRIPTOR           __LIBLIBC_XZONE_TSS_KEY
@@ -252,8 +262,8 @@
 #endif // !MALLOC_TARGET_EXCLAVES
 #include "malloc/malloc.h"
 #include "early_malloc.h"
-#if !MALLOC_TARGET_EXCLAVES
-# include "instrumentation.h"
+#include "instrumentation.h"
+#if !MALLOC_TARGET_EXCLAVES
 # include "frozen_malloc.h"
 # include "legacy_malloc.h"
 # include "magazine_malloc.h"
@@ -284,7 +294,9 @@
 #endif // !MALLOC_TARGET_EXCLAVES && MALLOC_TARGET_EXCLAVES_INTROSPECTOR
 #include "xzone/xzone_introspect.h"
 #include "xzone/xzone_malloc.h"
-#include "xzone/xzone_inline_internal.h"
+#if !(MALLOC_TARGET_EXCLAVES_INTROSPECTOR && defined(__x86_64__))
+# include "xzone/xzone_inline_internal.h"
+#endif // !(MALLOC_TARGET_EXCLAVES_INTROSPECTOR && defined(__x86_64__))
 #if !MALLOC_TARGET_EXCLAVES
 # include "stack_logging.h"
 # include "stack_trace.h"
@@ -297,11 +309,11 @@
  *  - freed pages are not aggressively madvised by default
  *  - the large cache is enabled (and not enrolled in deferred reclamation)
  */
-#if CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_DEFERRED_RECLAIM)
+#if CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_MAGAZINE_DEFERRED_RECLAIM)
 #define MALLOC_MEMORYSTATUS_MASK_PRESSURE_RELIEF ( \
 		NOTE_MEMORYSTATUS_PRESSURE_WARN | \
 		NOTE_MEMORYSTATUS_PRESSURE_NORMAL)
-#else /* CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_DEFERRED_RECLAIM) */
+#else /* CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_MAGAZINE_DEFERRED_RECLAIM) */
 #define MALLOC_MEMORYSTATUS_MASK_PRESSURE_RELIEF 0
 #endif
 
@@ -377,31 +389,31 @@
 #endif
 
 MALLOC_NOEXPORT
-void *
+void * __sized_by_or_null(size)
 _malloc_zone_malloc(malloc_zone_t *zone, size_t size, malloc_zone_options_t mzo) __alloc_size(2);
 
 MALLOC_NOEXPORT
-void *
+void * __sized_by_or_null(num_items * size)
 _malloc_zone_calloc(malloc_zone_t *zone, size_t num_items, size_t size, malloc_zone_options_t mzo) __alloc_size(2,3);
 
 MALLOC_NOEXPORT
-void *
+void * __sized_by_or_null(size)
 _malloc_zone_valloc(malloc_zone_t *zone, size_t size, malloc_zone_options_t mzo) __alloc_size(2);
 
 MALLOC_NOEXPORT
-void *
+void * __sized_by_or_null(size)
 _malloc_zone_realloc(malloc_zone_t *zone, void * __unsafe_indexable ptr,
 		size_t size, malloc_type_descriptor_t type_desc) __alloc_size(3);
 
 MALLOC_NOEXPORT
-void *
+void * __sized_by_or_null(size)
 _malloc_zone_memalign(malloc_zone_t *zone, size_t alignment, size_t size,
 		malloc_zone_options_t mzo, malloc_type_descriptor_t type_desc)
 		 __alloc_align(2) __alloc_size(3);
 
 #if !MALLOC_TARGET_EXCLAVES
 MALLOC_NOEXPORT
-void *
+void * __sized_by_or_null(size)
 _malloc_zone_malloc_with_options_np_outlined(malloc_zone_t *zone, size_t align,
 		size_t size, malloc_options_np_t options)
 		__alloc_align(2) __alloc_size(3);
@@ -419,8 +431,13 @@
 #endif // DARWINTEST || MALLOC_BUILDING_XCTESTS
 
 MALLOC_NOEXPORT
-void *
+void * __sized_by_or_null(new_size)
 _realloc(void * __unsafe_indexable in_ptr, size_t new_size) __alloc_size(2);
+
+MALLOC_NOEXPORT
+malloc_zone_t *
+find_registered_zone(const void * __unsafe_indexable ptr, size_t *returned_size,
+		bool known_non_default);
 
 MALLOC_NOEXPORT
 int
@@ -463,7 +480,23 @@
 #endif // TARGET_OS_SIMULATOR
 }
 
-#if CONFIG_MAGAZINE_PER_CLUSTER
+#if !MALLOC_TARGET_EXCLAVES
+typedef union {
+	malloc_thread_options_t options;
+	void *storage;
+} th_opts_t;
+
+MALLOC_STATIC_ASSERT(sizeof(th_opts_t) == sizeof(void *), "Options fit into pointer bits");
+
+static inline void
+_malloc_set_thread_options(malloc_thread_options_t opts)
+{
+	th_opts_t x = {.options = opts};
+	_pthread_setspecific_direct(__TSD_MALLOC_THREAD_OPTIONS, x.storage);
+}
+#endif // MALLOC_TARGET_EXCLAVES
+
+#if CONFIG_CLUSTER_AWARE
 
 static inline unsigned int
 _malloc_cpu_cluster_number(void)
@@ -485,7 +518,7 @@
 #endif
 }
 
-#endif // CONFIG_MAGAZINE_PER_CLUSTER
+#endif // CONFIG_CLUSTER_AWARE
 
 // Gets the allocation size for a calloc(). Multiples size by num_items and adds
 // extra_size, storing the result in *total_size. Returns 0 on success, -1 (with
@@ -542,7 +575,6 @@
 typedef void (*set_msl_lite_hooks_callout_t) (struct _malloc_msl_lite_hooks_s *hooksp, size_t size);
 void set_msl_lite_hooks(set_msl_lite_hooks_callout_t callout);
 
-
 static MALLOC_INLINE void
 yield(void)
 {
@@ -554,4 +586,16 @@
 #endif // !MALLOC_TARGET_EXCLAVES
 }
 
+#if CONFIG_FEATUREFLAGS_SIMPLE
+#if TARGET_OS_SIMULATOR
+#define malloc_secure_feature_enabled(name, fallback, simulator_default) \
+	(simulator_default)
+#else
+// TODO: Do we want the secure fallback to be the same as the no-ff fallback?
+#define malloc_secure_feature_enabled(name, fallback, simulator_default) \
+	(malloc_internal_security_policy ? \
+			os_feature_enabled_simple(libmalloc, name, fallback) : (fallback))
+#endif // TARGET_OS_SIMULATOR
+#endif // CONFIG_FEATUREFLAGS_SIMPLE
+
 #endif // __INTERNAL_H