Commit 326164d4 authored by Andreas Haas's avatar Andreas Haas Committed by Commit Bot

[wasm] Enter Context::Scope to install conditional features

The installation of conditional features in WebAssembly needs
the context to be set in the isolate to fix
https://ci.chromium.org/ui/p/chromium/builders/try/linux-rel/b8851955177753045904/overview.
The context cannot be passed explicitly to all uses of the
context, because Isolate::object_function() accesses
the native_context through the isolate.

Change-Id: I20334fd6779326e64825a15ba2aca3ae06a5c0d7
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2784684Reviewed-by: 's avatarCamillo Bruni <cbruni@chromium.org>
Commit-Queue: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#73658}
parent 783b0e85
...@@ -8879,6 +8879,8 @@ CALLBACK_SETTER(WasmExceptionsEnabledCallback, WasmExceptionsEnabledCallback, ...@@ -8879,6 +8879,8 @@ CALLBACK_SETTER(WasmExceptionsEnabledCallback, WasmExceptionsEnabledCallback,
void Isolate::InstallConditionalFeatures(Local<Context> context) { void Isolate::InstallConditionalFeatures(Local<Context> context) {
#if V8_ENABLE_WEBASSEMBLY #if V8_ENABLE_WEBASSEMBLY
v8::HandleScope handle_scope(this);
v8::Context::Scope context_scope(context);
i::WasmJs::InstallConditionalFeatures(reinterpret_cast<i::Isolate*>(this), i::WasmJs::InstallConditionalFeatures(reinterpret_cast<i::Isolate*>(this),
Utils::OpenHandle(*context)); Utils::OpenHandle(*context));
#endif // V8_ENABLE_WEBASSEMBLY #endif // V8_ENABLE_WEBASSEMBLY
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment