summaryrefslogtreecommitdiff
path: root/core/runtime.rs
diff options
context:
space:
mode:
Diffstat (limited to 'core/runtime.rs')
-rw-r--r--core/runtime.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/core/runtime.rs b/core/runtime.rs
index 68c3ab002..06c777687 100644
--- a/core/runtime.rs
+++ b/core/runtime.rs
@@ -328,7 +328,6 @@ impl JsRuntime {
if let Some(get_error_class_fn) = options.get_error_class_fn {
op_state.get_error_class_fn = get_error_class_fn;
}
-
let op_state = Rc::new(RefCell::new(op_state));
let op_ctxs = ops
.into_iter()
@@ -341,12 +340,14 @@ impl JsRuntime {
.collect::<Vec<_>>()
.into_boxed_slice();
+ let refs = bindings::external_references(&op_ctxs, !options.will_snapshot);
+ // V8 takes ownership of external_references.
+ let refs: &'static v8::ExternalReferences = Box::leak(Box::new(refs));
let global_context;
let (mut isolate, maybe_snapshot_creator) = if options.will_snapshot {
// TODO(ry) Support loading snapshots before snapshotting.
assert!(options.startup_snapshot.is_none());
- let mut creator =
- v8::SnapshotCreator::new(Some(&bindings::EXTERNAL_REFERENCES));
+ let mut creator = v8::SnapshotCreator::new(Some(refs));
// SAFETY: `get_owned_isolate` is unsafe because it may only be called
// once. This is the only place we call this function, so this call is
// safe.
@@ -369,7 +370,7 @@ impl JsRuntime {
V8_WRAPPER_OBJECT_INDEX,
)
})
- .external_references(&**bindings::EXTERNAL_REFERENCES);
+ .external_references(&**refs);
let snapshot_loaded = if let Some(snapshot) = options.startup_snapshot {
params = match snapshot {
Snapshot::Static(data) => params.snapshot_blob(data),