Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(684)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1378523005: [Interpreter] Add support for global declarations and load/store of global variables (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@int_toplevel
Patch Set: 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
« src/interpreter/bytecode-generator.cc ('K') | « src/interpreter/interpreter.cc ('k') | test/cctest/interpreter/test-interpreter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/cctest/interpreter/test-bytecode-generator.cc
diff --git a/test/cctest/interpreter/test-bytecode-generator.cc b/test/cctest/interpreter/test-bytecode-generator.cc
index a9ebb1d75f40e64fdd1c135861fe24afbe215b73..bae0ad72e8a4a46bf975468c0c5c0652aa9e03ff 100644
--- a/test/cctest/interpreter/test-bytecode-generator.cc
+++ b/test/cctest/interpreter/test-bytecode-generator.cc
@@ -34,6 +34,16 @@ class BytecodeGeneratorHelper {
Factory* factory() { return CcTest::i_isolate()->factory(); }
+ Handle<BytecodeArray> MakeTopLevelBytecode(const char* source) {
+ const char* old_ignition_filter = i::FLAG_ignition_filter;
+ i::FLAG_ignition_filter = "*";
+ Local<v8::Script> script = v8_compile(source);
+ i::FLAG_ignition_filter = old_ignition_filter;
+ i::Handle<i::JSFunction> js_function = v8::Utils::OpenHandle(*script);
+ return handle(js_function->shared()->bytecode_array(), CcTest::i_isolate());
+ }
+
+
Handle<BytecodeArray> MakeBytecode(const char* script,
const char* function_name) {
CompileRun(script);
@@ -116,12 +126,14 @@ static void CheckBytecodeArrayEqual(struct ExpectedSnippet<T> expected,
CHECK_EQ(actual->frame_size(), expected.frame_size);
CHECK_EQ(actual->parameter_count(), expected.parameter_count);
CHECK_EQ(actual->length(), expected.bytecode_length);
- if (expected.constant_count == 0) {
- CHECK_EQ(actual->constant_pool(), CcTest::heap()->empty_fixed_array());
- } else {
- CHECK_EQ(actual->constant_pool()->length(), expected.constant_count);
- for (int i = 0; i < expected.constant_count; i++) {
- CheckConstant(expected.constants[i], actual->constant_pool()->get(i));
+ if (expected.constant_count != -1) {
+ if (expected.constant_count == 0) {
+ CHECK_EQ(actual->constant_pool(), CcTest::heap()->empty_fixed_array());
+ } else {
+ CHECK_EQ(actual->constant_pool()->length(), expected.constant_count);
+ for (int i = 0; i < expected.constant_count; i++) {
+ CheckConstant(expected.constants[i], actual->constant_pool()->get(i));
+ }
}
}
@@ -258,7 +270,21 @@ TEST(Parameters) {
{"function f(arg1, arg2, arg3, arg4, arg5, arg6, arg7) { return arg4; }",
0, 8, 3, {B(Ldar), R(helper.kLastParamIndex - 3), B(Return)}, 0},
{"function f(arg1, arg2, arg3, arg4, arg5, arg6, arg7) { return this; }",
- 0, 8, 3, {B(Ldar), R(helper.kLastParamIndex - 7), B(Return)}, 0}
+ 0, 8, 3, {B(Ldar), R(helper.kLastParamIndex - 7), B(Return)}, 0},
+ {"function f(arg1) { arg1 = 1; }",
+ 0, 2, 6,
+ {B(LdaSmi8), U8(1), //
+ B(Star), R(helper.kLastParamIndex), //
+ B(LdaUndefined), //
+ B(Return)},
+ 0},
+ {"function f(arg1, arg2, arg3, arg4) { arg2 = 1; }",
+ 0, 5, 6,
+ {B(LdaSmi8), U8(1), //
+ B(Star), R(helper.kLastParamIndex - 2), //
+ B(LdaUndefined), //
+ B(Return)},
+ 0},
};
for (size_t i = 0; i < arraysize(snippets); i++) {
@@ -713,6 +739,45 @@ TEST(LoadGlobal) {
}
+TEST(StoreGlobal) {
+ InitializedHandleScope handle_scope;
+ BytecodeGeneratorHelper helper;
+
+ ExpectedSnippet<int> snippets[] = {
+ {
+ "var a = 1;\nfunction f() { a = 2; }\nf()",
+ 0,
+ 1,
+ 6,
+ {
+ B(LdaSmi8), U8(2), //
+ B(StaGlobal), _, //
+ B(LdaUndefined), //
+ B(Return) //
+ },
+ },
+ {
+ "var a = \"test\"; function f(b) { a = b; }\nf(\"global\")",
+ 0,
+ 2,
+ 6,
+ {
+ B(Ldar), R(helper.kLastParamIndex), //
+ B(StaGlobal), _, //
+ B(LdaUndefined), //
+ B(Return) //
+ },
+ },
+ };
+
+ 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, true);
+ }
+}
+
+
TEST(CallGlobal) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
@@ -763,6 +828,104 @@ TEST(CallGlobal) {
}
+TEST(LoadUnallocated) {
+ InitializedHandleScope handle_scope;
+ BytecodeGeneratorHelper helper;
+
+ int context_reg = Register::function_context().index();
+ int global_index = Context::GLOBAL_OBJECT_INDEX;
+ Code::Kind ic_kinds[] = {i::Code::LOAD_IC};
+ FeedbackVectorSpec feedback_spec(0, 1, ic_kinds);
+ Handle<i::TypeFeedbackVector> vector =
+ helper.factory()->NewTypeFeedbackVector(&feedback_spec);
+
+ ExpectedSnippet<const char*> snippets[] = {
+ {"a = 1;\nfunction f() { return a; }\nf()",
+ 1 * kPointerSize,
+ 1,
+ 11,
+ {B(LdaContextSlot), R(context_reg), U8(global_index), //
+ B(Star), R(0), //
+ B(LdaConstant), U8(0), //
+ B(LoadIC), R(0), U8(vector->first_ic_slot_index()), //
+ B(Return)},
+ 1,
+ {"a"}},
+ {"function f() { return t; }\nf()\nt = 1;",
+ 1 * kPointerSize,
+ 1,
+ 11,
+ {B(LdaContextSlot), R(context_reg), U8(global_index), //
+ B(Star), R(0), //
+ B(LdaConstant), U8(0), //
+ B(LoadIC), R(0), U8(vector->first_ic_slot_index()), //
+ B(Return)},
+ 1,
+ {"t"}},
+ };
+
+ 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, true);
+ }
+}
+
+
+TEST(StoreUnallocated) {
+ InitializedHandleScope handle_scope;
+ BytecodeGeneratorHelper helper;
+
+ int context_reg = Register::function_context().index();
+ int global_index = Context::GLOBAL_OBJECT_INDEX;
+ Code::Kind ic_kinds[] = {i::Code::LOAD_IC};
+ FeedbackVectorSpec feedback_spec(0, 1, ic_kinds);
+ Handle<i::TypeFeedbackVector> vector =
+ helper.factory()->NewTypeFeedbackVector(&feedback_spec);
+
+ ExpectedSnippet<const char*> snippets[] = {
+ {"a = 1;\nfunction f() { a = 2; }\nf()",
+ 3 * kPointerSize,
+ 1,
+ 21,
+ {B(LdaSmi8), U8(2), //
+ B(Star), R(0), //
+ B(LdaContextSlot), R(context_reg), U8(global_index), //
+ B(Star), R(1), //
+ B(LdaConstant), U8(0), //
+ B(Star), R(2), //
+ B(Ldar), R(0), //
+ B(StoreIC), R(1), R(2), U8(vector->first_ic_slot_index()), //
+ B(LdaUndefined), //
+ B(Return)},
+ 1,
+ {"a"}},
+ {"function f() { t = 4; }\nf()\nt = 1;",
+ 3 * kPointerSize,
+ 1,
+ 21,
+ {B(LdaSmi8), U8(4), //
+ B(Star), R(0), //
+ B(LdaContextSlot), R(context_reg), U8(global_index), //
+ B(Star), R(1), //
+ B(LdaConstant), U8(0), //
+ B(Star), R(2), //
+ B(Ldar), R(0), //
+ B(StoreIC), R(1), R(2), U8(vector->first_ic_slot_index()), //
+ B(LdaUndefined), //
+ B(Return)},
+ 1,
+ {"t"}},
+ };
+
+ 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, true);
+ }
+}
+
+
TEST(CallRuntime) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
@@ -953,7 +1116,8 @@ TEST(IfConditions) {
{helper.factory()->NewHeapNumber(0.01),
helper.factory()->NewNumberFromInt(200),
helper.factory()->NewNumberFromInt(199),
- helper.factory()->NewNumberFromInt(-200)}}};
+ helper.factory()->NewNumberFromInt(-200)}}
+ };
for (size_t i = 0; i < arraysize(snippets); i++) {
Handle<BytecodeArray> bytecode_array =
@@ -963,6 +1127,57 @@ TEST(IfConditions) {
}
+TEST(DeclareGlobals) {
+ InitializedHandleScope handle_scope;
+ BytecodeGeneratorHelper helper;
+
+ ExpectedSnippet<int> snippets[] = {
+ {"var a = 1;",
+ 4 * kPointerSize,
+ 1,
+ 30,
+ {
+ B(LdaConstant), U8(0), //
+ B(Star), R(1), //
+ B(LdaZero), //
+ B(Star), R(2), //
+ B(CallRuntime), U16(Runtime::kDeclareGlobals), R(1), U8(2), //
+ B(LdaConstant), U8(1), //
+ B(Star), R(1), //
+ B(LdaZero), //
+ B(Star), R(2), //
+ B(LdaSmi8), U8(1), //
+ B(Star), R(3), //
+ B(CallRuntime), U16(Runtime::kInitializeVarGlobal), R(1), //
+ U8(3), //
+ B(LdaUndefined), //
+ B(Return) //
+ },
+ -1},
+ {"function f() {}",
+ 2 * kPointerSize,
+ 1,
+ 14,
+ {
+ B(LdaConstant), U8(0), //
+ B(Star), R(0), //
+ B(LdaZero), //
+ B(Star), R(1), //
+ B(CallRuntime), U16(Runtime::kDeclareGlobals), R(0), U8(2), //
+ B(LdaUndefined), //
+ B(Return) //
+ },
+ -1},
+ };
+
+ for (size_t i = 0; i < arraysize(snippets); i++) {
+ Handle<BytecodeArray> bytecode_array =
+ helper.MakeTopLevelBytecode(snippets[i].code_snippet);
+ CheckBytecodeArrayEqual(snippets[i], bytecode_array, true);
+ }
+}
+
+
} // namespace interpreter
} // namespace internal
} // namespance v8
« src/interpreter/bytecode-generator.cc ('K') | « src/interpreter/interpreter.cc ('k') | test/cctest/interpreter/test-interpreter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698