GeezerVison

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

GeezerVison is showing github.com — src: initialize privateSymbols for per_context · nodejs/node@3ff37a8

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/api/environment.cc‎`

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

+42-4Lines changed: 42 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include <cstdlib>`
	`2`	`+#include "env_properties.h"`
`2`	`3`	`#include "node.h"`
`3`	`4`	`#include "node_builtins.h"`
`4`	`5`	`#include "node_context_data.h"`
`@@ -599,7 +600,8 @@ std::unique_ptr<MultiIsolatePlatform> MultiIsolatePlatform::Create(`
`599`	`600`	`page_allocator);`
`600`	`601`	`}`
`601`	`602`
`602`		`-MaybeLocal<Object> GetPerContextExports(Local<Context> context) {`
	`603`	`+MaybeLocal<Object> GetPerContextExports(Local<Context> context,`
	`604`	`+ IsolateData* isolate_data) {`
`603`	`605`	`Isolate* isolate = context->GetIsolate();`
`604`	`606`	`EscapableHandleScope handle_scope(isolate);`
`605`	`607`
`@@ -613,10 +615,14 @@ MaybeLocal<Object> GetPerContextExports(Local<Context> context) {`
`613`	`615`	`if (existing_value->IsObject())`
`614`	`616`	`return handle_scope.Escape(existing_value.As<Object>());`
`615`	`617`
	`618`	`+ // To initialize the per-context binding exports, a non-nullptr isolate_data`
	`619`	`+ // is needed`
	`620`	`+ CHECK(isolate_data);`
`616`	`621`	`Local<Object> exports = Object::New(isolate);`
`617`	`622`	`if (context->Global()->SetPrivate(context, key, exports).IsNothing() \|\|`
`618`		`- InitializePrimordials(context).IsNothing())`
	`623`	`+ InitializePrimordials(context, isolate_data).IsNothing()) {`
`619`	`624`	`return MaybeLocal<Object>();`
	`625`	`+ }`
`620`	`626`	`return handle_scope.Escape(exports);`
`621`	`627`	`}`
`622`	`628`
`@@ -761,7 +767,32 @@ Maybe<void> InitializeMainContextForSnapshot(Local<Context> context) {`
`761`	`767`	`return JustVoid();`
`762`	`768`	`}`
`763`	`769`
`764`		`-Maybe<void> InitializePrimordials(Local<Context> context) {`
	`770`	`+MaybeLocal<Object> InitializePrivateSymbols(Local<Context> context,`
	`771`	`+ IsolateData* isolate_data) {`
	`772`	`+ CHECK(isolate_data);`
	`773`	`+ Isolate* isolate = context->GetIsolate();`
	`774`	`+ EscapableHandleScope scope(isolate);`
	`775`	`+ Context::Scope context_scope(context);`
	`776`	`+`
	`777`	`+ Local<ObjectTemplate> private_symbols = ObjectTemplate::New(isolate);`
	`778`	`+ Local<Object> private_symbols_object;`
	`779`	`+#define V(PropertyName, _) \`
	`780`	`+ private_symbols->Set(isolate, #PropertyName, isolate_data->PropertyName());`
	`781`	`+`
	`782`	`+ PER_ISOLATE_PRIVATE_SYMBOL_PROPERTIES(V)`
	`783`	`+#undef V`
	`784`	`+`
	`785`	`+ if (!private_symbols->NewInstance(context).ToLocal(&private_symbols_object) \|\|`
	`786`	`+ private_symbols_object->SetPrototypeV2(context, Null(isolate))`
	`787`	`+ .IsNothing()) {`
	`788`	`+ return MaybeLocal<Object>();`
	`789`	`+ }`
	`790`	`+`
	`791`	`+ return scope.Escape(private_symbols_object);`
	`792`	`+}`
	`793`	`+`
	`794`	`+Maybe<void> InitializePrimordials(Local<Context> context,`
	`795`	`+ IsolateData* isolate_data) {`
`765`	`796`	`// Run per-context JS files.`
`766`	`797`	`Isolate* isolate = context->GetIsolate();`
`767`	`798`	`Context::Scope context_scope(context);`
`@@ -783,6 +814,12 @@ Maybe<void> InitializePrimordials(Local<Context> context) {`
`783`	`814`	`return Nothing<void>();`
`784`	`815`	`}`
`785`	`816`
	`817`	`+ Local<Object> private_symbols;`
	`818`	`+ if (!InitializePrivateSymbols(context, isolate_data)`
	`819`	`+ .ToLocal(&private_symbols)) {`
	`820`	`+ return Nothing<void>();`
	`821`	`+ }`
	`822`	`+`
`786`	`823`	`static const char* context_files[] = {"internal/per_context/primordials",`
`787`	`824`	`"internal/per_context/domexception",`
`788`	`825`	`"internal/per_context/messageport",`
`@@ -798,7 +835,8 @@ Maybe<void> InitializePrimordials(Local<Context> context) {`
`798`	`835`	`builtin_loader.SetEagerCompile();`
`799`	`836`
`800`	`837`	`for (const char** module = context_files; *module != nullptr; module++) {`
`801`		`- Local<Value> arguments[] = {exports, primordials};`
	`838`	`+ Local<Value> arguments[] = {exports, primordials, private_symbols};`
	`839`	`+`
`802`	`840`	`if (builtin_loader`
`803`	`841`	`.CompileAndCall(`
`804`	`842`	`context, *module, arraysize(arguments), arguments, nullptr)`

Collapse file

`‎src/node_builtins.cc‎`

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

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -405,6 +405,7 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompile(Local<Context> context,`
`405`	`405`	`parameters = {`
`406`	`406`	`FIXED_ONE_BYTE_STRING(isolate, "exports"),`
`407`	`407`	`FIXED_ONE_BYTE_STRING(isolate, "primordials"),`
	`408`	`+ FIXED_ONE_BYTE_STRING(isolate, "privateSymbols"),`
`408`	`409`	`};`
`409`	`410`	`} else if (strncmp(id, "internal/main/", strlen("internal/main/")) == 0 \|\|`
`410`	`411`	`strncmp(id,`

Collapse file

`‎src/node_internals.h‎`

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

+6-2Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,10 @@ std::string GetHumanReadableProcessName();`
`113`	`113`	`v8::Maybe<void> InitializeBaseContextForSnapshot(`
`114`	`114`	`v8::Local<v8::Context> context);`
`115`	`115`	`v8::Maybe<void> InitializeContextRuntime(v8::Local<v8::Context> context);`
`116`		`-v8::Maybe<void> InitializePrimordials(v8::Local<v8::Context> context);`
	`116`	`+v8::Maybe<void> InitializePrimordials(v8::Local<v8::Context> context,`
	`117`	`+ IsolateData* isolate_data);`
	`118`	`+v8::MaybeLocal<v8::Object> InitializePrivateSymbols(`
	`119`	`+ v8::Local<v8::Context> context, IsolateData* isolate_data);`
`117`	`120`
`118`	`121`	`class NodeArrayBufferAllocator : public ArrayBufferAllocator {`
`119`	`122`	`public:`
`@@ -340,7 +343,8 @@ v8::Isolate* NewIsolate(v8::Isolate::CreateParams* params,`
`340`	`343`	`// was provided by the embedder.`
`341`	`344`	`v8::MaybeLocal<v8::Value> StartExecution(Environment* env,`
`342`	`345`	`StartExecutionCallback cb = nullptr);`
`343`		`-v8::MaybeLocal<v8::Object> GetPerContextExports(v8::Local<v8::Context> context);`
	`346`	`+v8::MaybeLocal<v8::Object> GetPerContextExports(`
	`347`	`+ v8::Local<v8::Context> context, IsolateData* isolate_data = nullptr);`
`344`	`348`	`void MarkBootstrapComplete(const v8::FunctionCallbackInfo<v8::Value>& args);`
`345`	`349`
`346`	`350`	`class InitializationResultImpl final : public InitializationResult {`

Collapse file

`‎src/node_messaging.cc‎`

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

+9-6Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -252,14 +252,16 @@ void Message::AdoptSharedValueConveyor(SharedValueConveyor&& conveyor) {`
`252`	`252`
`253`	`253`	`namespace {`
`254`	`254`
`255`		`-MaybeLocal<Function> GetEmitMessageFunction(Local<Context> context) {`
	`255`	`+MaybeLocal<Function> GetEmitMessageFunction(Local<Context> context,`
	`256`	`+ IsolateData* isolate_data) {`
`256`	`257`	`Isolate* isolate = context->GetIsolate();`
`257`	`258`	`Local<Object> per_context_bindings;`
`258`	`259`	`Local<Value> emit_message_val;`
`259`		`- if (!GetPerContextExports(context).ToLocal(&per_context_bindings) \|\|`
`260`		`- !per_context_bindings->Get(context,`
`261`		`- FIXED_ONE_BYTE_STRING(isolate, "emitMessage"))`
`262`		`- .ToLocal(&emit_message_val)) {`
	`260`	`+ if (!GetPerContextExports(context, isolate_data)`
	`261`	`+ .ToLocal(&per_context_bindings) \|\|`
	`262`	`+ !per_context_bindings`
	`263`	`+ ->Get(context, FIXED_ONE_BYTE_STRING(isolate, "emitMessage"))`
	`264`	`+ .ToLocal(&emit_message_val)) {`
`263`	`265`	`return MaybeLocal<Function>();`
`264`	`266`	`}`
`265`	`267`	`CHECK(emit_message_val->IsFunction());`
`@@ -683,7 +685,8 @@ MessagePort::MessagePort(Environment* env,`
`683`	`685`	`}`
`684`	`686`
`685`	`687`	`Local<Function> emit_message_fn;`
`686`		`- if (!GetEmitMessageFunction(context).ToLocal(&emit_message_fn))`
	`688`	`+ if (!GetEmitMessageFunction(context, env->isolate_data())`
	`689`	`+ .ToLocal(&emit_message_fn))`
`687`	`690`	`return;`
`688`	`691`	`emit_message_fn_.Reset(env->isolate(), emit_message_fn);`
`689`	`692`

Collapse file

`‎src/node_realm.cc‎`

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

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ void Realm::CreateProperties() {`
`45`	`45`
`46`	`46`	`// Store primordials setup by the per-context script in the environment.`
`47`	`47`	`Local<Object> per_context_bindings =`
`48`		`- GetPerContextExports(ctx).ToLocalChecked();`
	`48`	`+ GetPerContextExports(ctx, env_->isolate_data()).ToLocalChecked();`
`49`	`49`	`Local<Value> primordials =`
`50`	`50`	`per_context_bindings->Get(ctx, env_->primordials_string())`
`51`	`51`	`.ToLocalChecked();`

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.