test/cctest/test-serialize.cc - Issue 2741683004: [rename] Rename internal field to embedder field.

Unified Diff: test/cctest/test-serialize.cc

Issue 2741683004: [rename] Rename internal field to embedder field. (Closed)

Patch Set: DEPRECATE_SOON(GetInternalField) Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: test/cctest/test-serialize.cc

diff --git a/test/cctest/test-serialize.cc b/test/cctest/test-serialize.cc

index 06e435a68bcee366190ca2ce93f03829f33d7c36..e17fec25c259717575a53f718e334e3592aab683 100644

--- a/test/cctest/test-serialize.cc

+++ b/test/cctest/test-serialize.cc

@@ -287,7 +287,7 @@ static void PartiallySerializeObject(Vector<const byte>* startup_blob_out,

startup_serializer.SerializeStrongReferences();

PartialSerializer partial_serializer(isolate, &startup_serializer,

- v8::SerializeInternalFieldsCallback());

+ v8::SerializeEmbedderFieldsCallback());

partial_serializer.Serialize(&raw_foo, false);

startup_serializer.SerializeWeakReferencesAndDeferred();

@@ -325,7 +325,7 @@ UNINITIALIZED_TEST(PartialSerializerObject) {

Deserializer deserializer(&snapshot_data);

root = deserializer

.DeserializePartial(isolate, global_proxy,

- v8::DeserializeInternalFieldsCallback())

+ v8::DeserializeEmbedderFieldsCallback())

.ToHandleChecked();

CHECK(root->IsString());

}

@@ -336,7 +336,7 @@ UNINITIALIZED_TEST(PartialSerializerObject) {

Deserializer deserializer(&snapshot_data);

root2 = deserializer

.DeserializePartial(isolate, global_proxy,

- v8::DeserializeInternalFieldsCallback())

+ v8::DeserializeEmbedderFieldsCallback())

.ToHandleChecked();

CHECK(root2->IsString());

CHECK(root.is_identical_to(root2));

@@ -392,7 +392,7 @@ static void PartiallySerializeContext(Vector<const byte>* startup_blob_out,

SnapshotByteSink partial_sink;

PartialSerializer partial_serializer(isolate, &startup_serializer,

- v8::SerializeInternalFieldsCallback());

+ v8::SerializeEmbedderFieldsCallback());

partial_serializer.Serialize(&raw_context, false);

startup_serializer.SerializeWeakReferencesAndDeferred();

@@ -422,13 +422,13 @@ UNINITIALIZED_TEST(PartialSerializerContext) {

Handle<Object> root;

Handle<JSGlobalProxy> global_proxy =

isolate->factory()->NewUninitializedJSGlobalProxy(

- JSGlobalProxy::SizeWithInternalFields(0));

+ JSGlobalProxy::SizeWithEmbedderFields(0));

{

SnapshotData snapshot_data(partial_blob);

Deserializer deserializer(&snapshot_data);

root = deserializer

.DeserializePartial(isolate, global_proxy,

- v8::DeserializeInternalFieldsCallback())

+ v8::DeserializeEmbedderFieldsCallback())

.ToHandleChecked();

CHECK(root->IsContext());

CHECK(Handle<Context>::cast(root)->global_proxy() == *global_proxy);

@@ -440,7 +440,7 @@ UNINITIALIZED_TEST(PartialSerializerContext) {

Deserializer deserializer(&snapshot_data);

root2 = deserializer

.DeserializePartial(isolate, global_proxy,

- v8::DeserializeInternalFieldsCallback())

+ v8::DeserializeEmbedderFieldsCallback())

.ToHandleChecked();

CHECK(root2->IsContext());

CHECK(!root.is_identical_to(root2));

@@ -517,7 +517,7 @@ static void PartiallySerializeCustomContext(

SnapshotByteSink partial_sink;

PartialSerializer partial_serializer(isolate, &startup_serializer,

- v8::SerializeInternalFieldsCallback());

+ v8::SerializeEmbedderFieldsCallback());

partial_serializer.Serialize(&raw_context, false);

startup_serializer.SerializeWeakReferencesAndDeferred();

@@ -547,13 +547,13 @@ UNINITIALIZED_TEST(PartialSerializerCustomContext) {

Handle<Object> root;

Handle<JSGlobalProxy> global_proxy =

isolate->factory()->NewUninitializedJSGlobalProxy(

- JSGlobalProxy::SizeWithInternalFields(0));

+ JSGlobalProxy::SizeWithEmbedderFields(0));

{

SnapshotData snapshot_data(partial_blob);

Deserializer deserializer(&snapshot_data);

root = deserializer

.DeserializePartial(isolate, global_proxy,

- v8::DeserializeInternalFieldsCallback())

+ v8::DeserializeEmbedderFieldsCallback())

.ToHandleChecked();

CHECK(root->IsContext());

Handle<Context> context = Handle<Context>::cast(root);

@@ -2082,31 +2082,31 @@ TEST(SnapshotCreatorUnknownExternalReferences) {

delete[] blob.data;

}

-struct InternalFieldData {

+struct EmbedderFieldData {

uint32_t data;

};

-v8::StartupData SerializeInternalFields(v8::Local<v8::Object> holder, int index,

+v8::StartupData SerializeEmbedderFields(v8::Local<v8::Object> holder, int index,

void* data) {

CHECK_EQ(reinterpret_cast<void*>(2016), data);

- InternalFieldData* internal_field = static_cast<InternalFieldData*>(

- holder->GetAlignedPointerFromInternalField(index));

- int size = sizeof(*internal_field);

+ EmbedderFieldData* embedder_field = static_cast<EmbedderFieldData*>(

+ holder->GetAlignedPointerFromEmbedderField(index));

+ int size = sizeof(*embedder_field);

char* payload = new char[size];

// We simply use memcpy to serialize the content.

- memcpy(payload, internal_field, size);

+ memcpy(payload, embedder_field, size);

return {payload, size};

}

-std::vector<InternalFieldData*> deserialized_data;

+std::vector<EmbedderFieldData*> deserialized_data;

-void DeserializeInternalFields(v8::Local<v8::Object> holder, int index,

+void DeserializeEmbedderFields(v8::Local<v8::Object> holder, int index,

v8::StartupData payload, void* data) {

CHECK_EQ(reinterpret_cast<void*>(2017), data);

- InternalFieldData* internal_field = new InternalFieldData{0};

- memcpy(internal_field, payload.data, payload.raw_size);

- holder->SetAlignedPointerInInternalField(index, internal_field);

- deserialized_data.push_back(internal_field);

+ EmbedderFieldData* embedder_field = new EmbedderFieldData{0};

+ memcpy(embedder_field, payload.data, payload.raw_size);

+ holder->SetAlignedPointerInEmbedderField(index, embedder_field);

+ deserialized_data.push_back(embedder_field);

}

TEST(SnapshotCreatorTemplates) {

@@ -2114,9 +2114,9 @@ TEST(SnapshotCreatorTemplates) {

v8::StartupData blob;

{

- InternalFieldData* a1 = new InternalFieldData{11};

- InternalFieldData* b0 = new InternalFieldData{20};

- InternalFieldData* c0 = new InternalFieldData{30};

+ EmbedderFieldData* a1 = new EmbedderFieldData{11};

+ EmbedderFieldData* b0 = new EmbedderFieldData{20};

+ EmbedderFieldData* c0 = new EmbedderFieldData{30};

v8::SnapshotCreator creator(original_external_references);

v8::Isolate* isolate = creator.GetIsolate();

@@ -2134,7 +2134,7 @@ TEST(SnapshotCreatorTemplates) {

context = v8::Context::New(isolate, no_extension, global_template);

v8::Local<v8::ObjectTemplate> object_template =

v8::ObjectTemplate::New(isolate);

- object_template->SetInternalFieldCount(3);

+ object_template->SetEmbedderFieldCount(3);

v8::Context::Scope context_scope(context);

ExpectInt32("f()", 42);

@@ -2149,18 +2149,18 @@ TEST(SnapshotCreatorTemplates) {

v8::External::New(isolate, nullptr);

v8::Local<v8::External> field_external =

v8::External::New(isolate, &serialized_static_field);

- a->SetInternalField(0, b);

- a->SetAlignedPointerInInternalField(1, a1);

- b->SetAlignedPointerInInternalField(0, b0);

- b->SetInternalField(1, c);

- c->SetAlignedPointerInInternalField(0, c0);

- c->SetInternalField(1, null_external);

- c->SetInternalField(2, field_external);

+ a->SetEmbedderField(0, b);

+ a->SetAlignedPointerInEmbedderField(1, a1);

+ b->SetAlignedPointerInEmbedderField(0, b0);

+ b->SetEmbedderField(1, c);

+ c->SetAlignedPointerInEmbedderField(0, c0);

+ c->SetEmbedderField(1, null_external);

+ c->SetEmbedderField(2, field_external);

CHECK(context->Global()->Set(context, v8_str("a"), a).FromJust());

CHECK_EQ(0u,

- creator.AddContext(context, v8::SerializeInternalFieldsCallback(

- SerializeInternalFields,

+ creator.AddContext(context, v8::SerializeEmbedderFieldsCallback(

+ SerializeEmbedderFields,

reinterpret_cast<void*>(2016))));

CHECK_EQ(0u, creator.AddTemplate(callback));

CHECK_EQ(1u, creator.AddTemplate(global_template));

@@ -2187,8 +2187,8 @@ TEST(SnapshotCreatorTemplates) {

v8::Local<v8::Context> context =

v8::Context::FromSnapshot(

isolate, 0,

- v8::DeserializeInternalFieldsCallback(

- DeserializeInternalFields, reinterpret_cast<void*>(2017)))

+ v8::DeserializeEmbedderFieldsCallback(

+ DeserializeEmbedderFields, reinterpret_cast<void*>(2017)))

.ToLocalChecked();

v8::Context::Scope context_scope(context);

ExpectInt32("f()", 42);

@@ -2215,28 +2215,28 @@ TEST(SnapshotCreatorTemplates) {

// Check that it instantiates to the same prototype.

ExpectTrue("g.prototype === f.prototype");

- // Retrieve internal fields.

+ // Retrieve embedder fields.

v8::Local<v8::Object> a = context->Global()

->Get(context, v8_str("a"))

.ToLocalChecked()

->ToObject(context)

.ToLocalChecked();

v8::Local<v8::Object> b =

- a->GetInternalField(0)->ToObject(context).ToLocalChecked();

- InternalFieldData* a1 = reinterpret_cast<InternalFieldData*>(

- a->GetAlignedPointerFromInternalField(1));

- v8::Local<v8::Value> a2 = a->GetInternalField(2);

+ a->GetEmbedderField(0)->ToObject(context).ToLocalChecked();

+ EmbedderFieldData* a1 = reinterpret_cast<EmbedderFieldData*>(

+ a->GetAlignedPointerFromEmbedderField(1));

+ v8::Local<v8::Value> a2 = a->GetEmbedderField(2);

- InternalFieldData* b0 = reinterpret_cast<InternalFieldData*>(

- b->GetAlignedPointerFromInternalField(0));

+ EmbedderFieldData* b0 = reinterpret_cast<EmbedderFieldData*>(

+ b->GetAlignedPointerFromEmbedderField(0));

v8::Local<v8::Object> c =

- b->GetInternalField(1)->ToObject(context).ToLocalChecked();

- v8::Local<v8::Value> b2 = b->GetInternalField(2);

+ b->GetEmbedderField(1)->ToObject(context).ToLocalChecked();

+ v8::Local<v8::Value> b2 = b->GetEmbedderField(2);

- InternalFieldData* c0 = reinterpret_cast<InternalFieldData*>(

- c->GetAlignedPointerFromInternalField(0));

- v8::Local<v8::Value> c1 = c->GetInternalField(1);

- v8::Local<v8::Value> c2 = c->GetInternalField(2);

+ EmbedderFieldData* c0 = reinterpret_cast<EmbedderFieldData*>(

+ c->GetAlignedPointerFromEmbedderField(0));

+ v8::Local<v8::Value> c1 = c->GetEmbedderField(1);

+ v8::Local<v8::Value> c2 = c->GetEmbedderField(2);

CHECK_EQ(11u, a1->data);

CHECK(a2->IsUndefined());

@@ -2305,7 +2305,7 @@ TEST(SnapshotCreatorIncludeGlobalProxy) {

v8::ObjectTemplate::New(isolate);

v8::Local<v8::FunctionTemplate> callback =

v8::FunctionTemplate::New(isolate, SerializedCallback);

- global_template->SetInternalFieldCount(3);

+ global_template->SetEmbedderFieldCount(3);

global_template->Set(v8_str("f"), callback);

global_template->SetHandler(v8::NamedPropertyHandlerConfiguration(

NamedPropertyGetterForSerialization));

@@ -2342,8 +2342,8 @@ TEST(SnapshotCreatorIncludeGlobalProxy) {

.FromJust());

CHECK_EQ(0u,

- creator.AddContext(context, v8::SerializeInternalFieldsCallback(

- SerializeInternalFields,

+ creator.AddContext(context, v8::SerializeEmbedderFieldsCallback(

+ SerializeEmbedderFields,

reinterpret_cast<void*>(2016))));

}

blob =

@@ -2390,8 +2390,8 @@ TEST(SnapshotCreatorIncludeGlobalProxy) {

v8::Local<v8::Context> context =

v8::Context::FromSnapshot(

isolate, 0,

- v8::DeserializeInternalFieldsCallback(

- DeserializeInternalFields, reinterpret_cast<void*>(2017)))

+ v8::DeserializeEmbedderFieldsCallback(

+ DeserializeEmbedderFields, reinterpret_cast<void*>(2017)))

.ToLocalChecked();

{

@@ -2414,7 +2414,7 @@ TEST(SnapshotCreatorIncludeGlobalProxy) {

}

v8::Local<v8::Object> global = context->Global();

- CHECK_EQ(3, global->InternalFieldCount());

+ CHECK_EQ(3, global->EmbedderFieldCount());

context->DetachGlobal();

// New context, but reuse global proxy.

@@ -2422,8 +2422,8 @@ TEST(SnapshotCreatorIncludeGlobalProxy) {

v8::Local<v8::Context> context2 =

v8::Context::FromSnapshot(

isolate, 0,

- v8::DeserializeInternalFieldsCallback(

- DeserializeInternalFields, reinterpret_cast<void*>(2017)),

+ v8::DeserializeEmbedderFieldsCallback(

+ DeserializeEmbedderFields, reinterpret_cast<void*>(2017)),

no_extensions, global)

.ToLocalChecked();

{

« include/v8-experimental.h ('K') | « test/cctest/test-heap-profiler.cc ('k') | test/cctest/wasm/test-run-wasm-module.cc » ('j') | no next file with comments »