diff options
| author | Jan Krems <jan.krems@groupon.com> | 2017-11-09 06:46:20 -0800 |
|---|---|---|
| committer | Jan Krems <jan.krems@groupon.com> | 2017-11-25 12:21:21 -0800 |
| commit | 3a4fe7791e1c2a1bcb7ac62ffbbcdefe41a45b92 (patch) | |
| tree | 4210be30683132d5d2834444fb4e00b16de82612 /deps/v8/src/bootstrapper.cc | |
| parent | 29423b49c78f7880fa07f52447ce17c2c4aff5bc (diff) | |
| download | node-new-3a4fe7791e1c2a1bcb7ac62ffbbcdefe41a45b92.tar.gz | |
deps: cherry-pick dbfe4a49d8 from upstream V8
Original commit message:
Introduce ScriptOrModule and HostDefinedOptions
This patch introduces a new container type ScriptOrModule which
provides the name and the host defined options of the script/module.
This patch also introduces a new PrimitivesArray that can hold
Primitive values, which the embedder can use to store metadata.
The HostDefinedOptions is passed to V8 through the ScriptOrigin, and
passed back to the embedder through HostImportModuleDynamically for
module loading.
Bug: v8:5785, v8:6658, v8:6683
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_chromium_rel_ng
Change-Id: I56c26fc9a680b273ac0a6691e5ad75f15b8dc80a
Reviewed-on: https://chromium-review.googlesource.com/622158
Reviewed-by: Adam Klein <adamk@chromium.org>
Reviewed-by: Georg Neis <neis@chromium.org>
Commit-Queue: Sathya Gunasekaran <gsathya@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47724}
PR-URL: https://github.com/nodejs/node/pull/16889
Refs: https://github.com/v8/v8/commit/dbfe4a49d88f6655ed31285a40b63786ab1e8e49
Refs: https://github.com/nodejs/node/pull/15713
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Diffstat (limited to 'deps/v8/src/bootstrapper.cc')
| -rw-r--r-- | deps/v8/src/bootstrapper.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/deps/v8/src/bootstrapper.cc b/deps/v8/src/bootstrapper.cc index 41045f8583..f4dd2f1754 100644 --- a/deps/v8/src/bootstrapper.cc +++ b/deps/v8/src/bootstrapper.cc @@ -3539,7 +3539,8 @@ bool Bootstrapper::CompileNative(Isolate* isolate, Vector<const char> name, Handle<SharedFunctionInfo> function_info = Compiler::GetSharedFunctionInfoForScript( source, script_name, 0, 0, ScriptOriginOptions(), Handle<Object>(), - context, NULL, NULL, ScriptCompiler::kNoCompileOptions, natives_flag); + context, NULL, NULL, ScriptCompiler::kNoCompileOptions, natives_flag, + Handle<FixedArray>()); if (function_info.is_null()) return false; DCHECK(context->IsNativeContext()); @@ -3602,7 +3603,7 @@ bool Genesis::CompileExtension(Isolate* isolate, v8::Extension* extension) { function_info = Compiler::GetSharedFunctionInfoForScript( source, script_name, 0, 0, ScriptOriginOptions(), Handle<Object>(), context, extension, NULL, ScriptCompiler::kNoCompileOptions, - EXTENSION_CODE); + EXTENSION_CODE, Handle<FixedArray>()); if (function_info.is_null()) return false; cache->Add(name, function_info); } |