--- libmalloc/libmalloc-792.80.2/src/nanov2_zone.h
+++ libmalloc/libmalloc-317.40.8/src/nanov2_zone.h
@@ -29,22 +29,21 @@
 #pragma mark -
 #pragma mark Address Structure
 
-#if TARGET_OS_OSX || TARGET_OS_SIMULATOR || MALLOC_TARGET_DK_OSX
+#if TARGET_OS_OSX || TARGET_OS_SIMULATOR || TARGET_OS_DRIVERKIT
 
 #define NANOV2_REGION_BITS		15
 #define NANOV2_ARENA_BITS		3
 #define NANOV2_BLOCK_BITS		12
 #define NANOV2_OFFSET_BITS		14
 
-#else // TARGET_OS_OSX || TARGET_OS_SIMULATOR || MALLOC_TARGET_DK_OSX
+#else // TARGET_OS_OSX || TARGET_OS_SIMULATOR || TARGET_OS_DRIVERKIT
 
 #define NANOV2_REGION_BITS		0
 #define NANOV2_ARENA_BITS		3
 #define NANOV2_BLOCK_BITS		12
 #define NANOV2_OFFSET_BITS		14
 
-#endif // TARGET_OS_OSX || TARGET_OS_SIMULATOR || MALLOC_TARGET_DK_OSX
-
+#endif // TARGET_OS_OSX || TARGET_OS_SIMULATOR || TARGET_OS_DRIVERKIT
 
 #if NANOV2_REGION_BITS > 0
 #define NANOV2_MULTIPLE_REGIONS	1
@@ -70,7 +69,7 @@
 // Maximum number of slots per block
 #define NANOV2_MAX_SLOTS_PER_BLOCK	(NANOV2_BLOCK_SIZE/NANO_REGIME_QUANTA_SIZE)
 
-// Highest region number supported by this signature
+// Highest region number.
 #if NANOV2_MULTIPLE_REGIONS
 #define NANOV2_MAX_REGION_NUMBER	((1 << NANOV2_REGION_BITS) - 1)
 #else 	// NANOV2_MULTIPLE_REGIONS
@@ -182,10 +181,8 @@
 // Structure overlaid on slots that are on the block freelist.
 typedef struct {
     uint64_t double_free_guard;
-    uint64_t next_slot; // Legal values are <= NEXT_SLOT_VALID_MASK
+    uint16_t next_slot;
 } nanov2_free_slot_t;
-
-#define NEXT_SLOT_VALID_MASK 0x7ff
 
 MALLOC_STATIC_ASSERT(
 		sizeof(nanov2_free_slot_t) <= NANO_REGIME_QUANTA_SIZE,
@@ -207,10 +204,8 @@
 
 // Linkage between regions. Overlays the nanov2_block_meta_t that corresponds
 // to the arena metadata block, so must be the same size as nanov2_block_meta_t.
-// Accessed atomically when walking the regions.
-typedef struct {
-	// Offset to next region in 512MB blocks
-	os_atomic(uint16_t) next_region_offset;
+typedef struct {
+    uint16_t next_region_offset;	// Offset to next region in 512MB blocks
 	uint16_t unused;
 } nanov2_region_linkage_t;
 
@@ -262,6 +257,9 @@
 	// Locks for the current allocation blocks.
 	_malloc_lock_s		current_block_lock[NANO_SIZE_CLASSES][MAX_CURRENT_BLOCKS];
 
+	// Lock for delegate_allocations.
+	_malloc_lock_s		delegate_allocations_lock;
+
 	// Mask of size classes for which allocation should be delegated when a new
 	// block is needed and the class has become full.
 	uint16_t			delegate_allocations;
@@ -283,22 +281,23 @@
 	// Lock used to serialize access to current_block.
 	_malloc_lock_s		blocks_lock;
 
-	// Lock used to protect modification of current_region_next_arena.
+	// Lock used to protect current_region_base, current_region_next_arena and
+	// current_region_limit.
 	_malloc_lock_s		regions_lock;
 	
 	// Base address of the first region. Fixed once set.
 	nanov2_region_t 	*first_region_base;
 	
-	// Address to use for the next arena, or the limit arena of the current
-	// region (i.e. the first byte after the end of the current region) if the
-	// current region is full. This is always the upper bound on addresses that
-	// can possibly be allocated from nano. When a new region is allocated, this
-	// is set directly to the _second_ arena of the new region, so a value on a
-	// region boundary is always a limit arena rather than a first arena.
-	//
-	// Modified under the protection of the regions_lock but atomically loaded
-	// outside of it from fast-path contexts; access with care.
-	os_atomic(nanov2_arena_t *) current_region_next_arena;
+	// Base address of the current region. Always the most recently allocated
+	// region and therefore the one with the highest base address.
+	nanov2_region_t 	*current_region_base;
+	
+	// Address to use for the next arena. Always between current_region_base
+	// and current_region_limit.
+	nanov2_arena_t		*current_region_next_arena;
+	
+ 	// Limit address of the current region (first byte after the region).
+ 	void				*current_region_limit;
 	
 	// Lock used when madvising.
 	_malloc_lock_s		madvise_lock;