Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/test/cctest/interpreter/bytecode_expectations/TryFinally.golden b/test/cctest/interpreter/bytecode_expectations/TryFinally.golden
index bd29e1a..de3bbf0 100644
--- a/test/cctest/interpreter/bytecode_expectations/TryFinally.golden
+++ b/test/cctest/interpreter/bytecode_expectations/TryFinally.golden
@@ -18,21 +18,21 @@
bytecodes: [
/* 30 E> */ B(StackCheck),
/* 42 S> */ B(LdaSmi), U8(1),
- /* 42 E> */ B(Star), R(0),
+ B(Star), R(0),
B(Mov), R(context), R(3),
/* 51 S> */ B(LdaSmi), U8(2),
- /* 53 E> */ B(Star), R(0),
+ B(Star), R(0),
B(LdaSmi), U8(-1),
B(Star), R(1),
B(Jump), U8(7),
B(Star), R(2),
B(LdaZero),
B(Star), R(1),
- B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
+ /* 53 E> */ B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
B(Star), R(3),
/* 70 S> */ B(LdaSmi), U8(3),
- /* 72 E> */ B(Star), R(0),
- B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(3), U8(1),
+ B(Star), R(0),
+ /* 72 E> */ B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(3), U8(1),
B(LdaZero),
B(TestEqualStrict), R(1),
B(JumpIfTrue), U8(4),
@@ -55,28 +55,27 @@
"
frame size: 9
parameter count: 1
-bytecode array length: 88
+bytecode array length: 87
bytecodes: [
/* 30 E> */ B(StackCheck),
/* 42 S> */ B(LdaSmi), U8(1),
- /* 42 E> */ B(Star), R(0),
+ B(Star), R(0),
B(Mov), R(context), R(4),
B(Mov), R(context), R(5),
/* 51 S> */ B(LdaSmi), U8(2),
- /* 53 E> */ B(Star), R(0),
- B(Jump), U8(34),
+ B(Star), R(0),
+ B(Jump), U8(33),
B(Star), R(7),
B(LdaConstant), U8(0),
B(Star), R(6),
- B(Ldar), R(closure),
- B(Star), R(8),
- B(CallRuntime), U16(Runtime::kPushCatchContext), R(6), U8(3),
+ B(Mov), R(closure), R(8),
+ /* 53 E> */ B(CallRuntime), U16(Runtime::kPushCatchContext), R(6), U8(3),
B(Star), R(5),
B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
B(Ldar), R(5),
B(PushContext), R(1),
/* 71 S> */ B(LdaSmi), U8(20),
- /* 73 E> */ B(Star), R(0),
+ B(Star), R(0),
B(PopContext), R(1),
B(LdaSmi), U8(-1),
B(Star), R(2),
@@ -84,11 +83,11 @@
B(Star), R(3),
B(LdaZero),
B(Star), R(2),
- B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
+ /* 73 E> */ B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
B(Star), R(4),
/* 90 S> */ B(LdaSmi), U8(3),
- /* 92 E> */ B(Star), R(0),
- B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(4), U8(1),
+ B(Star), R(0),
+ /* 92 E> */ B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(4), U8(1),
B(LdaZero),
B(TestEqualStrict), R(2),
B(JumpIfTrue), U8(4),
@@ -102,7 +101,7 @@
"e",
]
handlers: [
- [8, 49, 55],
+ [8, 48, 54],
[11, 15, 17],
]
@@ -114,41 +113,39 @@
"
frame size: 10
parameter count: 1
-bytecode array length: 121
+bytecode array length: 119
bytecodes: [
/* 30 E> */ B(StackCheck),
B(Mov), R(context), R(4),
B(Mov), R(context), R(5),
B(Mov), R(context), R(6),
/* 55 S> */ B(LdaSmi), U8(1),
- /* 57 E> */ B(Star), R(0),
- B(Jump), U8(34),
+ B(Star), R(0),
+ B(Jump), U8(33),
B(Star), R(8),
B(LdaConstant), U8(0),
B(Star), R(7),
- B(Ldar), R(closure),
- B(Star), R(9),
- B(CallRuntime), U16(Runtime::kPushCatchContext), R(7), U8(3),
+ B(Mov), R(closure), R(9),
+ /* 57 E> */ B(CallRuntime), U16(Runtime::kPushCatchContext), R(7), U8(3),
B(Star), R(6),
B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
B(Ldar), R(6),
B(PushContext), R(1),
/* 74 S> */ B(LdaSmi), U8(2),
- /* 76 E> */ B(Star), R(0),
+ B(Star), R(0),
B(PopContext), R(1),
- B(Jump), U8(34),
+ B(Jump), U8(33),
B(Star), R(7),
B(LdaConstant), U8(0),
B(Star), R(6),
- B(Ldar), R(closure),
- B(Star), R(8),
- B(CallRuntime), U16(Runtime::kPushCatchContext), R(6), U8(3),
+ B(Mov), R(closure), R(8),
+ /* 76 E> */ B(CallRuntime), U16(Runtime::kPushCatchContext), R(6), U8(3),
B(Star), R(5),
B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
B(Ldar), R(5),
B(PushContext), R(1),
/* 95 S> */ B(LdaSmi), U8(20),
- /* 97 E> */ B(Star), R(0),
+ B(Star), R(0),
B(PopContext), R(1),
B(LdaSmi), U8(-1),
B(Star), R(2),
@@ -156,11 +153,11 @@
B(Star), R(3),
B(LdaZero),
B(Star), R(2),
- B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
+ /* 97 E> */ B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
B(Star), R(4),
/* 114 S> */ B(LdaSmi), U8(3),
- /* 116 E> */ B(Star), R(0),
- B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(4), U8(1),
+ B(Star), R(0),
+ /* 116 E> */ B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(4), U8(1),
B(LdaZero),
B(TestEqualStrict), R(2),
B(JumpIfTrue), U8(4),
@@ -174,8 +171,8 @@
"e",
]
handlers: [
- [4, 82, 88],
- [7, 48, 50],
+ [4, 80, 86],
+ [7, 47, 49],
[10, 14, 16],
]