rusty_racer 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 329c875cb612dccca54a8c70302d26ad0a38b8a1821733aa6eac9c4795e77d8b
-  data.tar.gz: 4d2665db69e108f6ef37fa9d4f0ae4bc3224ab1756e911abec76cfad558f8bd4
+  metadata.gz: 23ab2fe2f98436d0c48cc380809611878f1a7fc0b367d8b4d677a822e718efd4
+  data.tar.gz: c23f8e67fb71a192331d63030d66d138dd9b1cdd136b264107b75456f762516b
 SHA512:
-  metadata.gz: f95ae2f448af2ade88af369bea7c0b41c500e4028aeed04e34574e148c7d5f460ac068804bc49b409ab55ad352d063fcb0269064b27b1cf3a2a0453a8e245e2f
-  data.tar.gz: 4b853defb2dbde4c0455b9eefb5b6ba9d40002e94953f5d1540c4035087e8128c6b6df843463429b0e5cbcb404a0d1a1c625d13a24fee301a300eaf50dc9ad84
+  metadata.gz: 9f1144b81ef5f02bac43efe2790974f50e4cfcbbca924bea182602c2615419178f5f76376c14daee424e6c7dbbaee93152cf8969275ee61c5bf8891d1a8124b0
+  data.tar.gz: cea6a7fbf475ad7ae58cce4556ed1834d3a7aabb3bdf832fc82060b4e386e9ff0e9572dd32a4b759c51e66eedcb3478ed085e49c841958aa2fc20595ce9d55d2

data/ext/rusty_racer/Cargo.toml

@@ -4,7 +4,7 @@
 # libv8-rusty needed under the cibuildgem native-per-platform model).
 [package]
 name = "rusty_racer"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 publish = false
 

data/ext/rusty_racer/src/lib.rs

@@ -534,11 +534,6 @@ struct V8State {
     promise_reject_handler: Option<(i32, v8::Global<v8::Function>)>,
 }
 
-// Context embedder-data slot holding the realm id (an Integer), stamped by
-// new_realm so id_of_context is O(1). Slot 0 is the embedder's own first slot
-// (the binding adds INTERNAL_SLOT_COUNT); nothing else here uses embedder data.
-const REALM_ID_SLOT: i32 = 0;
-
 // (STATE/MODULES/SCRIPTS/ACTIVE_REALMS/INSTANTIATING/WATCHDOG_FIRED/
 // AUTO_MICROTASKS/DRAINING moved into IsolateState in the isolate slot, reached
 // via istate!(scope). Their invariants are documented on IsolateState's fields.)
@@ -1015,17 +1010,35 @@ fn finish_dynamic_import(
     }
 }
 
-// The id of |context|, read O(1) from the realm-id stamped in by new_realm.
-// None when the context is not a LIVE realm of this isolate — a context reset
-// away still carries its old stamp, so confirm the id currently maps back to
-// this very context before trusting it.
+// The id of |context| among this isolate's LIVE realms, or None when it isn't
+// one (e.g. a context that was reset or disposed away). Scans the realm table:
+// realm counts are small (a handful of frames) and this only runs off the hot
+// path (promise rejection, dynamic import, contextOf), so the scan is cheap.
+//
+// We deliberately do NOT stamp the id into the context's embedder data. Using a
+// context slot makes V8 attach a ContextAnnex carrying a guaranteed-finalizer
+// weak handle to every realm, and that finalizer has crashed the process at
+// isolate teardown (a first-pass weak callback re-fired during disposal,
+// panicking on an already-taken handle). Keeping realms free of context slots
+// keeps teardown clear of that hazard.
 fn id_of_context(scope: &mut v8::PinScope<'_, '_>, context: v8::Local<v8::Context>) -> Option<i32> {
-    let id = context
-        .get_embedder_data(scope, REALM_ID_SLOT)
-        .and_then(|v| v.int32_value(scope))?;
-    let current = context_for(istate!(scope), id);
-    let live = current.is_some_and(|g| v8::Local::new(scope, &g) == context);
-    live.then_some(id)
+    // The main realm (id 0) is overwhelmingly the common case — check it first,
+    // without cloning the whole table.
+    let main = istate!(scope).realms.main_context.clone();
+    if main.is_some_and(|g| v8::Local::new(scope, &g) == context) {
+        return Some(0);
+    }
+    // Extra realms: snapshot the (cloned) Globals so no IsolateState borrow is
+    // held while we mint Locals from `scope`.
+    let extras: Vec<(i32, v8::Global<v8::Context>)> = istate!(scope)
+        .realms
+        .contexts
+        .iter()
+        .map(|(id, g)| (*id, g.clone()))
+        .collect();
+    extras
+        .into_iter()
+        .find_map(|(id, g)| (v8::Local::new(scope, &g) == context).then_some(id))
 }
 
 // Pick the Global context for a realm id: 0 = main, N = an extra realm (None
@@ -1363,18 +1376,11 @@ unsafe extern "C" fn promise_reject_cb(message: v8::PromiseRejectMessage) {
 // Build a fresh v8::Context and install the host namespace (from STATE) into
 // it — the single definition of "a realm of this isolate", shared by boot,
 // reset and create_context so realms can't drift apart.
-fn new_realm(scope: &mut v8::PinScope<'_, '_, ()>, id: i32) -> v8::Global<v8::Context> {
+fn new_realm(scope: &mut v8::PinScope<'_, '_, ()>) -> v8::Global<v8::Context> {
     let fresh = {
         let context = v8::Context::new(scope, Default::default());
         v8::Global::new(scope, context)
     };
-    // Stamp the realm id into the context so id_of_context is O(1) (it would
-    // otherwise scan every realm on every promise rejection / contextOf call).
-    {
-        let context = v8::Local::new(scope, &fresh);
-        let id_val: v8::Local<v8::Value> = v8::Integer::new(scope, id).into();
-        context.set_embedder_data(REALM_ID_SLOT, id_val);
-    }
     // DESIGN DECISION: every realm of an isolate shares ONE security token, so
     // they are all mutually same-origin — the model is "a group of same-origin
     // frames sharing one heap", and NS.contextGlobal gives full cross-realm
@@ -1620,7 +1626,7 @@ impl Isolate {
         // namespace from the slot (seeded above).
         {
             v8::scope!(let scope, &mut isolate);
-            let main_context = new_realm(scope, 0);
+            let main_context = new_realm(scope);
             istate!(scope).realms.main_context = Some(main_context);
         }
         // Box the OwnedIsolate so it has a STABLE address, then capture a raw ptr

data/ext/rusty_racer/src/ops.rs

@@ -574,7 +574,7 @@ fn op_reset(scope: &mut v8::PinScope<'_, '_, ()>, context_id: i32) -> VmReply {
                 .into(),
         )))
     } else {
-        let fresh = new_realm(scope, context_id);
+        let fresh = new_realm(scope);
         {
             let realms = &mut istate!(scope).realms;
             if context_id == 0 {
@@ -596,7 +596,7 @@ fn op_create_context(scope: &mut v8::PinScope<'_, '_, ()>) -> VmReply {
         realms.next_context_id += 1;
         id
     };
-    let fresh = new_realm(scope, id);
+    let fresh = new_realm(scope);
     istate!(scope).realms.contexts.insert(id, fresh);
     VmReply::Done(Ok(JsVal::Int(id as i64)))
 }

data/lib/rusty_racer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RustyRacer
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: rusty_racer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Keita Urashima
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2026-06-14 00:00:00.000000000 Z
@@ -54,7 +54,7 @@ metadata:
   source_code_uri: https://github.com/ursm/rusty_racer
   bug_tracker_uri: https://github.com/ursm/rusty_racer/issues
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Embed V8 in Ruby via rusty_v8 + Magnus (rb-sys)
 test_files: []