[autofix.ci] apply automated fixes

Author: autofix-ci[bot]

.github/workflows/ci.yml

@@ -314,7 +314,8 @@ jobs:
         if: steps.filter.outputs.src == 'true'
         run: |
           cargo allocs
-          git diff --exit-code
+          git diff --exit-code ||
+          (echo 'Allocations have changed. Run the `cargo allocs` command to update the allocation snapshot, otherwise please fix the regression.' && exit 1)
 
   ast_changes:
     name: AST Changes

crates/oxc_allocator/Cargo.toml

@@ -41,3 +41,4 @@ disable_fixed_size = []
 from_raw_parts = []
 serialize = ["dep:serde", "oxc_estree/serialize"]
 track_allocations = []
+disable_track_allocations = []

crates/oxc_allocator/src/alloc.rs

@@ -95,6 +95,25 @@ impl Alloc for Bump {
     /// Panics if reserving space for `layout` fails.
     #[inline(always)]
     fn alloc(&self, layout: Layout) -> NonNull<u8> {
+        // SAFETY: We only use `Bump` inside of `Allocator` in oxc, so the `self` reference should
+        // also be pointing to a valid `Allocator` struct, which we can use for finding the stats fields.
+        // This will go away when we add a custom allocator to oxc.
+        #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+        unsafe {
+            use crate::Allocator;
+            use std::{
+                mem::offset_of,
+                ptr,
+                sync::atomic::{AtomicUsize, Ordering},
+            };
+            #[expect(clippy::cast_possible_wrap)]
+            const OFFSET: isize = (offset_of!(Allocator, num_alloc) as isize)
+                - (offset_of!(Allocator, bump) as isize);
+            let num_alloc_ptr = ptr::from_ref(self).byte_offset(OFFSET).cast::<AtomicUsize>();
+            let num_alloc = num_alloc_ptr.as_ref().unwrap_unchecked();
+            num_alloc.fetch_add(1, Ordering::SeqCst);
+        }
+
         self.alloc_layout(layout)
     }
 
@@ -133,6 +152,25 @@ impl Alloc for Bump {
     /// Panics / aborts if reserving space for `new_layout` fails.
     #[inline(always)]
     unsafe fn grow(&self, ptr: NonNull<u8>, old_layout: Layout, new_layout: Layout) -> NonNull<u8> {
+        // SAFETY: We only use `Bump` inside of `Allocator` in oxc, so the `self` reference should
+        // also be pointing to a valid `Allocator` struct, which we can use for finding the stats fields.
+        // This will go away when we add a custom allocator to oxc.
+        #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+        unsafe {
+            use crate::Allocator;
+            use std::{
+                mem::offset_of,
+                ptr,
+                sync::atomic::{AtomicUsize, Ordering},
+            };
+            #[expect(clippy::cast_possible_wrap)]
+            const OFFSET: isize = (offset_of!(Allocator, num_realloc) as isize)
+                - (offset_of!(Allocator, bump) as isize);
+            let num_realloc_ptr = ptr::from_ref(self).byte_offset(OFFSET).cast::<AtomicUsize>();
+            let num_realloc = num_realloc_ptr.as_ref().unwrap_unchecked();
+            num_realloc.fetch_add(1, Ordering::SeqCst);
+        }
+
         // SAFETY: Safety requirements of `Allocator::grow` are the same as for this method
         let res = unsafe { Allocator::grow(&self, ptr, old_layout, new_layout) };
         match res {

crates/oxc_allocator/src/allocator.rs

@@ -8,14 +8,6 @@ use bumpalo::Bump;
 
 use oxc_data_structures::assert_unchecked;
 
-#[cfg(feature = "track_allocations")]
-use std::sync::atomic::{
-    AtomicUsize,
-    Ordering::{Relaxed, SeqCst},
-};
-#[cfg(feature = "track_allocations")]
-static NUM_ALLOC: AtomicUsize = AtomicUsize::new(0);
-
 /// A bump-allocated memory arena.
 ///
 /// # Anatomy of an Allocator
@@ -222,7 +214,20 @@ static NUM_ALLOC: AtomicUsize = AtomicUsize::new(0);
 /// [`HashMap::new_in`]: crate::HashMap::new_in
 #[derive(Default)]
 pub struct Allocator {
+    #[cfg(not(all(feature = "track_allocations", not(feature = "disable_track_allocations"))))]
     bump: Bump,
+    // NOTE: We need to expose `bump` publicly here for calculating its field offset in memory.
+    #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+    #[doc(hidden)]
+    pub bump: Bump,
+    /// Used to track the total number of allocations made in this allocator when the `track_allocations` feature is enabled.
+    #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+    #[doc(hidden)]
+    pub num_alloc: std::sync::atomic::AtomicUsize,
+    /// Used to track the total number of re-allocations made in this allocator when the `track_allocations` feature is enabled.
+    #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+    #[doc(hidden)]
+    pub num_realloc: std::sync::atomic::AtomicUsize,
 }
 
 impl Allocator {
@@ -249,7 +254,13 @@ impl Allocator {
     #[expect(clippy::inline_always)]
     #[inline(always)]
     pub fn new() -> Self {
-        Self { bump: Bump::new() }
+        Self {
+            bump: Bump::new(),
+            #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+            num_alloc: std::sync::atomic::AtomicUsize::new(0),
+            #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+            num_realloc: std::sync::atomic::AtomicUsize::new(0),
+        }
     }
 
     /// Create a new [`Allocator`] with specified capacity.
@@ -260,7 +271,13 @@ impl Allocator {
     #[expect(clippy::inline_always)]
     #[inline(always)]
     pub fn with_capacity(capacity: usize) -> Self {
-        Self { bump: Bump::with_capacity(capacity) }
+        Self {
+            bump: Bump::with_capacity(capacity),
+            #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+            num_alloc: std::sync::atomic::AtomicUsize::new(0),
+            #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+            num_realloc: std::sync::atomic::AtomicUsize::new(0),
+        }
     }
 
     /// Allocate an object in this [`Allocator`] and return an exclusive reference to it.
@@ -284,10 +301,9 @@ impl Allocator {
     pub fn alloc<T>(&self, val: T) -> &mut T {
         const { assert!(!std::mem::needs_drop::<T>(), "Cannot allocate Drop type in arena") };
 
-        #[cfg(feature = "track_allocations")]
-        {
-            NUM_ALLOC.fetch_add(1, Relaxed);
-        }
+        #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+        self.num_alloc.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+
         self.bump.alloc(val)
     }
 
@@ -309,10 +325,9 @@ impl Allocator {
     #[expect(clippy::inline_always)]
     #[inline(always)]
     pub fn alloc_str<'alloc>(&'alloc self, src: &str) -> &'alloc str {
-        #[cfg(feature = "track_allocations")]
-        {
-            NUM_ALLOC.fetch_add(1, Relaxed);
-        }
+        #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+        self.num_alloc.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+
         self.bump.alloc_str(src)
     }
 
@@ -333,10 +348,9 @@ impl Allocator {
     #[expect(clippy::inline_always)]
     #[inline(always)]
     pub fn alloc_slice_copy<T: Copy>(&self, src: &[T]) -> &mut [T] {
-        #[cfg(feature = "track_allocations")]
-        {
-            NUM_ALLOC.fetch_add(1, Relaxed);
-        }
+        #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+        self.num_alloc.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+
         self.bump.alloc_slice_copy(src)
     }
 
@@ -349,10 +363,9 @@ impl Allocator {
     ///
     /// Panics if reserving space matching `layout` fails.
     pub fn alloc_layout(&self, layout: Layout) -> NonNull<u8> {
-        #[cfg(feature = "track_allocations")]
-        {
-            NUM_ALLOC.fetch_add(1, Relaxed);
-        }
+        #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+        self.num_alloc.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+
         self.bump.alloc_layout(layout)
     }
 
@@ -403,10 +416,8 @@ impl Allocator {
             "attempted to create a string longer than `isize::MAX` bytes"
         );
 
-        #[cfg(feature = "track_allocations")]
-        {
-            NUM_ALLOC.fetch_add(1, Relaxed);
-        }
+        #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+        self.num_alloc.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
 
         // Create actual `&str` in a separate function, to ensure that `alloc_concat_strs_array`
         // is inlined, so that compiler has knowledge to remove the overflow checks above.
@@ -500,10 +511,12 @@ impl Allocator {
     #[expect(clippy::inline_always)]
     #[inline(always)]
     pub fn reset(&mut self) {
-        #[cfg(feature = "track_allocations")]
+        #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
         {
-            NUM_ALLOC.store(0, SeqCst);
+            self.num_alloc.store(0, std::sync::atomic::Ordering::SeqCst);
+            self.num_realloc.store(0, std::sync::atomic::Ordering::SeqCst);
         }
+
         self.bump.reset();
     }
 
@@ -604,12 +617,6 @@ impl Allocator {
         bytes
     }
 
-    /// Returns the total number of allocations that have been made in this [`Allocator`] instance.
-    #[cfg(feature = "track_allocations")]
-    pub fn num_alloc() -> usize {
-        NUM_ALLOC.load(SeqCst)
-    }
-
     /// Get inner [`bumpalo::Bump`].
     ///
     /// This method is not public. We don't want to expose `Bump` to user.
@@ -631,7 +638,13 @@ impl Allocator {
     #[expect(clippy::inline_always)]
     #[inline(always)]
     pub(crate) fn from_bump(bump: Bump) -> Self {
-        Self { bump }
+        Self {
+            bump,
+            #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+            num_alloc: std::sync::atomic::AtomicUsize::new(0),
+            #[cfg(all(feature = "track_allocations", not(feature = "disable_track_allocations")))]
+            num_realloc: std::sync::atomic::AtomicUsize::new(0),
+        }
     }
 }
 

crates/oxc_parser/Cargo.toml

@@ -48,5 +48,3 @@ default = ["regular_expression"]
 regular_expression = ["dep:oxc_regular_expression"]
 # Expose Lexer for benchmarks
 benchmarking = []
-# Enable tracking arena and system allocations
-track_allocations = ["oxc_allocator/track_allocations"]

tasks/allocs/Cargo.toml

@@ -25,3 +25,6 @@ oxc_tasks_common = { workspace = true }
 humansize = { workspace = true }
 mimalloc-safe = { workspace = true }
 
+[features]
+# Sentinel flag that should only get enabled if we're running under `--all-features`
+is_all_features = []

tasks/allocs/allocs_parser.snap

@@ -1,8 +1,14 @@
-File                       | File size    | Sys allocs   | Sys bytes    | Sys ratio    | Arena allocs | Arena bytes  | Arena ratio  |
--------------------------------------------------------------------------------------------------------------------------------------
-checker.ts                 | 2.92 MB      |        10176 | 17.60 MB     | 6.02         |       228746 | 12.47 MB     | 4.27        
-cal.com.tsx                | 1.06 MB      |         2209 | 279.52 kB    | 0.26         |       113688 | 7.79 MB      | 7.37        
-RadixUIAdoptionSection.jsx | 2.52 kB      |            4 | 724 B        | 0.29         |          310 | 19.10 kB     | 7.58        
-pdf.mjs                    | 567.30 kB    |          688 | 55.86 kB     | 0.10         |        77969 | 4.31 MB      | 7.59        
-antd.js                    | 4.12 MB      |         6862 | 50.83 MB     | 12.34        |       425919 | 25.57 MB     | 6.21        
-binder.ts                  | 193.08 kB    |          540 | 43.75 kB     | 0.23         |        14376 | 873.70 kB    | 4.53        
+File                       | File size       || Sys allocs      | Sys reallocs    || Arena allocs    | Arena reallocs  | Arena bytes     
+--------------------------------------------------------------------------------------------------------------------------------------------------
+checker.ts                 | 2.92 MB         ||           10161 | 21 slow / 21    ||          268665 |           23341 | 12.42 MB       
+
+cal.com.tsx                | 1.06 MB         ||            2209 | 54 slow / 54    ||          138188 |           13712 | 7.79 MB        
+
+RadixUIAdoptionSection.jsx | 2.52 kB         ||               4 | 0 slow / 0      ||             365 |              66 | 19.10 kB       
+
+pdf.mjs                    | 567.30 kB       ||             688 | 71 slow / 71    ||           90678 |            8148 | 4.31 MB        
+
+antd.js                    | 4.12 MB         ||            6860 | 282 slow / 282  ||          509752 |           55282 | 25.57 MB       
+
+binder.ts                  | 193.08 kB       ||             540 | 7 slow / 7      ||           16807 |            1475 | 873.70 kB      
+