Skip to content

V
V8
Commit 4e0d1143 authored by rmcilroy's avatar rmcilroy Committed by Commit bot
Browse files
Options

[Interpreter] Add support for compound expressions. 

Adds support for compound expressions for variables and named / keyed
property assignments.

BUG=v8:4280
LOG=N

Review URL: https://codereview.chromium.org/1420503002

Cr-Commit-Position: refs/heads/master@{#31485}
parent 00308056
Show whitespace changes
Inline Side-by-side
Showing with 269 additions and 16 deletions
src/interpreter/bytecode-generator.cc
View file @ 4e0d1143
...@@ -1037,7 +1037,15 @@ void BytecodeGenerator::VisitAssignment(Assignment* expr) { ...@@ -1037,7 +1037,15 @@ void BytecodeGenerator::VisitAssignment(Assignment* expr) {
} }
case KEYED_PROPERTY: { case KEYED_PROPERTY: {
object = VisitForRegisterValue(property->obj()); object = VisitForRegisterValue(property->obj());
if (expr->is_compound()) {
// Use VisitForAccumulator and store to register so that the key is
// still in the accumulator for loading the old value below.
key = execution_result()->NewRegister();
VisitForAccumulatorValue(property->key());
builder()->StoreAccumulatorInRegister(key);
} else {
key = VisitForRegisterValue(property->key()); key = VisitForRegisterValue(property->key());
}
break; break;
} }
case NAMED_SUPER_PROPERTY: case NAMED_SUPER_PROPERTY:
...@@ -1048,7 +1056,41 @@ void BytecodeGenerator::VisitAssignment(Assignment* expr) { ...@@ -1048,7 +1056,41 @@ void BytecodeGenerator::VisitAssignment(Assignment* expr) {
// Evaluate the value and potentially handle compound assignments by loading // Evaluate the value and potentially handle compound assignments by loading
// the left-hand side value and performing a binary operation. // the left-hand side value and performing a binary operation.
if (expr->is_compound()) { if (expr->is_compound()) {
Register old_value;
switch (assign_type) {
case VARIABLE: {
VariableProxy* proxy = expr->target()->AsVariableProxy();
old_value = VisitVariableLoadForRegisterValue(
proxy->var(), proxy->VariableFeedbackSlot());
break;
}
case NAMED_PROPERTY: {
FeedbackVectorSlot slot = property->PropertyFeedbackSlot();
old_value = execution_result()->NewRegister();
builder()
->LoadNamedProperty(object, name_index, feedback_index(slot),
language_mode())
.StoreAccumulatorInRegister(old_value);
break;
}
case KEYED_PROPERTY: {
// Key is already in accumulator at this point due to evaluating the
// LHS above.
FeedbackVectorSlot slot = property->PropertyFeedbackSlot();
old_value = execution_result()->NewRegister();
builder()
->LoadKeyedProperty(object, feedback_index(slot), language_mode())
.StoreAccumulatorInRegister(old_value);
break;
}
case NAMED_SUPER_PROPERTY:
case KEYED_SUPER_PROPERTY:
UNIMPLEMENTED(); UNIMPLEMENTED();
break;
}
VisitForAccumulatorValue(expr->value());
builder()->BinaryOperation(expr->binary_op(), old_value,
language_mode_strength());
} else { } else {
VisitForAccumulatorValue(expr->value()); VisitForAccumulatorValue(expr->value());
} }
......
test/cctest/interpreter/test-bytecode-generator.cc
View file @ 4e0d1143
...@@ -77,7 +77,6 @@ class BytecodeGeneratorHelper { ...@@ -77,7 +77,6 @@ class BytecodeGeneratorHelper {
#define R(x) static_cast<uint8_t>(-(x) & 0xff) #define R(x) static_cast<uint8_t>(-(x) & 0xff)
#define A(x, n) R(helper.kLastParamIndex - (n) + 1 + (x)) #define A(x, n) R(helper.kLastParamIndex - (n) + 1 + (x))
#define THIS(n) A(0, n) #define THIS(n) A(0, n)
#define _ static_cast<uint8_t>(0x5a)
#if defined(V8_TARGET_LITTLE_ENDIAN) #if defined(V8_TARGET_LITTLE_ENDIAN)
#define U16(x) static_cast<uint8_t>((x) & 0xff), \ #define U16(x) static_cast<uint8_t>((x) & 0xff), \
static_cast<uint8_t>(((x) >> kBitsPerByte) & 0xff) static_cast<uint8_t>(((x) >> kBitsPerByte) & 0xff)
...@@ -131,8 +130,7 @@ static void CheckConstant(InstanceType expected, Object* actual) { ...@@ -131,8 +130,7 @@ static void CheckConstant(InstanceType expected, Object* actual) {
template <typename T> template <typename T>
static void CheckBytecodeArrayEqual(const ExpectedSnippet<T>& expected, static void CheckBytecodeArrayEqual(const ExpectedSnippet<T>& expected,
Handle<BytecodeArray> actual, Handle<BytecodeArray> actual) {
bool has_unknown = false) {
CHECK_EQ(expected.frame_size, actual->frame_size()); CHECK_EQ(expected.frame_size, actual->frame_size());
CHECK_EQ(expected.parameter_count, actual->parameter_count()); CHECK_EQ(expected.parameter_count, actual->parameter_count());
CHECK_EQ(expected.bytecode_length, actual->length()); CHECK_EQ(expected.bytecode_length, actual->length());
...@@ -163,14 +161,6 @@ static void CheckBytecodeArrayEqual(const ExpectedSnippet<T>& expected, ...@@ -163,14 +161,6 @@ static void CheckBytecodeArrayEqual(const ExpectedSnippet<T>& expected,
int operand_index = i; int operand_index = i;
i += static_cast<int>(Bytecodes::SizeOfOperand(operand_type)); i += static_cast<int>(Bytecodes::SizeOfOperand(operand_type));
uint32_t raw_operand = iterator.GetRawOperand(j, operand_type); uint32_t raw_operand = iterator.GetRawOperand(j, operand_type);
if (has_unknown) {
// Check actual bytecode array doesn't have the same byte as the
// one we use to specify an unknown byte.
CHECK_NE(raw_operand, _);
if (expected.bytecode[operand_index] == _) {
continue;
}
}
uint32_t expected_operand; uint32_t expected_operand;
switch (Bytecodes::SizeOfOperand(operand_type)) { switch (Bytecodes::SizeOfOperand(operand_type)) {
case OperandSize::kNone: case OperandSize::kNone:
...@@ -1525,7 +1515,7 @@ TEST(DeclareGlobals) { ...@@ -1525,7 +1515,7 @@ TEST(DeclareGlobals) {
for (size_t i = 0; i < arraysize(snippets); i++) { for (size_t i = 0; i < arraysize(snippets); i++) {
Handle<BytecodeArray> bytecode_array = Handle<BytecodeArray> bytecode_array =
helper.MakeTopLevelBytecode(snippets[i].code_snippet); helper.MakeTopLevelBytecode(snippets[i].code_snippet);
CheckBytecodeArrayEqual(snippets[i], bytecode_array, true); CheckBytecodeArrayEqual(snippets[i], bytecode_array);
} }
} }
...@@ -2709,7 +2699,7 @@ TEST(CallNew) { ...@@ -2709,7 +2699,7 @@ TEST(CallNew) {
for (size_t i = 0; i < arraysize(snippets); i++) { for (size_t i = 0; i < arraysize(snippets); i++) {
Handle<BytecodeArray> bytecode_array = Handle<BytecodeArray> bytecode_array =
helper.MakeBytecode(snippets[i].code_snippet, "f"); helper.MakeBytecode(snippets[i].code_snippet, "f");
CheckBytecodeArrayEqual(snippets[i], bytecode_array, true); CheckBytecodeArrayEqual(snippets[i], bytecode_array);
} }
} }
...@@ -2838,6 +2828,7 @@ TEST(ContextParameters) { ...@@ -2838,6 +2828,7 @@ TEST(ContextParameters) {
int closure = Register::function_closure().index(); int closure = Register::function_closure().index();
int first_context_slot = Context::MIN_CONTEXT_SLOTS; int first_context_slot = Context::MIN_CONTEXT_SLOTS;
ExpectedSnippet<InstanceType> snippets[] = { ExpectedSnippet<InstanceType> snippets[] = {
{"function f(arg1) { return function() { arg1 = 2; }; }", {"function f(arg1) { return function() { arg1 = 2; }; }",
1 * kPointerSize, 1 * kPointerSize,
...@@ -3201,7 +3192,173 @@ TEST(GlobalCountOperators) { ...@@ -3201,7 +3192,173 @@ TEST(GlobalCountOperators) {
for (size_t i = 0; i < arraysize(snippets); i++) { for (size_t i = 0; i < arraysize(snippets); i++) {
Handle<BytecodeArray> bytecode_array = Handle<BytecodeArray> bytecode_array =
helper.MakeBytecode(snippets[i].code_snippet, "f"); helper.MakeBytecode(snippets[i].code_snippet, "f");
CheckBytecodeArrayEqual(snippets[i], bytecode_array, true); CheckBytecodeArrayEqual(snippets[i], bytecode_array);
}
}
TEST(CompoundExpressions) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
Zone zone;
int closure = Register::function_closure().index();
int first_context_slot = Context::MIN_CONTEXT_SLOTS;
FeedbackVectorSpec feedback_spec(&zone);
FeedbackVectorSlot slot1 = feedback_spec.AddLoadICSlot();
FeedbackVectorSlot slot2 = feedback_spec.AddStoreICSlot();
Handle<i::TypeFeedbackVector> vector =
i::NewTypeFeedbackVector(helper.isolate(), &feedback_spec);
int object_literal_flags =
ObjectLiteral::kFastElements | ObjectLiteral::kDisableMementos;
ExpectedSnippet<InstanceType> snippets[] = {
{"var a = 1; a += 2;",
1 * kPointerSize,
1,
12,
{
B(LdaSmi8), U8(1), //
B(Star), R(0), //
B(LdaSmi8), U8(2), //
B(Add), R(0), //
B(Star), R(0), //
B(LdaUndefined), //
B(Return), //
}},
{"var a = 1; a /= 2;",
1 * kPointerSize,
1,
12,
{
B(LdaSmi8), U8(1), //
B(Star), R(0), //
B(LdaSmi8), U8(2), //
B(Div), R(0), //
B(Star), R(0), //
B(LdaUndefined), //
B(Return), //
}},
{"var a = { val: 2 }; a.name *= 2;",
2 * kPointerSize,
1,
23,
{
B(LdaConstant), U8(0), //
B(CreateObjectLiteral), U8(0), U8(object_literal_flags), //
B(Star), R(0), //
B(LoadICSloppy), R(0), U8(1), U8(vector->GetIndex(slot1)), //
B(Star), R(1), //
B(LdaSmi8), U8(2), //
B(Mul), R(1), //
B(StoreICSloppy), R(0), U8(1), U8(vector->GetIndex(slot2)), //
B(LdaUndefined), //
B(Return), //
},
2,
{InstanceType::FIXED_ARRAY_TYPE,
InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE}},
{"var a = { 1: 2 }; a[1] ^= 2;",
3 * kPointerSize,
1,
26,
{
B(LdaConstant), U8(0), //
B(CreateObjectLiteral), U8(0), U8(object_literal_flags), //
B(Star), R(0), //
B(LdaSmi8), U8(1), //
B(Star), R(1), //
B(KeyedLoadICSloppy), R(0), U8(vector->GetIndex(slot1)), //
B(Star), R(2), //
B(LdaSmi8), U8(2), //
B(BitwiseXor), R(2), //
B(KeyedStoreICSloppy), R(0), R(1), U8(vector->GetIndex(slot2)), //
B(LdaUndefined), //
B(Return), //
},
1,
{InstanceType::FIXED_ARRAY_TYPE}},
{"var a = 1; (function f() { return a; }); a |= 24;",
2 * kPointerSize,
1,
30,
{
B(CallRuntime), U16(Runtime::kNewFunctionContext), R(closure), //
U8(1), //
B(PushContext), R(0), //
B(LdaSmi8), U8(1), //
B(StaContextSlot), R(0), U8(first_context_slot), //
B(LdaConstant), U8(0), //
B(CreateClosure), U8(0), //
B(LdaContextSlot), R(0), U8(first_context_slot), //
B(Star), R(1), //
B(LdaSmi8), U8(24), //
B(BitwiseOr), R(1), //
B(StaContextSlot), R(0), U8(first_context_slot), //
B(LdaUndefined), //
B(Return), //
},
1,
{InstanceType::SHARED_FUNCTION_INFO_TYPE}},
};
for (size_t i = 0; i < arraysize(snippets); i++) {
Handle<BytecodeArray> bytecode_array =
helper.MakeBytecodeForFunctionBody(snippets[i].code_snippet);
CheckBytecodeArrayEqual(snippets[i], bytecode_array);
}
}
TEST(GlobalCompoundExpressions) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
Zone zone;
FeedbackVectorSpec feedback_spec(&zone);
FeedbackVectorSlot slot1 = feedback_spec.AddLoadICSlot();
FeedbackVectorSlot slot2 = feedback_spec.AddStoreICSlot();
Handle<i::TypeFeedbackVector> vector =
i::NewTypeFeedbackVector(helper.isolate(), &feedback_spec);
ExpectedSnippet<const char*> snippets[] = {
{"var global = 1;\nfunction f() { return global &= 1; }\nf()",
1 * kPointerSize,
1,
13,
{
B(LdaGlobalSloppy), U8(0), U8(vector->GetIndex(slot1)), //
B(Star), R(0), //
B(LdaSmi8), U8(1), //
B(BitwiseAnd), R(0), //
B(StaGlobalSloppy), U8(0), U8(vector->GetIndex(slot2)), //
B(Return), //
},
1,
{"global"}},
{"unallocated = 1;\nfunction f() { return unallocated += 1; }\nf()",
1 * kPointerSize,
1,
13,
{
B(LdaGlobalSloppy), U8(0), U8(vector->GetIndex(slot1)), //
B(Star), R(0), //
B(LdaSmi8), U8(1), //
B(Add), R(0), //
B(StaGlobalSloppy), U8(0), U8(vector->GetIndex(slot2)), //
B(Return), //
},
1,
{"unallocated"}},
};
for (size_t i = 0; i < arraysize(snippets); i++) {
Handle<BytecodeArray> bytecode_array =
helper.MakeBytecode(snippets[i].code_snippet, "f");
CheckBytecodeArrayEqual(snippets[i], bytecode_array);
} }
} }
......
test/cctest/interpreter/test-interpreter.cc
View file @ 4e0d1143
...@@ -2145,3 +2145,57 @@ TEST(InterpreterGlobalCountOperators) { ...@@ -2145,3 +2145,57 @@ TEST(InterpreterGlobalCountOperators) {
CHECK(return_value->SameValue(*count_ops[i].second)); CHECK(return_value->SameValue(*count_ops[i].second));
} }
} }
TEST(InterpreterCompoundExpressions) {
HandleAndZoneScope handles;
i::Isolate* isolate = handles.main_isolate();
i::Factory* factory = isolate->factory();
std::pair<const char*, Handle<Object>> compound_expr[5] = {
std::make_pair("var a = 1; a += 2; return a;",
Handle<Object>(Smi::FromInt(3), isolate)),
std::make_pair("var a = 10; a /= 2; return a;",
Handle<Object>(Smi::FromInt(5), isolate)),
std::make_pair("var a = 'test'; a += 'ing'; return a;",
factory->NewStringFromStaticChars("testing")),
std::make_pair("var a = { val: 2 }; a.val *= 2; return a.val;",
Handle<Object>(Smi::FromInt(4), isolate)),
std::make_pair("var a = 1; (function f() { a = 2; })(); a += 24;"
"return a;",
Handle<Object>(Smi::FromInt(26), isolate)),
};
for (size_t i = 0; i < arraysize(compound_expr); i++) {
std::string source(
InterpreterTester::SourceForBody(compound_expr[i].first));
InterpreterTester tester(handles.main_isolate(), source.c_str());
auto callable = tester.GetCallable<>();
Handle<i::Object> return_value = callable().ToHandleChecked();
CHECK(return_value->SameValue(*compound_expr[i].second));
}
}
TEST(InterpreterGlobalCompoundExpressions) {
HandleAndZoneScope handles;
i::Isolate* isolate = handles.main_isolate();
std::pair<const char*, Handle<Object>> compound_expr[2] = {
std::make_pair("var global = 100;"
"function f() { global += 20; return global; }",
Handle<Object>(Smi::FromInt(120), isolate)),
std::make_pair("unallocated = 100;"
"function f() { unallocated -= 20; return unallocated; }",
Handle<Object>(Smi::FromInt(80), isolate)),
};
for (size_t i = 0; i < arraysize(compound_expr); i++) {
InterpreterTester tester(handles.main_isolate(), compound_expr[i].first);
auto callable = tester.GetCallable<>();
Handle<i::Object> return_value = callable().ToHandleChecked();
CHECK(return_value->SameValue(*compound_expr[i].second));
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment