Loading...
--- libmalloc/libmalloc-792.41.1/src/internal.h
+++ libmalloc/libmalloc-715.100.22/src/internal.h
@@ -156,7 +156,6 @@
# include <os/crashlog_private.h>
# include <os/lock_private.h>
# include <os/once_private.h>
-# include <os/security_config_private.h>
#else
# include <_liblibc/_error.h>
#endif // !MALLOC_TARGET_EXCLAVES
@@ -235,10 +234,6 @@
#if !MALLOC_TARGET_EXCLAVES
# include <xlocale.h>
#endif // !MALLOC_TARGET_EXCLAVES
-
-#if !MALLOC_TARGET_EXCLAVES
-#include <corecrypto/ccsha2.h>
-#endif
#if !MALLOC_TARGET_EXCLAVES
// pthread reserves 5 TSD keys for libmalloc
@@ -297,10 +292,10 @@
# include "nanov2_zone.h"
# include "magazine_inline.h"
#endif // !MALLOC_TARGET_EXCLAVES && MALLOC_TARGET_EXCLAVES_INTROSPECTOR
-#include "xzone_malloc/xzone_introspect.h"
-#include "xzone_malloc/xzone_malloc.h"
+#include "xzone/xzone_introspect.h"
+#include "xzone/xzone_malloc.h"
#if !(MALLOC_TARGET_EXCLAVES_INTROSPECTOR && defined(__x86_64__))
-# include "xzone_malloc/xzone_inline_internal.h"
+# include "xzone/xzone_inline_internal.h"
#endif // !(MALLOC_TARGET_EXCLAVES_INTROSPECTOR && defined(__x86_64__))
#if !MALLOC_TARGET_EXCLAVES
# include "stack_logging.h"
@@ -326,10 +321,14 @@
* Resource Exception Reports are generated on process limits and
* system-critical memory pressure.
*/
+#if ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING
#define MALLOC_MEMORYSTATUS_MASK_RESOURCE_EXCEPTION_HANDLING ( \
NOTE_MEMORYSTATUS_PROC_LIMIT_WARN | \
NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL | \
NOTE_MEMORYSTATUS_PRESSURE_CRITICAL )
+#else /* ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING */
+#define MALLOC_MEMORYSTATUS_MASK_RESOURCE_EXCEPTION_HANDLING 0
+#endif
/* MallocStackLogging.framework notification dependencies */
#define MSL_MEMORYPRESSURE_MASK ( NOTE_MEMORYSTATUS_PROC_LIMIT_WARN | \
@@ -349,7 +348,8 @@
* the `_MSL` mask.
*/
#define MALLOC_MEMORYPRESSURE_MASK_DEFAULT ( NOTE_MEMORYSTATUS_MSL_STATUS | \
- MALLOC_MEMORYSTATUS_MASK_PRESSURE_RELIEF )
+ MALLOC_MEMORYSTATUS_MASK_PRESSURE_RELIEF | \
+ MALLOC_MEMORYSTATUS_MASK_RESOURCE_EXCEPTION_HANDLING )
#define MALLOC_MEMORYPRESSURE_MASK_MSL ( MALLOC_MEMORYPRESSURE_MASK_DEFAULT | \
MSL_MEMORYPRESSURE_MASK )
@@ -382,20 +382,6 @@
MALLOC_NOEXPORT
extern bool malloc_sanitizer_enabled;
-#if CONFIG_MTE
-
-MALLOC_NOEXPORT
-extern bool malloc_has_sec_transition;
-
-MALLOC_NOEXPORT
-extern uint32_t malloc_sec_transition_policy;
-
-#if !MALLOC_TARGET_EXCLAVES
-MALLOC_NOEXPORT
-extern bool malloc_sec_transition_early_malloc_support;
-#endif // !MALLOC_TARGET_EXCLAVES
-
-#endif // CONFIG_MTE
#if CONFIG_MALLOC_PROCESS_IDENTITY
MALLOC_NOEXPORT
@@ -428,8 +414,8 @@
#if !MALLOC_TARGET_EXCLAVES
MALLOC_NOEXPORT
void * __sized_by_or_null(size)
-_malloc_zone_malloc_with_options_outlined(malloc_zone_t *zone, size_t align,
- size_t size, malloc_zone_malloc_options_t options)
+_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);
#endif // !MALLOC_TARGET_EXCLAVES