GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — src: set ModuleWrap internal fields only once · nodejs/node@2c2892b

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src
- module_wrap.cc
- module_wrap.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/module_wrap.cc‎`

Copy file name to clipboardExpand all lines: src/module_wrap.cc

+23-17Lines changed: 23 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,16 +52,22 @@ using v8::Value;`
`52`	`52`	`ModuleWrap::ModuleWrap(Environment* env,`
`53`	`53`	`Local<Object> object,`
`54`	`54`	`Local<Module> module,`
`55`		`- Local<String> url)`
`56`		`- : BaseObject(env, object),`
`57`		`- module_(env->isolate(), module),`
`58`		`- id_(env->get_next_module_id()) {`
	`55`	`+ Local<String> url,`
	`56`	`+ Local<Object> context_object,`
	`57`	`+ Local<Value> synthetic_evaluation_step)`
	`58`	`+ : BaseObject(env, object),`
	`59`	`+ module_(env->isolate(), module),`
	`60`	`+ id_(env->get_next_module_id()) {`
`59`	`61`	`env->id_to_module_map.emplace(id_, this);`
`60`	`62`
`61`		`- Local<Value> undefined = Undefined(env->isolate());`
`62`	`63`	`object->SetInternalField(kURLSlot, url);`
`63`		`- object->SetInternalField(kSyntheticEvaluationStepsSlot, undefined);`
`64`		`- object->SetInternalField(kContextObjectSlot, undefined);`
	`64`	`+ object->SetInternalField(kSyntheticEvaluationStepsSlot,`
	`65`	`+ synthetic_evaluation_step);`
	`66`	`+ object->SetInternalField(kContextObjectSlot, context_object);`
	`67`	`+`
	`68`	`+ if (!synthetic_evaluation_step->IsUndefined()) {`
	`69`	`+ synthetic_ = true;`
	`70`	`+ }`
`65`	`71`	`}`
`66`	`72`
`67`	`73`	`ModuleWrap::~ModuleWrap() {`
`@@ -79,7 +85,9 @@ ModuleWrap::~ModuleWrap() {`
`79`	`85`
`80`	`86`	`Local<Context> ModuleWrap::context() const {`
`81`	`87`	`Local<Value> obj = object()->GetInternalField(kContextObjectSlot).As<Value>();`
`82`		`- if (obj.IsEmpty()) return {};`
	`88`	`+ // If this fails, there is likely a bug e.g. ModuleWrap::context() is accessed`
	`89`	`+ // before the ModuleWrap constructor completes.`
	`90`	`+ CHECK(obj->IsObject());`
`83`	`91`	`return obj.As<Object>()->GetCreationContext().ToLocalChecked();`
`84`	`92`	`}`
`85`	`93`
`@@ -227,18 +235,16 @@ void ModuleWrap::New(const FunctionCallbackInfo<Value>& args) {`
`227`	`235`	`return;`
`228`	`236`	`}`
`229`	`237`
`230`		`- ModuleWrap* obj = new ModuleWrap(env, that, module, url);`
`231`		`-`
`232`		`- if (synthetic) {`
`233`		`- obj->synthetic_ = true;`
`234`		`- obj->object()->SetInternalField(kSyntheticEvaluationStepsSlot, args[3]);`
`235`		`- }`
`236`		`-`
`237`	`238`	`// Use the extras object as an object whose GetCreationContext() will be the`
`238`	`239`	// original `context`, since the `Context` itself strictly speaking cannot
`239`	`240`	`// be stored in an internal field.`
`240`		`- obj->object()->SetInternalField(kContextObjectSlot,`
`241`		`- context->GetExtrasBindingObject());`
	`241`	`+ Local<Object> context_object = context->GetExtrasBindingObject();`
	`242`	`+ Local<Value> synthetic_evaluation_step =`
	`243`	`+ synthetic ? args[3] : Undefined(env->isolate()).As<v8::Value>();`
	`244`	`+`
	`245`	`+ ModuleWrap* obj = new ModuleWrap(`
	`246`	`+ env, that, module, url, context_object, synthetic_evaluation_step);`
	`247`	`+`
`242`	`248`	`obj->contextify_context_ = contextify_context;`
`243`	`249`
`244`	`250`	`env->hash_to_module_map.emplace(module->GetIdentityHash(), obj);`

Collapse file

`‎src/module_wrap.h‎`

Copy file name to clipboardExpand all lines: src/module_wrap.h

+3-1Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,9 @@ class ModuleWrap : public BaseObject {`
`72`	`72`	`ModuleWrap(Environment* env,`
`73`	`73`	`v8::Local<v8::Object> object,`
`74`	`74`	`v8::Local<v8::Module> module,`
`75`		`- v8::Local<v8::String> url);`
	`75`	`+ v8::Local<v8::String> url,`
	`76`	`+ v8::Local<v8::Object> context_object,`
	`77`	`+ v8::Local<v8::Value> synthetic_evaluation_step);`
`76`	`78`	`~ModuleWrap() override;`
`77`	`79`
`78`	`80`	`static void New(const v8::FunctionCallbackInfo<v8::Value>& args);`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.