Skip to content

Commit 3ff37a8

Browse files
jazellyRafaelGSS
authored andcommitted
src: initialize privateSymbols for per_context
PR-URL: #57479 Reviewed-By: Chengzhong Wu <[email protected]>
1 parent 6add4c5 commit 3ff37a8

File tree

5 files changed

+59
-13
lines changed

5 files changed

+59
-13
lines changed

src/api/environment.cc

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <cstdlib>
2+
#include "env_properties.h"
23
#include "node.h"
34
#include "node_builtins.h"
45
#include "node_context_data.h"
@@ -599,7 +600,8 @@ std::unique_ptr<MultiIsolatePlatform> MultiIsolatePlatform::Create(
599600
page_allocator);
600601
}
601602

602-
MaybeLocal<Object> GetPerContextExports(Local<Context> context) {
603+
MaybeLocal<Object> GetPerContextExports(Local<Context> context,
604+
IsolateData* isolate_data) {
603605
Isolate* isolate = context->GetIsolate();
604606
EscapableHandleScope handle_scope(isolate);
605607

@@ -613,10 +615,14 @@ MaybeLocal<Object> GetPerContextExports(Local<Context> context) {
613615
if (existing_value->IsObject())
614616
return handle_scope.Escape(existing_value.As<Object>());
615617

618+
// To initialize the per-context binding exports, a non-nullptr isolate_data
619+
// is needed
620+
CHECK(isolate_data);
616621
Local<Object> exports = Object::New(isolate);
617622
if (context->Global()->SetPrivate(context, key, exports).IsNothing() ||
618-
InitializePrimordials(context).IsNothing())
623+
InitializePrimordials(context, isolate_data).IsNothing()) {
619624
return MaybeLocal<Object>();
625+
}
620626
return handle_scope.Escape(exports);
621627
}
622628

@@ -761,7 +767,32 @@ Maybe<void> InitializeMainContextForSnapshot(Local<Context> context) {
761767
return JustVoid();
762768
}
763769

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) {
765796
// Run per-context JS files.
766797
Isolate* isolate = context->GetIsolate();
767798
Context::Scope context_scope(context);
@@ -783,6 +814,12 @@ Maybe<void> InitializePrimordials(Local<Context> context) {
783814
return Nothing<void>();
784815
}
785816

817+
Local<Object> private_symbols;
818+
if (!InitializePrivateSymbols(context, isolate_data)
819+
.ToLocal(&private_symbols)) {
820+
return Nothing<void>();
821+
}
822+
786823
static const char* context_files[] = {"internal/per_context/primordials",
787824
"internal/per_context/domexception",
788825
"internal/per_context/messageport",
@@ -798,7 +835,8 @@ Maybe<void> InitializePrimordials(Local<Context> context) {
798835
builtin_loader.SetEagerCompile();
799836

800837
for (const char** module = context_files; *module != nullptr; module++) {
801-
Local<Value> arguments[] = {exports, primordials};
838+
Local<Value> arguments[] = {exports, primordials, private_symbols};
839+
802840
if (builtin_loader
803841
.CompileAndCall(
804842
context, *module, arraysize(arguments), arguments, nullptr)

src/node_builtins.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompile(Local<Context> context,
405405
parameters = {
406406
FIXED_ONE_BYTE_STRING(isolate, "exports"),
407407
FIXED_ONE_BYTE_STRING(isolate, "primordials"),
408+
FIXED_ONE_BYTE_STRING(isolate, "privateSymbols"),
408409
};
409410
} else if (strncmp(id, "internal/main/", strlen("internal/main/")) == 0 ||
410411
strncmp(id,

src/node_internals.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,10 @@ std::string GetHumanReadableProcessName();
113113
v8::Maybe<void> InitializeBaseContextForSnapshot(
114114
v8::Local<v8::Context> context);
115115
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);
117120

118121
class NodeArrayBufferAllocator : public ArrayBufferAllocator {
119122
public:
@@ -340,7 +343,8 @@ v8::Isolate* NewIsolate(v8::Isolate::CreateParams* params,
340343
// was provided by the embedder.
341344
v8::MaybeLocal<v8::Value> StartExecution(Environment* env,
342345
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);
344348
void MarkBootstrapComplete(const v8::FunctionCallbackInfo<v8::Value>& args);
345349

346350
class InitializationResultImpl final : public InitializationResult {

src/node_messaging.cc

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,14 +252,16 @@ void Message::AdoptSharedValueConveyor(SharedValueConveyor&& conveyor) {
252252

253253
namespace {
254254

255-
MaybeLocal<Function> GetEmitMessageFunction(Local<Context> context) {
255+
MaybeLocal<Function> GetEmitMessageFunction(Local<Context> context,
256+
IsolateData* isolate_data) {
256257
Isolate* isolate = context->GetIsolate();
257258
Local<Object> per_context_bindings;
258259
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)) {
263265
return MaybeLocal<Function>();
264266
}
265267
CHECK(emit_message_val->IsFunction());
@@ -683,7 +685,8 @@ MessagePort::MessagePort(Environment* env,
683685
}
684686

685687
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))
687690
return;
688691
emit_message_fn_.Reset(env->isolate(), emit_message_fn);
689692

src/node_realm.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void Realm::CreateProperties() {
4545

4646
// Store primordials setup by the per-context script in the environment.
4747
Local<Object> per_context_bindings =
48-
GetPerContextExports(ctx).ToLocalChecked();
48+
GetPerContextExports(ctx, env_->isolate_data()).ToLocalChecked();
4949
Local<Value> primordials =
5050
per_context_bindings->Get(ctx, env_->primordials_string())
5151
.ToLocalChecked();

0 commit comments

Comments
 (0)