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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1419823003: Remove support for "loads and stores to global vars through property cell shortcuts inst… (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@disable-shortcuts
Patch Set: Addressing comments Created 5 years, 2 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
« no previous file with comments | « src/interpreter/interpreter.cc ('k') | test/unittests/compiler/js-type-feedback-unittest.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 7524e9c3839afb3c233212d4f13720bb773df71c..dcb153e2b1fe750409d35c7c4602f803ef5be7d9 100644
--- a/test/cctest/interpreter/test-bytecode-generator.cc
+++ b/test/cctest/interpreter/test-bytecode-generator.cc
@@ -1019,29 +1019,47 @@ TEST(PropertyCall) {
TEST(LoadGlobal) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
+ Zone zone;
- if (!FLAG_global_var_shortcuts) return;
+ int context_reg = Register::function_context().index();
+ int global_index = Context::GLOBAL_OBJECT_INDEX;
- ExpectedSnippet<int> snippets[] = {
+ FeedbackVectorSpec feedback_spec(&zone);
+ FeedbackVectorSlot slot1 = feedback_spec.AddLoadICSlot();
+
+ Handle<i::TypeFeedbackVector> vector =
+ i::NewTypeFeedbackVector(helper.isolate(), &feedback_spec);
+
+ ExpectedSnippet<InstanceType> snippets[] = {
{
"var a = 1;\nfunction f() { return a; }\nf()",
- 0,
+ kPointerSize,
1,
- 3,
+ 11,
{
- B(LdaGlobal), _, //
- B(Return) //
+ B(LdaContextSlot), R(context_reg), U8(global_index), //
+ B(Star), R(0), //
+ B(LdaConstant), U8(0), //
+ B(LoadICSloppy), R(0), U8(vector->GetIndex(slot1)), //
+ B(Return) //
},
+ 1,
+ {InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE},
},
{
"function t() { }\nfunction f() { return t; }\nf()",
- 0,
+ kPointerSize,
1,
- 3,
+ 11,
{
- B(LdaGlobal), _, //
- B(Return) //
+ B(LdaContextSlot), R(context_reg), U8(global_index), //
+ B(Star), R(0), //
+ B(LdaConstant), U8(0), //
+ B(LoadICSloppy), R(0), U8(vector->GetIndex(slot1)), //
+ B(Return) //
},
+ 1,
+ {InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE},
},
};
@@ -1056,45 +1074,77 @@ TEST(LoadGlobal) {
TEST(StoreGlobal) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
+ Zone zone;
+
+ int context_reg = Register::function_context().index();
+ int global_index = Context::GLOBAL_OBJECT_INDEX;
- if (!FLAG_global_var_shortcuts) return;
+ FeedbackVectorSpec feedback_spec(&zone);
+ FeedbackVectorSlot slot1 = feedback_spec.AddStoreICSlot();
+
+ Handle<i::TypeFeedbackVector> vector =
+ i::NewTypeFeedbackVector(helper.isolate(), &feedback_spec);
ExpectedSnippet<InstanceType> snippets[] = {
{
"var a = 1;\nfunction f() { a = 2; }\nf()",
- 0,
+ 3 * kPointerSize,
1,
- 6,
+ 21,
{
- B(LdaSmi8), U8(2), //
- B(StaGlobalSloppy), _, //
- B(LdaUndefined), //
- B(Return) //
+ 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(StoreICSloppy), R(1), R(2), U8(vector->GetIndex(slot1)), //
+ B(LdaUndefined), //
+ B(Return) //
},
+ 1,
+ {InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE},
},
{
"var a = \"test\"; function f(b) { a = b; }\nf(\"global\")",
- 0,
+ 3 * kPointerSize,
2,
- 6,
+ 21,
{
- B(Ldar), R(helper.kLastParamIndex), //
- B(StaGlobalSloppy), _, //
- B(LdaUndefined), //
- B(Return) //
+ B(Ldar), R(helper.kLastParamIndex), //
+ 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(StoreICSloppy), R(1), R(2), U8(vector->GetIndex(slot1)), //
+ B(LdaUndefined), //
+ B(Return) //
},
+ 1,
+ {InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE},
},
{
"'use strict'; var a = 1;\nfunction f() { a = 2; }\nf()",
- 0,
+ 3 * kPointerSize,
1,
- 6,
+ 21,
{
- B(LdaSmi8), U8(2), //
- B(StaGlobalStrict), _, //
- B(LdaUndefined), //
- B(Return) //
+ 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(StoreICStrict), R(1), R(2), U8(vector->GetIndex(slot1)), //
+ B(LdaUndefined), //
+ B(Return) //
},
+ 1,
+ {InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE},
},
};
@@ -1109,43 +1159,63 @@ TEST(StoreGlobal) {
TEST(CallGlobal) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
+ Zone zone;
- if (!FLAG_global_var_shortcuts) return;
+ int context_reg = Register::function_context().index();
+ int global_index = Context::GLOBAL_OBJECT_INDEX;
- ExpectedSnippet<int> snippets[] = {
+ FeedbackVectorSpec feedback_spec(&zone);
+ FeedbackVectorSlot slot1 = feedback_spec.AddCallICSlot();
+ FeedbackVectorSlot slot2 = feedback_spec.AddLoadICSlot();
+ USE(slot1);
+
+ Handle<i::TypeFeedbackVector> vector =
+ i::NewTypeFeedbackVector(helper.isolate(), &feedback_spec);
+
+ ExpectedSnippet<InstanceType> snippets[] = {
{
"function t() { }\nfunction f() { return t(); }\nf()",
- 2 * kPointerSize,
+ 3 * kPointerSize,
1,
- 12,
+ 20,
{
- B(LdaUndefined), //
- B(Star), R(1), //
- B(LdaGlobal), _, //
- B(Star), R(0), //
- B(Call), R(0), R(1), U8(0), //
- B(Return) //
+ B(LdaUndefined), //
+ B(Star), R(1), //
+ B(LdaContextSlot), R(context_reg), U8(global_index), //
+ B(Star), R(2), //
+ B(LdaConstant), U8(0), //
+ B(LoadICSloppy), R(2), U8(vector->GetIndex(slot2)), //
+ B(Star), R(0), //
+ B(Call), R(0), R(1), U8(0), //
+ B(Return) //
},
+ 1,
+ {InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE},
},
{
"function t(a, b, c) { }\nfunction f() { return t(1, 2, 3); }\nf()",
5 * kPointerSize,
1,
- 24,
+ 32,
{
- B(LdaUndefined), //
- B(Star), R(1), //
- B(LdaGlobal), _, //
- B(Star), R(0), //
- B(LdaSmi8), U8(1), //
- B(Star), R(2), //
- B(LdaSmi8), U8(2), //
- B(Star), R(3), //
- B(LdaSmi8), U8(3), //
- B(Star), R(4), //
- B(Call), R(0), R(1), U8(3), //
- B(Return) //
+ B(LdaUndefined), //
+ B(Star), R(1), //
+ B(LdaContextSlot), R(context_reg), U8(global_index), //
+ B(Star), R(2), //
+ B(LdaConstant), U8(0), //
+ B(LoadICSloppy), R(2), U8(vector->GetIndex(slot2)), //
+ B(Star), R(0), //
+ B(LdaSmi8), U8(1), //
+ B(Star), R(2), //
+ B(LdaSmi8), U8(2), //
+ B(Star), R(3), //
+ B(LdaSmi8), U8(3), //
+ B(Star), R(4), //
+ B(Call), R(0), R(1), U8(3), //
+ B(Return) //
},
+ 1,
+ {InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE},
},
};
@@ -1480,14 +1550,11 @@ TEST(IfConditions) {
}
-// Tests !FLAG_global_var_shortcuts mode.
TEST(DeclareGlobals) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
Zone zone;
- if (FLAG_global_var_shortcuts) return;
-
int context_reg = Register::function_context().index();
int global_index = Context::GLOBAL_OBJECT_INDEX;
@@ -1615,135 +1682,6 @@ TEST(DeclareGlobals) {
}
-// Tests FLAG_global_var_shortcuts mode.
-// TODO(ishell): remove when FLAG_global_var_shortcuts is removed.
-TEST(DeclareGlobals2) {
- InitializedHandleScope handle_scope;
- BytecodeGeneratorHelper helper;
-
- if (!FLAG_global_var_shortcuts) return;
-
- ExpectedSnippet<InstanceType> snippets[] = {
- {"var a = 1;",
- 5 * kPointerSize,
- 1,
- 45,
- {
- B(Ldar), R(Register::function_closure().index()), //
- B(Star), R(2), //
- B(LdaConstant), U8(0), //
- B(Star), R(3), //
- B(CallRuntime), U16(Runtime::kNewScriptContext), R(2), U8(2), //
- B(PushContext), R(1), //
- B(LdaConstant), U8(1), //
- B(Star), R(2), //
- B(LdaZero), //
- B(Star), R(3), //
- B(CallRuntime), U16(Runtime::kDeclareGlobals), R(2), U8(2), //
- B(LdaConstant), U8(2), //
- B(Star), R(2), //
- B(LdaZero), //
- B(Star), R(3), //
- B(LdaSmi8), U8(1), //
- B(Star), R(4), //
- B(CallRuntime), U16(Runtime::kInitializeVarGlobal), R(2), U8(3), //
- B(LdaUndefined), //
- B(Return), //
- },
- 3,
- {InstanceType::FIXED_ARRAY_TYPE, InstanceType::FIXED_ARRAY_TYPE,
- InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE}},
- {"function f() {}",
- 3 * kPointerSize,
- 1,
- 29,
- {
- B(Ldar), R(Register::function_closure().index()), //
- B(Star), R(1), //
- B(LdaConstant), U8(0), //
- B(Star), R(2), //
- B(CallRuntime), U16(Runtime::kNewScriptContext), R(1), U8(2), //
- B(PushContext), R(0), //
- B(LdaConstant), U8(1), //
- B(Star), R(1), //
- B(LdaZero), //
- B(Star), R(2), //
- B(CallRuntime), U16(Runtime::kDeclareGlobals), R(1), U8(2), //
- B(LdaUndefined), //
- B(Return) //
- },
- 2,
- {InstanceType::FIXED_ARRAY_TYPE, InstanceType::FIXED_ARRAY_TYPE}},
- {"var a = 1;\na=2;",
- 5 * kPointerSize,
- 1,
- 52,
- {
- B(Ldar), R(Register::function_closure().index()), //
- B(Star), R(2), //
- B(LdaConstant), U8(0), //
- B(Star), R(3), //
- B(CallRuntime), U16(Runtime::kNewScriptContext), R(2), U8(2), //
- B(PushContext), R(1), //
- B(LdaConstant), U8(1), //
- B(Star), R(2), //
- B(LdaZero), //
- B(Star), R(3), //
- B(CallRuntime), U16(Runtime::kDeclareGlobals), R(2), U8(2), //
- B(LdaConstant), U8(2), //
- B(Star), R(2), //
- B(LdaZero), //
- B(Star), R(3), //
- B(LdaSmi8), U8(1), //
- B(Star), R(4), //
- B(CallRuntime), U16(Runtime::kInitializeVarGlobal), R(2), //
- U8(3), //
- B(LdaSmi8), U8(2), //
- B(StaGlobalSloppy), _, //
- B(Star), R(0), //
- B(Ldar), R(0), //
- B(Return) //
- },
- 3,
- {InstanceType::FIXED_ARRAY_TYPE, InstanceType::FIXED_ARRAY_TYPE,
- InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE}},
- {"function f() {}\nf();",
- 4 * kPointerSize,
- 1,
- 43,
- {
- B(Ldar), R(Register::function_closure().index()), //
- B(Star), R(2), //
- B(LdaConstant), U8(0), //
- B(Star), R(3), //
- B(CallRuntime), U16(Runtime::kNewScriptContext), R(2), U8(2), //
- B(PushContext), R(1), //
- B(LdaConstant), U8(1), //
- B(Star), R(2), //
- B(LdaZero), //
- B(Star), R(3), //
- B(CallRuntime), U16(Runtime::kDeclareGlobals), R(2), U8(2), //
- B(LdaUndefined), //
- B(Star), R(3), //
- B(LdaGlobal), _, //
- B(Star), R(2), //
- B(Call), R(2), R(3), U8(0), //
- B(Star), R(0), //
- B(Ldar), R(0), //
- B(Return) //
- },
- 2,
- {InstanceType::FIXED_ARRAY_TYPE, InstanceType::FIXED_ARRAY_TYPE}},
- };
-
- 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);
- }
-}
-
-
TEST(BasicLoops) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
@@ -2679,13 +2617,10 @@ TEST(ObjectLiterals) {
}
-// Tests !FLAG_global_var_shortcuts mode.
TEST(TopLevelObjectLiterals) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
- if (FLAG_global_var_shortcuts) return;
-
int has_function_flags = ObjectLiteral::kFastElements |
ObjectLiteral::kHasFunction |
ObjectLiteral::kDisableMementos;
@@ -2735,70 +2670,6 @@ TEST(TopLevelObjectLiterals) {
}
-// Tests FLAG_global_var_shortcuts mode.
-// TODO(ishell): remove when FLAG_global_var_shortcuts is removed.
-TEST(TopLevelObjectLiterals2) {
- InitializedHandleScope handle_scope;
- BytecodeGeneratorHelper helper;
-
- if (!FLAG_global_var_shortcuts) return;
-
- int has_function_flags = ObjectLiteral::kFastElements |
- ObjectLiteral::kHasFunction |
- ObjectLiteral::kDisableMementos;
- ExpectedSnippet<InstanceType> snippets[] = {
- {"var a = { func: function() { } };",
- 7 * kPointerSize,
- 1,
- 69,
- {
- B(Ldar), R(Register::function_closure().index()), //
- B(Star), R(2), //
- B(LdaConstant), U8(0), //
- B(Star), R(3), //
- B(CallRuntime), U16(Runtime::kNewScriptContext), R(2), U8(2), //
- B(PushContext), R(1), //
- B(LdaConstant), U8(1), //
- B(Star), R(2), //
- B(LdaZero), //
- B(Star), R(3), //
- B(CallRuntime), U16(Runtime::kDeclareGlobals), R(2), U8(2), //
- B(LdaConstant), U8(2), //
- B(Star), R(2), //
- B(LdaZero), //
- B(Star), R(3), //
- B(LdaConstant), U8(3), //
- B(CreateObjectLiteral), U8(0), U8(has_function_flags), //
- B(Star), R(5), //
- B(LdaConstant), U8(4), //
- B(Star), R(6), //
- B(LdaConstant), U8(5), //
- B(CreateClosure), U8(1), //
- B(StoreICSloppy), R(5), R(6), U8(3), //
- B(CallRuntime), U16(Runtime::kToFastProperties), R(5), U8(1), //
- B(Ldar), R(5), //
- B(Star), R(4), //
- B(CallRuntime), U16(Runtime::kInitializeVarGlobal), R(2), U8(3), //
- B(LdaUndefined), //
- B(Return),
- },
- 6,
- {InstanceType::FIXED_ARRAY_TYPE,
- InstanceType::FIXED_ARRAY_TYPE,
- InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
- InstanceType::FIXED_ARRAY_TYPE,
- InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
- InstanceType::SHARED_FUNCTION_INFO_TYPE}},
- };
-
- for (size_t i = 0; i < arraysize(snippets); i++) {
- Handle<BytecodeArray> bytecode_array =
- helper.MakeTopLevelBytecode(snippets[i].code_snippet);
- CheckBytecodeArrayEqual(snippets[i], bytecode_array);
- }
-}
-
-
TEST(TryCatch) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
@@ -2922,14 +2793,11 @@ TEST(Throw) {
}
-// Tests !FLAG_global_var_shortcuts mode.
TEST(CallNew) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
Zone zone;
- if (FLAG_global_var_shortcuts) return;
-
int context_reg = Register::function_context().index();
int global_index = Context::GLOBAL_OBJECT_INDEX;
@@ -3016,76 +2884,6 @@ TEST(CallNew) {
}
-// Tests FLAG_global_var_shortcuts mode.
-// TODO(ishell): remove when FLAG_global_var_shortcuts is removed.
-TEST(CallNew2) {
- InitializedHandleScope handle_scope;
- BytecodeGeneratorHelper helper;
-
- if (!FLAG_global_var_shortcuts) return;
-
- ExpectedSnippet<InstanceType> snippets[] = {
- {"function bar() { this.value = 0; }\n"
- "function f() { return new bar(); }\n"
- "f()",
- kPointerSize,
- 1,
- 9,
- {
- B(LdaGlobal), _, //
- B(Star), R(0), //
- B(New), R(0), R(0), U8(0), //
- B(Return), //
- },
- 0},
- {"function bar(x) { this.value = 18; this.x = x;}\n"
- "function f() { return new bar(3); }\n"
- "f()",
- 2 * kPointerSize,
- 1,
- 13,
- {
- B(LdaGlobal), _, //
- B(Star), R(0), //
- B(LdaSmi8), U8(3), //
- B(Star), R(1), //
- B(New), R(0), R(1), U8(1), //
- B(Return), //
- },
- 0},
- {"function bar(w, x, y, z) {\n"
- " this.value = 18;\n"
- " this.x = x;\n"
- " this.y = y;\n"
- " this.z = z;\n"
- "}\n"
- "function f() { return new bar(3, 4, 5); }\n"
- "f()",
- 4 * kPointerSize,
- 1,
- 21,
- {
- B(LdaGlobal), _, //
- B(Star), R(0), //
- B(LdaSmi8), U8(3), //
- B(Star), R(1), //
- B(LdaSmi8), U8(4), //
- B(Star), R(2), //
- B(LdaSmi8), U8(5), //
- B(Star), R(3), //
- B(New), R(0), R(1), U8(3), //
- B(Return), //
- },
- 0}};
-
- 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(ContextVariables) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
« no previous file with comments | « src/interpreter/interpreter.cc ('k') | test/unittests/compiler/js-type-feedback-unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698