fix: wasm codegen in script.runInNewContext

electron · Apr 15, 2020 · 0c084be · 0c084be
1 parent 111f915
commit 0c084be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/script/node-disabled-tests.json b/script/node-disabled-tests.json
@@ -185,7 +185,6 @@
   "parallel/test-v8-coverage",
   "parallel/test-v8-flags",
   "parallel/test-vm-basic",
-  "parallel/test-vm-codegen",
   "parallel/test-vm-module-basic",
   "parallel/test-vm-parse-abort-on-uncaught-exception",
   "parallel/test-vm-sigint",

diff --git a/shell/app/node_main.cc b/shell/app/node_main.cc
@@ -85,6 +85,13 @@ void HostCleanupFinalizationGroupCallback(
   env->RegisterFinalizationGroupForCleanup(group);
 }
 
+static bool AllowWasmCodeGenerationCallback(v8::Local<v8::Context> context,
+                                            v8::Local<v8::String>) {
+  v8::Local<v8::Value> wasm_code_gen = context->GetEmbedderData(
+      node::ContextEmbedderIndex::kAllowWasmCodeGeneration);
+  return wasm_code_gen->IsUndefined() || wasm_code_gen->IsTrue();
+}
+
 }  // namespace
 
 namespace electron {
@@ -161,6 +168,9 @@ int NodeMain(int argc, char* argv[]) {
       isolate->SetHostCleanupFinalizationGroupCallback(
           HostCleanupFinalizationGroupCallback);
 
+      isolate->SetAllowWasmCodeGenerationCallback(
+          AllowWasmCodeGenerationCallback);
+
       gin_helper::Dictionary process(isolate, env->process_object());
 #if defined(OS_WIN)
       process.SetMethod("log", &ElectronBindings::Log);