test/cctest/interpreter/test-interpreter.cc - Issue 1370303004: Distinction between FeedbackVectorICSlot and FeedbackVectorSlot eliminated.

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

Issue 1370303004: Distinction between FeedbackVectorICSlot and FeedbackVectorSlot eliminated. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master

Patch Set: Fixed release builds Created 5 years, 3 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

Download patch

Index: test/cctest/interpreter/test-interpreter.cc

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

index e2383182915e1aa3a2744ddb079eeee7a82da25c..deeb0baafd978e3f175639af8ccc47575ab8af13 100644

--- a/test/cctest/interpreter/test-interpreter.cc

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

@@ -591,11 +591,13 @@ TEST(InterpreterLoadNamedProperty) {

HandleAndZoneScope handles;

i::Isolate* isolate = handles.main_isolate();

i::Factory* factory = isolate->factory();

+ i::Zone zone;

+ i::FeedbackVectorSpec feedback_spec(&zone);

+ i::FeedbackVectorSlot slot = feedback_spec.AddLoadICSlot();

- i::FeedbackVectorSlotKind ic_kinds[] = {i::FeedbackVectorSlotKind::LOAD_IC};

- i::StaticFeedbackVectorSpec feedback_spec(0, 1, ic_kinds);

Handle<i::TypeFeedbackVector> vector =

- factory->NewTypeFeedbackVector(&feedback_spec);

+ i::TypeFeedbackVector::New(isolate, &feedback_spec);

Handle<i::String> name = factory->NewStringFromAsciiChecked("val");

name = factory->string_table()->LookupString(isolate, name);

@@ -604,7 +606,7 @@ TEST(InterpreterLoadNamedProperty) {

builder.set_locals_count(0);

builder.set_parameter_count(1);

builder.LoadLiteral(name)

- .LoadNamedProperty(builder.Parameter(0), vector->first_ic_slot_index(),

+ .LoadNamedProperty(builder.Parameter(0), vector->GetIndex(slot),

i::SLOPPY)

.Return();

Handle<BytecodeArray> bytecode_array = builder.ToBytecodeArray();

@@ -645,12 +647,13 @@ TEST(InterpreterLoadKeyedProperty) {

HandleAndZoneScope handles;

i::Isolate* isolate = handles.main_isolate();

i::Factory* factory = isolate->factory();

+ i::Zone zone;

+ i::FeedbackVectorSpec feedback_spec(&zone);

+ i::FeedbackVectorSlot slot = feedback_spec.AddKeyedLoadICSlot();

- i::FeedbackVectorSlotKind ic_kinds[] = {

- i::FeedbackVectorSlotKind::KEYED_LOAD_IC};

- i::StaticFeedbackVectorSpec feedback_spec(0, 1, ic_kinds);

Handle<i::TypeFeedbackVector> vector =

- factory->NewTypeFeedbackVector(&feedback_spec);

+ i::TypeFeedbackVector::New(isolate, &feedback_spec);

Handle<i::String> key = factory->NewStringFromAsciiChecked("key");

key = factory->string_table()->LookupString(isolate, key);

@@ -659,7 +662,7 @@ TEST(InterpreterLoadKeyedProperty) {

builder.set_locals_count(1);

builder.set_parameter_count(1);

builder.LoadLiteral(key)

- .LoadKeyedProperty(builder.Parameter(0), vector->first_ic_slot_index(),

+ .LoadKeyedProperty(builder.Parameter(0), vector->GetIndex(slot),

i::SLOPPY)

.Return();

Handle<BytecodeArray> bytecode_array = builder.ToBytecodeArray();

@@ -688,11 +691,13 @@ TEST(InterpreterStoreNamedProperty) {

HandleAndZoneScope handles;

i::Isolate* isolate = handles.main_isolate();

i::Factory* factory = isolate->factory();

+ i::Zone zone;

+ i::FeedbackVectorSpec feedback_spec(&zone);

+ i::FeedbackVectorSlot slot = feedback_spec.AddStoreICSlot();

- i::FeedbackVectorSlotKind ic_kinds[] = {i::FeedbackVectorSlotKind::STORE_IC};

- i::StaticFeedbackVectorSpec feedback_spec(0, 1, ic_kinds);

Handle<i::TypeFeedbackVector> vector =

- factory->NewTypeFeedbackVector(&feedback_spec);

+ i::TypeFeedbackVector::New(isolate, &feedback_spec);

Handle<i::String> name = factory->NewStringFromAsciiChecked("val");

name = factory->string_table()->LookupString(isolate, name);

@@ -704,7 +709,7 @@ TEST(InterpreterStoreNamedProperty) {

.StoreAccumulatorInRegister(Register(0))

.LoadLiteral(Smi::FromInt(999))

.StoreNamedProperty(builder.Parameter(0), Register(0),

- vector->first_ic_slot_index(), i::SLOPPY)

+ vector->GetIndex(slot), i::SLOPPY)

.Return();

Handle<BytecodeArray> bytecode_array = builder.ToBytecodeArray();

@@ -748,12 +753,13 @@ TEST(InterpreterStoreKeyedProperty) {

HandleAndZoneScope handles;

i::Isolate* isolate = handles.main_isolate();

i::Factory* factory = isolate->factory();

+ i::Zone zone;

+ i::FeedbackVectorSpec feedback_spec(&zone);

+ i::FeedbackVectorSlot slot = feedback_spec.AddKeyedStoreICSlot();

- i::FeedbackVectorSlotKind ic_kinds[] = {

- i::FeedbackVectorSlotKind::KEYED_STORE_IC};

- i::StaticFeedbackVectorSpec feedback_spec(0, 1, ic_kinds);

Handle<i::TypeFeedbackVector> vector =

- factory->NewTypeFeedbackVector(&feedback_spec);

+ i::TypeFeedbackVector::New(isolate, &feedback_spec);

Handle<i::String> name = factory->NewStringFromAsciiChecked("val");

name = factory->string_table()->LookupString(isolate, name);

@@ -765,7 +771,7 @@ TEST(InterpreterStoreKeyedProperty) {

.StoreAccumulatorInRegister(Register(0))

.LoadLiteral(Smi::FromInt(999))

.StoreKeyedProperty(builder.Parameter(0), Register(0),

- vector->first_ic_slot_index(), i::SLOPPY)

+ vector->GetIndex(slot), i::SLOPPY)

.Return();

Handle<BytecodeArray> bytecode_array = builder.ToBytecodeArray();

@@ -796,11 +802,14 @@ TEST(InterpreterCall) {

HandleAndZoneScope handles;

i::Isolate* isolate = handles.main_isolate();

i::Factory* factory = isolate->factory();

+ i::Zone zone;

+ i::FeedbackVectorSpec feedback_spec(&zone);

+ i::FeedbackVectorSlot slot = feedback_spec.AddLoadICSlot();

- i::FeedbackVectorSlotKind ic_kinds[] = {i::FeedbackVectorSlotKind::LOAD_IC};

- i::StaticFeedbackVectorSpec feedback_spec(0, 1, ic_kinds);

Handle<i::TypeFeedbackVector> vector =

- factory->NewTypeFeedbackVector(&feedback_spec);

+ i::TypeFeedbackVector::New(isolate, &feedback_spec);

+ int slot_index = vector->GetIndex(slot);

Handle<i::String> name = factory->NewStringFromAsciiChecked("func");

name = factory->string_table()->LookupString(isolate, name);

@@ -811,8 +820,7 @@ TEST(InterpreterCall) {

builder.set_locals_count(1);

builder.set_parameter_count(1);

builder.LoadLiteral(name)

- .LoadNamedProperty(builder.Parameter(0), vector->first_ic_slot_index(),

- i::SLOPPY)

+ .LoadNamedProperty(builder.Parameter(0), slot_index, i::SLOPPY)

.StoreAccumulatorInRegister(Register(0))

.Call(Register(0), builder.Parameter(0), 0)

.Return();

@@ -833,8 +841,7 @@ TEST(InterpreterCall) {

builder.set_locals_count(1);

builder.set_parameter_count(1);

builder.LoadLiteral(name)

- .LoadNamedProperty(builder.Parameter(0), vector->first_ic_slot_index(),

- i::SLOPPY)

+ .LoadNamedProperty(builder.Parameter(0), slot_index, i::SLOPPY)

.StoreAccumulatorInRegister(Register(0))

.Call(Register(0), builder.Parameter(0), 0)

.Return();

@@ -858,8 +865,7 @@ TEST(InterpreterCall) {

builder.set_locals_count(4);

builder.set_parameter_count(1);

builder.LoadLiteral(name)

- .LoadNamedProperty(builder.Parameter(0), vector->first_ic_slot_index(),

- i::SLOPPY)

+ .LoadNamedProperty(builder.Parameter(0), slot_index, i::SLOPPY)

.StoreAccumulatorInRegister(Register(0))

.LoadAccumulatorWithRegister(builder.Parameter(0))

.StoreAccumulatorInRegister(Register(1))

@@ -888,8 +894,7 @@ TEST(InterpreterCall) {

builder.set_locals_count(12);

builder.set_parameter_count(1);

builder.LoadLiteral(name)

- .LoadNamedProperty(builder.Parameter(0), vector->first_ic_slot_index(),

- i::SLOPPY)

+ .LoadNamedProperty(builder.Parameter(0), slot_index, i::SLOPPY)

.StoreAccumulatorInRegister(Register(0))

.LoadAccumulatorWithRegister(builder.Parameter(0))

.StoreAccumulatorInRegister(Register(1))

« no previous file with comments | « test/cctest/interpreter/test-bytecode-generator.cc ('k') | test/cctest/test-compiler.cc » ('j') | no next file with comments »