Skip to content

Use new EmbedderData API #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pthier merged 1 commit into from
Oct 27, 2026
Merged

Use new EmbedderData API #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/api/environment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ Maybe<void> InitializeContextRuntime(Local<Context> context) {
bool is_code_generation_from_strings_allowed =
context->IsCodeGenerationFromStringsAllowed();
context->AllowCodeGenerationFromStrings(false);
context->SetEmbedderData(
context->SetEmbedderDataV3(
ContextEmbedderIndex::kAllowCodeGenerationFromStrings,
Boolean::New(isolate, is_code_generation_from_strings_allowed));

Expand Down Expand Up @@ -910,9 +910,9 @@ Maybe<void> InitializeMainContextForSnapshot(Local<Context> context) {
HandleScope handle_scope(isolate);

// Initialize the default values.
context->SetEmbedderData(ContextEmbedderIndex::kAllowWasmCodeGeneration,
True(isolate));
context->SetEmbedderData(
context->SetEmbedderDataV3(ContextEmbedderIndex::kAllowWasmCodeGeneration,
True(isolate));
context->SetEmbedderDataV3(
ContextEmbedderIndex::kAllowCodeGenerationFromStrings, True(isolate));

if (InitializeBaseContextForSnapshot(context).IsNothing()) {
Expand Down
27 changes: 15 additions & 12 deletions src/env.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,14 +673,15 @@ void TrackingTraceStateObserver::UpdateTraceCategoryState() {
void Environment::AssignToContext(Local<v8::Context> context,
Realm* realm,
const ContextInfo& info) {
context->SetAlignedPointerInEmbedderData(ContextEmbedderIndex::kEnvironment,
this,
EmbedderDataTag::kPerContextData);
context->SetAlignedPointerInEmbedderData(
context->SetAlignedPointerInEmbedderDataV2(
ContextEmbedderIndex::kEnvironment,
this,
EmbedderDataTag::kPerContextData);
context->SetAlignedPointerInEmbedderDataV2(
ContextEmbedderIndex::kRealm, realm, EmbedderDataTag::kPerContextData);

// ContextifyContexts will update this to a pointer to the native object.
context->SetAlignedPointerInEmbedderData(
context->SetAlignedPointerInEmbedderDataV2(
ContextEmbedderIndex::kContextifyContext,
nullptr,
EmbedderDataTag::kPerContextData);
Expand All @@ -698,13 +699,15 @@ void Environment::AssignToContext(Local<v8::Context> context,

void Environment::UnassignFromContext(Local<v8::Context> context) {
if (!context.IsEmpty()) {
context->SetAlignedPointerInEmbedderData(ContextEmbedderIndex::kEnvironment,
nullptr,
EmbedderDataTag::kPerContextData);
context->SetAlignedPointerInEmbedderData(ContextEmbedderIndex::kRealm,
nullptr,
EmbedderDataTag::kPerContextData);
context->SetAlignedPointerInEmbedderData(
context->SetAlignedPointerInEmbedderDataV2(
ContextEmbedderIndex::kEnvironment,
nullptr,
EmbedderDataTag::kPerContextData);
context->SetAlignedPointerInEmbedderDataV2(
ContextEmbedderIndex::kRealm,
nullptr,
EmbedderDataTag::kPerContextData);
context->SetAlignedPointerInEmbedderDataV2(
ContextEmbedderIndex::kContextifyContext,
nullptr,
EmbedderDataTag::kPerContextData);
Expand Down
2 changes: 1 addition & 1 deletion src/node_context_data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class ContextEmbedderTag {
static inline void TagNodeContext(v8::Local<v8::Context> context) {
// Used by ContextEmbedderTag::IsNodeContext to know that we are on a node
// context.
context->SetAlignedPointerInEmbedderData(
context->SetAlignedPointerInEmbedderDataV2(
ContextEmbedderIndex::kContextTag,
ContextEmbedderTag::kNodeContextTagPtr,
EmbedderDataTag::kPerContextData);
Expand Down
16 changes: 8 additions & 8 deletions src/node_contextify.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ ContextifyContext::ContextifyContext(Environment* env,
DCHECK_NULL(v8_context->GetAlignedPointerFromEmbedderData(
ContextEmbedderIndex::kContextifyContext,
EmbedderDataTag::kPerContextData));
v8_context->SetAlignedPointerInEmbedderData(
v8_context->SetAlignedPointerInEmbedderDataV2(
ContextEmbedderIndex::kContextifyContext,
this,
EmbedderDataTag::kPerContextData);
Expand Down Expand Up @@ -293,21 +293,21 @@ ContextifyContext* ContextifyContext::New(Local<Context> v8_context,
// to the ContextifyContext wrapper which in turn internally references
// the context from its constructor.
if (sandbox_obj.IsEmpty()) {
v8_context->SetEmbedderData(ContextEmbedderIndex::kSandboxObject,
v8::Undefined(env->isolate()));
v8_context->SetEmbedderDataV3(ContextEmbedderIndex::kSandboxObject,
v8::Undefined(env->isolate()));
} else {
v8_context->SetEmbedderData(ContextEmbedderIndex::kSandboxObject,
sandbox_obj);
v8_context->SetEmbedderDataV3(ContextEmbedderIndex::kSandboxObject,
sandbox_obj);
}

// Delegate the code generation validation to
// node::ModifyCodeGenerationFromStrings.
v8_context->AllowCodeGenerationFromStrings(false);
v8_context->SetEmbedderData(
v8_context->SetEmbedderDataV3(
ContextEmbedderIndex::kAllowCodeGenerationFromStrings,
options->allow_code_gen_strings);
v8_context->SetEmbedderData(ContextEmbedderIndex::kAllowWasmCodeGeneration,
options->allow_code_gen_wasm);
v8_context->SetEmbedderDataV3(ContextEmbedderIndex::kAllowWasmCodeGeneration,
options->allow_code_gen_wasm);

Utf8Value name_val(env->isolate(), options->name);
ContextInfo info(name_val.ToString());
Expand Down
Loading