Revert "chore: cleanup object_id"

This reverts commit c5aec4b.

Author: kermanx

crates/tree_shaker/src/entity/array.rs

@@ -1,6 +1,6 @@
 use super::{
-  consumed_object, object::alloc_object_id, Entity, EntityTrait, EnumeratedProperties,
-  IteratedElements, LiteralEntity, ObjectId, TypeofResult,
+  consumed_object, Entity, EntityTrait, EnumeratedProperties, IteratedElements, LiteralEntity,
+  ObjectId, TypeofResult,
 };
 use crate::{
   analyzer::Analyzer,
@@ -382,6 +382,6 @@ impl<'a> ArrayEntity<'a> {
 
 impl<'a> Analyzer<'a> {
   pub fn new_empty_array(&mut self) -> &'a mut ArrayEntity<'a> {
-    self.factory.array(self.scoping.cf.current_id(), alloc_object_id())
+    self.factory.array(self.scoping.cf.current_id(), self.scoping.alloc_object_id())
   }
 }

crates/tree_shaker/src/entity/object/mod.rs

@@ -49,11 +49,6 @@ define_index_type! {
   pub struct ObjectId = u32;
 }
 
-pub fn alloc_object_id<'a>() -> ObjectId {
-  static COUNTER: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(128);
-  ObjectId::from(COUNTER.fetch_add(1, std::sync::atomic::Ordering::Relaxed))
-}
-
 #[derive(Debug)]
 pub struct ObjectEntity<'a> {
   /// A built-in object is usually non-consumable
@@ -314,7 +309,7 @@ impl<'a> Analyzer<'a> {
       consumed_as_prototype: Cell::new(false),
       // deps: Default::default(),
       cf_scope: self.scoping.cf.current_id(),
-      object_id: alloc_object_id(),
+      object_id: self.scoping.alloc_object_id(),
       string_keyed: RefCell::new(FxHashMap::default()),
       unknown_keyed: RefCell::new(ObjectProperty::default()),
       rest: RefCell::new(None),

crates/tree_shaker/src/scope/mod.rs

@@ -12,7 +12,7 @@ use crate::{
   analyzer::Analyzer,
   consumable::{Consumable, ConsumableTrait, ConsumableVec},
   dep::DepId,
-  entity::{Entity, EntityFactory},
+  entity::{Entity, EntityFactory, ObjectId},
   module::ModuleId,
   utils::{CalleeInfo, CalleeNode},
 };
@@ -29,12 +29,16 @@ pub struct Scoping<'a> {
   pub variable: ScopeTree<VariableScopeId, VariableScope<'a>>,
   pub cf: ScopeTree<CfScopeId, CfScope<'a>>,
   pub pure: usize,
+
+  pub object_scope_id: VariableScopeId,
+  pub object_symbol_counter: usize,
 }
 
 impl<'a> Scoping<'a> {
   pub fn new(factory: &EntityFactory<'a>) -> Self {
     let mut variable = ScopeTree::new();
     variable.push(VariableScope::new_with_this(factory.unknown()));
+    let object_scope_id = variable.add_special(VariableScope::new());
     let mut cf = ScopeTree::new();
     cf.push(CfScope::new(CfScopeKind::Root, vec![], Some(false)));
     Scoping {
@@ -56,6 +60,9 @@ impl<'a> Scoping<'a> {
       variable,
       cf,
       pure: 0,
+
+      object_scope_id,
+      object_symbol_counter: 128,
     }
   }
 
@@ -74,6 +81,11 @@ impl<'a> Scoping<'a> {
     #[cfg(feature = "flame")]
     self.call.pop().unwrap().scope_guard.end();
   }
+
+  pub fn alloc_object_id(&mut self) -> ObjectId {
+    self.object_symbol_counter += 1;
+    ObjectId::from_usize(self.object_symbol_counter)
+  }
 }
 
 impl<'a> Analyzer<'a> {

crates/tree_shaker/src/scope/scope_tree.rs

@@ -76,6 +76,12 @@ impl<I: Idx, T> ScopeTree<I, T> {
     self.nodes.get(id).unwrap().parent
   }
 
+  pub fn add_special(&mut self, data: T) -> I {
+    let id = I::from_usize(self.nodes.len());
+    self.nodes.push(NodeInfo { data, depth: 0, parent: None });
+    id
+  }
+
   pub fn push(&mut self, data: T) -> I {
     let id = I::from_usize(self.nodes.len());
     self.nodes.push(NodeInfo { data, depth: self.stack.len(), parent: self.stack.last().copied() });