| Index: test/cctest/test-unboxed-doubles.cc
|
| diff --git a/test/cctest/test-unboxed-doubles.cc b/test/cctest/test-unboxed-doubles.cc
|
| index a12bf47f96fcf7a98a506afd2dde2d1ae4c3a004..eb1f67faf1251296c62e53649eacd6912c0adf6b 100644
|
| --- a/test/cctest/test-unboxed-doubles.cc
|
| +++ b/test/cctest/test-unboxed-doubles.cc
|
| @@ -67,11 +67,12 @@ static Handle<DescriptorArray> CreateDescriptorArray(Isolate* isolate,
|
| TestPropertyKind kind = props[i];
|
|
|
| if (kind == PROP_CONSTANT) {
|
| - ConstantDescriptor d(name, func, NONE);
|
| + DataConstantDescriptor d(name, func, NONE);
|
| descriptors->Append(&d);
|
|
|
| } else {
|
| - FieldDescriptor f(name, next_field_offset, NONE, representations[kind]);
|
| + DataFieldDescriptor f(name, next_field_offset, NONE,
|
| + representations[kind]);
|
| next_field_offset += f.GetDetails().field_width_in_words();
|
| descriptors->Append(&f);
|
| }
|
| @@ -541,7 +542,7 @@ TEST(LayoutDescriptorCreateNewSlow) {
|
| CHECK_NE(LayoutDescriptor::FastPointerLayout(), *layout_descriptor);
|
| CHECK(layout_descriptor->IsSlowLayout());
|
| for (int i = 0; i < inobject_properties; i++) {
|
| - // PROP_DOUBLE has index 1 among FIELD properties.
|
| + // PROP_DOUBLE has index 1 among DATA_FIELD properties.
|
| const bool tagged = (i % (PROP_KIND_NUMBER - 1)) != 1;
|
| CHECK_EQ(tagged, layout_descriptor->IsTagged(i));
|
| }
|
| @@ -600,12 +601,13 @@ static Handle<LayoutDescriptor> TestLayoutDescriptorAppend(
|
| Handle<LayoutDescriptor> layout_descriptor;
|
| TestPropertyKind kind = props[i];
|
| if (kind == PROP_CONSTANT) {
|
| - ConstantDescriptor d(name, func, NONE);
|
| + DataConstantDescriptor d(name, func, NONE);
|
| layout_descriptor = LayoutDescriptor::Append(map, d.GetDetails());
|
| descriptors->Append(&d);
|
|
|
| } else {
|
| - FieldDescriptor f(name, next_field_offset, NONE, representations[kind]);
|
| + DataFieldDescriptor f(name, next_field_offset, NONE,
|
| + representations[kind]);
|
| int field_width_in_words = f.GetDetails().field_width_in_words();
|
| next_field_offset += field_width_in_words;
|
| layout_descriptor = LayoutDescriptor::Append(map, f.GetDetails());
|
| @@ -736,7 +738,7 @@ static Handle<LayoutDescriptor> TestLayoutDescriptorAppendIfFastOrUseFull(
|
| CHECK_EQ(*full_layout_descriptor, layout_desc);
|
| } else {
|
| CHECK(!switched_to_slow_mode);
|
| - if (details.type() == FIELD) {
|
| + if (details.type() == DATA_FIELD) {
|
| nof++;
|
| int field_index = details.field_index();
|
| int field_width_in_words = details.field_width_in_words();
|
| @@ -971,7 +973,7 @@ static void TestLayoutDescriptorHelper(Isolate* isolate,
|
| int first_non_tagged_field_offset = end_offset;
|
| for (int i = 0; i < number_of_descriptors; i++) {
|
| PropertyDetails details = descriptors->GetDetails(i);
|
| - if (details.type() != FIELD) continue;
|
| + if (details.type() != DATA_FIELD) continue;
|
| FieldIndex index = FieldIndex::ForDescriptor(*map, i);
|
| if (!index.is_inobject()) continue;
|
| all_fields_tagged &= !details.representation().IsDouble();
|
|
|