fixup!

legendecas · Apr 10, 2023 · 4582785 · 4582785
1 parent 85e2a4d
commit 4582785
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/node_realm.cc b/src/node_realm.cc
@@ -21,6 +21,7 @@ using v8::Value;
 Realm::Realm(Environment* env, v8::Local<v8::Context> context, Kind kind)
     : env_(env), isolate_(context->GetIsolate()), kind_(kind) {
   context_.Reset(isolate_, context);
+  binding_data_store_.fill(nullptr);
 }
 
 Realm::~Realm() {

diff --git a/src/node_shadow_realm.cc b/src/node_shadow_realm.cc
@@ -49,15 +49,7 @@ void ShadowRealm::WeakCallback(const v8::WeakCallbackInfo<ShadowRealm>& data) {
   // This is necessary to avoid cleaning up base objects before their scheduled
   // weak callbacks are invoked, which can lead to accessing to v8 apis during
   // the first pass of the weak callback.
-  data.SetSecondPassCallback(SecondPassWeakCallback);
-}
-
-// static
-void ShadowRealm::SecondPassWeakCallback(
-    const v8::WeakCallbackInfo<ShadowRealm>& data) {
-  ShadowRealm* realm = data.GetParameter();
-  // Delete the realm and run cleanup hooks.
-  delete realm;
+  realm->env()->SetImmediate([realm](Environment* env) { delete realm; });
 }
 
 ShadowRealm::ShadowRealm(Environment* env)

diff --git a/src/node_shadow_realm.h b/src/node_shadow_realm.h
@@ -30,8 +30,6 @@ class ShadowRealm : public Realm {
 
  private:
   static void WeakCallback(const v8::WeakCallbackInfo<ShadowRealm>& data);
-  static void SecondPassWeakCallback(
-      const v8::WeakCallbackInfo<ShadowRealm>& data);
 
   explicit ShadowRealm(Environment* env);
   ~ShadowRealm();