esm: remove unused parameter on module.instantiate #32147

himself65 · 2020-03-08T08:16:28Z

related commit a6b030d, but this parameter do nothing at all.

Lines 302 to 323 in c49286b

    
           void ModuleWrap::Instantiate(const FunctionCallbackInfo<Value>& args) { 
        
             Environment* env = Environment::GetCurrent(args); 
        
             Isolate* isolate = args.GetIsolate(); 
        
             ModuleWrap* obj; 
        
             ASSIGN_OR_RETURN_UNWRAP(&obj, args.This()); 
        
             Local<Context> context = obj->context_.Get(isolate); 
        
             Local<Module> module = obj->module_.Get(isolate); 
        
             TryCatchScope try_catch(env); 
        
             USE(module->InstantiateModule(context, ResolveCallback)); 
        
             // clear resolve cache on instantiate 
        
             obj->resolve_cache_.clear(); 
        
             if (try_catch.HasCaught() && !try_catch.HasTerminated()) { 
        
               CHECK(!try_catch.Message().IsEmpty()); 
        
               CHECK(!try_catch.Exception().IsEmpty()); 
        
               AppendExceptionLine(env, try_catch.Exception(), try_catch.Message(), 
        
                                   ErrorHandlingMode::MODULE_ERROR); 
        
               try_catch.ReThrow(); 
        
               return; 
        
             } 
        
           }

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
commit message follows commit guidelines

nodejs-github-bot · 2020-03-09T14:21:31Z

CI: https://ci.nodejs.org/job/node-test-pull-request/29659/
retry osx: https://ci.nodejs.org/job/node-test-commit-osx/32502/

addaleax · 2020-03-11T16:39:58Z

Landed in 517b047

PR-URL: #32147 Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>

PR-URL: nodejs#32147 Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>

Backport-PR-URL: #32610 PR-URL: #32147 Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>

esm: remove unused parameter on module.instantiate

a2efbbd

nodejs-github-bot added the esm Issues and PRs related to the ECMAScript Modules implementation. label Mar 8, 2020

devsnek approved these changes Mar 8, 2020

View reviewed changes

cjihrig approved these changes Mar 8, 2020

View reviewed changes

addaleax approved these changes Mar 9, 2020

View reviewed changes

BridgeAR approved these changes Mar 9, 2020

View reviewed changes

BridgeAR added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Mar 9, 2020

addaleax closed this Mar 11, 2020

MylesBorins mentioned this pull request Mar 12, 2020

v13.11.0 proposal #32185

Merged

codebytere mentioned this pull request Apr 4, 2020

v12.16.2 proposal #32313

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

esm: remove unused parameter on module.instantiate #32147

esm: remove unused parameter on module.instantiate #32147

himself65 commented Mar 8, 2020

nodejs-github-bot commented Mar 9, 2020 •

edited by MylesBorins

Loading

addaleax commented Mar 11, 2020

	void ModuleWrap::Instantiate(const FunctionCallbackInfo<Value>& args) {
	Environment* env = Environment::GetCurrent(args);
	Isolate* isolate = args.GetIsolate();
	ModuleWrap* obj;
	ASSIGN_OR_RETURN_UNWRAP(&obj, args.This());
	Local<Context> context = obj->context_.Get(isolate);
	Local<Module> module = obj->module_.Get(isolate);
	TryCatchScope try_catch(env);
	USE(module->InstantiateModule(context, ResolveCallback));

	// clear resolve cache on instantiate
	obj->resolve_cache_.clear();

	if (try_catch.HasCaught() && !try_catch.HasTerminated()) {
	CHECK(!try_catch.Message().IsEmpty());
	CHECK(!try_catch.Exception().IsEmpty());
	AppendExceptionLine(env, try_catch.Exception(), try_catch.Message(),
	ErrorHandlingMode::MODULE_ERROR);
	try_catch.ReThrow();
	return;
	}
	}

esm: remove unused parameter on module.instantiate #32147

esm: remove unused parameter on module.instantiate #32147

Conversation

himself65 commented Mar 8, 2020

Checklist

nodejs-github-bot commented Mar 9, 2020 • edited by MylesBorins Loading

addaleax commented Mar 11, 2020

nodejs-github-bot commented Mar 9, 2020 •

edited by MylesBorins

Loading