fixup! src: make realm binding data store weak

Author: legendecas

src/env.cc

@@ -595,7 +595,7 @@ void Environment::AssignToContext(Local<v8::Context> context,
   TrackContext(context);
 }
 
-void Environment::UnassignToContext(Local<v8::Context> context) {
+void Environment::UnassignFromContext(Local<v8::Context> context) {
   if (!context.IsEmpty()) {
     context->SetAlignedPointerInEmbedderData(ContextEmbedderIndex::kEnvironment,
                                              nullptr);

src/env.h

@@ -645,7 +645,7 @@ class Environment : public MemoryRetainer {
   void AssignToContext(v8::Local<v8::Context> context,
                        Realm* realm,
                        const ContextInfo& info);
-  void UnassignToContext(v8::Local<v8::Context> context);
+  void UnassignFromContext(v8::Local<v8::Context> context);
   void TrackShadowRealm(shadow_realm::ShadowRealm* realm);
   void UntrackShadowRealm(shadow_realm::ShadowRealm* realm);
 

src/node_contextify.cc

@@ -163,7 +163,7 @@ ContextifyContext::~ContextifyContext() {
   Isolate* isolate = env()->isolate();
   HandleScope scope(isolate);
 
-  env()->UnassignToContext(PersistentToLocal::Weak(isolate, context_));
+  env()->UnassignFromContext(PersistentToLocal::Weak(isolate, context_));
   context_.Reset();
 }
 

src/node_realm.cc

@@ -309,7 +309,7 @@ PrincipalRealm::~PrincipalRealm() {
   DCHECK(!context_.IsEmpty());
 
   HandleScope handle_scope(isolate());
-  env_->UnassignToContext(context());
+  env_->UnassignFromContext(context());
 }
 
 MaybeLocal<Value> PrincipalRealm::BootstrapRealm() {

src/node_shadow_realm.cc

@@ -85,7 +85,7 @@ ShadowRealm::~ShadowRealm() {
 
   {
     HandleScope handle_scope(isolate());
-    env_->UnassignToContext(context());
+    env_->UnassignFromContext(context());
   }
 }
 

test/pummel/test-heapdump-shadow-realm.js

@@ -0,0 +1,32 @@
+// Flags: --experimental-shadow-realm --expose-internals
+'use strict';
+require('../common');
+const { validateSnapshotNodes } = require('../common/heap');
+
+validateSnapshotNodes('Node / ShadowRealm', []);
+const realm = new ShadowRealm();
+{
+  // Create a bunch of un-referenced ShadowRealms to make sure the heap
+  // snapshot can handle it.
+  for (let i = 0; i < 100; i++) {
+    const realm = new ShadowRealm();
+    realm.evaluate('undefined');
+  }
+}
+validateSnapshotNodes('Node / Environment', [
+  {
+    children: [
+      { node_name: 'Node / shadow_realms', edge_name: 'shadow_realms' },
+    ],
+  },
+]);
+validateSnapshotNodes('Node / shadow_realms', [
+  {
+    children: [
+      { node_name: 'Node / ShadowRealm' },
+    ],
+  },
+]);
+
+// Keep the realm alive.
+realm.evaluate('undefined');