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

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

Issue 1613443002: [interpreter] Implement handling of try-finally constructs. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Rebased. Created 4 years, 11 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/control-flow-builders.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 b2be0ec90e32fcc022a42cf34e81f8f7f6e179f2..47c81e81ef9c12102df7046c604854868c9a4eb8 100644
--- a/test/cctest/interpreter/test-bytecode-generator.cc
+++ b/test/cctest/interpreter/test-bytecode-generator.cc
@@ -4249,92 +4249,128 @@ TEST(TryFinally) {
ExpectedSnippet<const char*> snippets[] = {
{"var a = 1; try { a = 2; } finally { a = 3; }",
- 2 * kPointerSize,
+ 4 * kPointerSize,
1,
- 14,
+ 35,
{
- B(LdaSmi8), U8(1), //
- B(Star), R(0), //
- B(LdaSmi8), U8(2), //
- B(Star), R(0), //
- B(LdaSmi8), U8(3), //
- B(Star), R(0), //
- B(LdaUndefined), //
- B(Return), //
+ B(LdaSmi8), U8(1), //
+ B(Star), R(0), //
+ B(LdaSmi8), U8(2), //
+ B(Star), R(0), //
+ B(LdaSmi8), U8(-1), //
+ B(Star), R(1), //
+ B(Jump), U8(7), //
+ B(Star), R(2), //
+ B(LdaZero), //
+ B(Star), R(1), //
+ B(LdaSmi8), U8(3), //
+ B(Star), R(0), //
+ B(LdaZero), //
+ B(TestEqualStrict), R(1), //
+ B(JumpIfTrue), U8(4), //
+ B(Jump), U8(5), //
+ B(Ldar), R(2), //
+ B(Throw), //
+ B(LdaUndefined), //
+ B(Return), //
},
0,
{},
1,
- {{4, 8, 8}}},
+ {{4, 8, 14}}},
{"var a = 1; try { a = 2; } catch(e) { a = 20 } finally { a = 3; }",
- 7 * kPointerSize,
+ 9 * kPointerSize,
1,
- 39,
+ 60,
{
B(LdaSmi8), U8(1), //
B(Star), R(0), //
B(LdaSmi8), U8(2), //
B(Star), R(0), //
B(Jump), U8(25), //
- B(Star), R(5), //
+ B(Star), R(7), //
B(LdaConstant), U8(0), //
- B(Star), R(4), //
- B(Ldar), R(closure), //
B(Star), R(6), //
- B(CallRuntime), U16(Runtime::kPushCatchContext), R(4), U8(3), //
+ B(Ldar), R(closure), //
+ B(Star), R(8), //
+ B(CallRuntime), U16(Runtime::kPushCatchContext), R(6), U8(3), //
B(PushContext), R(1), //
B(LdaSmi8), U8(20), //
B(Star), R(0), //
B(PopContext), R(context), //
+ B(LdaSmi8), U8(-1), //
+ B(Star), R(2), //
+ B(Jump), U8(7), //
+ B(Star), R(3), //
+ B(LdaZero), //
+ B(Star), R(2), //
B(LdaSmi8), U8(3), //
B(Star), R(0), //
+ B(LdaZero), //
+ B(TestEqualStrict), R(2), //
+ B(JumpIfTrue), U8(4), //
+ B(Jump), U8(5), //
+ B(Ldar), R(3), //
+ B(Throw), //
B(LdaUndefined), //
B(Return), //
},
1,
{"e"},
2,
- {{4, 33, 33}, {4, 8, 10}}},
+ {{4, 33, 39}, {4, 8, 10}}},
{"var a; try {"
" try { a = 1 } catch(e) { a = 2 }"
"} catch(e) { a = 20 } finally { a = 3; }",
- 8 * kPointerSize,
+ 10 * kPointerSize,
1,
- 60,
+ 81,
{
B(LdaSmi8), U8(1), //
B(Star), R(0), //
B(Jump), U8(25), //
- B(Star), R(6), //
+ B(Star), R(8), //
B(LdaConstant), U8(0), //
- B(Star), R(5), //
- B(Ldar), R(closure), //
B(Star), R(7), //
- B(CallRuntime), U16(Runtime::kPushCatchContext), R(5), U8(3), //
+ B(Ldar), R(closure), //
+ B(Star), R(9), //
+ B(CallRuntime), U16(Runtime::kPushCatchContext), R(7), U8(3), //
B(PushContext), R(1), //
B(LdaSmi8), U8(2), //
B(Star), R(0), //
B(PopContext), R(context), //
B(Jump), U8(25), //
- B(Star), R(5), //
+ B(Star), R(7), //
B(LdaConstant), U8(0), //
- B(Star), R(4), //
- B(Ldar), R(closure), //
B(Star), R(6), //
- B(CallRuntime), U16(Runtime::kPushCatchContext), R(4), U8(3), //
+ B(Ldar), R(closure), //
+ B(Star), R(8), //
+ B(CallRuntime), U16(Runtime::kPushCatchContext), R(6), U8(3), //
B(PushContext), R(1), //
B(LdaSmi8), U8(20), //
B(Star), R(0), //
B(PopContext), R(context), //
+ B(LdaSmi8), U8(-1), //
+ B(Star), R(2), //
+ B(Jump), U8(7), //
+ B(Star), R(3), //
+ B(LdaZero), //
+ B(Star), R(2), //
B(LdaSmi8), U8(3), //
B(Star), R(0), //
+ B(LdaZero), //
+ B(TestEqualStrict), R(2), //
+ B(JumpIfTrue), U8(4), //
+ B(Jump), U8(5), //
+ B(Ldar), R(3), //
+ B(Throw), //
B(LdaUndefined), //
B(Return), //
},
1,
{"e"},
3,
- {{0, 54, 54}, {0, 29, 31}, {0, 4, 6}}},
+ {{0, 54, 60}, {0, 29, 31}, {0, 4, 6}}},
};
for (size_t i = 0; i < arraysize(snippets); i++) {
« no previous file with comments | « src/interpreter/control-flow-builders.cc ('k') | test/cctest/interpreter/test-interpreter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698