1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: use InstantiateModule instead of deprecated

Browse Source 
The following deprecation warning is displayed when compiling:

../src/module_wrap.cc:187:18: warning: 'Instantiate' is deprecated
[-Wdeprecated-declarations]
  bool ok = mod->Instantiate(ctx, ModuleWrap::ResolveCallback);
                 ^
../deps/v8/include/v8.h:1158:22: note: 'Instantiate' has been explicitly
marked deprecated here
                bool Instantiate(Local<Context> context,
                     ^

This commit changes this function call to use InstantiateModule instead
which returns a Maybe<bool>.

PR-URL: https://github.com/nodejs/node/pull/15423
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
This commit is contained in:
Daniel Bevenius 2017-09-15 08:03:52 +02:00 committed by Michaël Zasso
parent 9b996f0113
commit bd85752871
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/module_wrap.cc
View File

@ -23,6 +23,7 @@ using v8::IntegrityLevel;
using v8::Isolate;
using v8::JSON;
using v8::Local;
using v8::Maybe;
using v8::MaybeLocal;
using v8::Module;
using v8::Object;
@ -184,12 +185,12 @@ void ModuleWrap::Instantiate(const FunctionCallbackInfo<Value>& args) {
ModuleWrap* obj = Unwrap<ModuleWrap>(that);
Local<Module> mod = obj->module_.Get(iso);
bool ok = mod->Instantiate(ctx, ModuleWrap::ResolveCallback);
Maybe<bool> ok = mod->InstantiateModule(ctx, ModuleWrap::ResolveCallback);
// clear resolve cache on instantiate
obj->resolve_cache_.clear();
if (!ok) {
if (!ok.FromMaybe(false)) {
return;
}
}