Move init check earlier. This will allow for zero init of the global …

…allocator.
microsoft · Mar 20, 2020 · f2da4ff · f2da4ff
1 parent 04e74c4
commit f2da4ff
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/src/mem/alloc.h b/src/mem/alloc.h
@@ -1062,17 +1062,21 @@ namespace snmalloc
 
       Slab* slab;
 
-      if (likely(!sl.is_empty()))
+      if (likely(!NeedsInitialisation(this)))
       {
-        stats().sizeclass_alloc(sizeclass);
+        if (likely(!sl.is_empty()))
+        {
+          stats().sizeclass_alloc(sizeclass);
 
-        SlabLink* link = sl.get_next();
-        slab = get_slab(link);
-        auto& ffl = small_fast_free_lists[sizeclass];
-        return slab->alloc<zero_mem>(
-          sl, ffl, rsize, large_allocator.memory_provider);
+          SlabLink* link = sl.get_next();
+          slab = get_slab(link);
+          auto& ffl = small_fast_free_lists[sizeclass];
+          return slab->alloc<zero_mem>(
+            sl, ffl, rsize, large_allocator.memory_provider);
+        }
+        return small_alloc_rare<zero_mem, allow_reserve>(sizeclass);
       }
-      return small_alloc_rare<zero_mem, allow_reserve>(sizeclass);
+      return small_alloc_first_alloc<zero_mem, allow_reserve>(sizeclass);
     }
 
     /**
@@ -1083,12 +1087,8 @@ namespace snmalloc
     template<ZeroMem zero_mem, AllowReserve allow_reserve>
     SNMALLOC_SLOW_PATH void* small_alloc_rare(sizeclass_t sizeclass)
     {
-      if (likely(!NeedsInitialisation(this)))
-      {
-        stats().sizeclass_alloc(sizeclass);
-        return small_alloc_new_free_list<zero_mem, allow_reserve>(sizeclass);
-      }
-      return small_alloc_first_alloc<zero_mem, allow_reserve>(sizeclass);
+      stats().sizeclass_alloc(sizeclass);
+      return small_alloc_new_free_list<zero_mem, allow_reserve>(sizeclass);
     }
 
     /**