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 459fe6232c7162ad1e00baefc4651fc91b408f82..0ed587033413958c7d359af14967506942f4dafa 100644 |
--- a/test/cctest/interpreter/test-bytecode-generator.cc |
+++ b/test/cctest/interpreter/test-bytecode-generator.cc |
@@ -395,6 +395,143 @@ TEST(PrimitiveExpressions) { |
B(ShiftRightLogical), R(1), // |
B(Return) // |
}, |
+ 0}, |
+ {"var x = 0; return (x, 3);", |
+ 1 * kPointerSize, |
+ 1, |
+ 8, |
+ { |
+ B(LdaZero), // |
+ B(Star), R(0), // |
+ B(Ldar), R(0), // |
+ B(LdaSmi8), U8(3), // |
+ B(Return) // |
+ }, |
+ 0}}; |
+ |
+for (size_t i = 0; i < arraysize(snippets); i++) { |
rmcilroy
2015/10/14 14:32:44
Weird indentation here?
mythria
2015/10/14 14:59:55
Done.
|
+ Handle<BytecodeArray> bytecode_array = |
+ helper.MakeBytecodeForFunctionBody(snippets[i].code_snippet); |
+ CheckBytecodeArrayEqual(snippets[i], bytecode_array); |
+} |
+} |
+ |
+ |
+TEST(LogicalExpressions) { |
+InitializedHandleScope handle_scope; |
+BytecodeGeneratorHelper helper; |
+ |
+ |
+ ExpectedSnippet<int> snippets[] = { |
+ {"var x = 0; return x || 3;", |
+ 1 * kPointerSize, |
+ 1, |
+ 10, |
+ { |
+ B(LdaZero), // |
+ B(Star), R(0), // |
+ B(Ldar), R(0), // |
+ B(JumpIfToBooleanTrue), U8(4), // |
+ B(LdaSmi8), U8(3), // |
+ B(Return) // |
+ }, |
+ 0}, |
+ {"var x = 0; return x && 3;", |
+ 1 * kPointerSize, |
+ 1, |
+ 10, |
+ { |
+ B(LdaZero), // |
+ B(Star), R(0), // |
+ B(Ldar), R(0), // |
+ B(JumpIfToBooleanFalse), U8(4), // |
+ B(LdaSmi8), U8(3), // |
+ B(Return) // |
+ }, |
+ 0}, |
+ {"var x = 1; var a = 2, b = 3; return x || (" |
+#define X "a, b, a, b, " |
+ X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X |
+#undef X |
+ "3);", |
+ 3 * kPointerSize, |
+ 1, |
+ 283, |
+ { |
+ B(LdaSmi8), U8(1), // |
+ B(Star), R(0), // |
+ B(LdaSmi8), U8(2), // |
+ B(Star), R(1), // |
+ B(LdaSmi8), U8(3), // |
+ B(Star), R(2), // |
+ B(Ldar), R(0), // |
+ B(JumpIfToBooleanTrueConstant), U8(0), // |
+#define X B(Ldar), R(1), B(Ldar), R(2), B(Ldar), R(1), B(Ldar), R(2), |
+ X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X // |
+#undef X // |
+ B(LdaSmi8), U8(3), // |
+ B(Return) // |
+ }, |
+ 1, |
+ {268, 0, 0, 0}}, |
+ {"var x = 0; var a = 2, b = 3; return x && (" |
+#define X "a, b, a, b, " |
+ X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X |
+#undef X |
+ "3);", |
+ 3 * kPointerSize, |
+ 1, |
+ 282, |
+ { |
+ B(LdaZero), // |
+ B(Star), R(0), // |
+ B(LdaSmi8), U8(2), // |
+ B(Star), R(1), // |
+ B(LdaSmi8), U8(3), // |
+ B(Star), R(2), // |
+ B(Ldar), R(0), // |
+ B(JumpIfToBooleanFalseConstant), U8(0), // |
+#define X B(Ldar), R(1), B(Ldar), R(2), B(Ldar), R(1), B(Ldar), R(2), |
+ X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X // |
+#undef X // |
+ B(LdaSmi8), U8(3), // |
+ B(Return) // |
+ }, |
+ 1, |
+ {268, 0, 0, 0}}, |
+ {"return 0 && 3;", |
+ 0 * kPointerSize, |
+ 1, |
+ 2, |
+ { |
+ B(LdaZero), // |
+ B(Return) // |
+ }, |
+ 0}, |
+ {"return 1 || 3;", |
+ 0 * kPointerSize, |
+ 1, |
+ 3, |
+ { |
+ B(LdaSmi8), U8(1), // |
+ B(Return) // |
+ }, |
+ 0}, |
+ {"var x = 1; return x && 3 || 0,1;", |
rmcilroy
2015/10/14 14:32:44
nit - /s/0,1/0, 1
mythria
2015/10/14 14:59:55
Done.
|
+ 1 * kPointerSize, |
+ 1, |
+ 16, |
+ { |
+ B(LdaSmi8), U8(1), // |
+ B(Star), R(0), // |
+ B(Ldar), R(0), // |
+ B(JumpIfToBooleanFalse), U8(4), // |
+ B(LdaSmi8), U8(3), // |
+ B(JumpIfToBooleanTrue), U8(3), // |
+ B(LdaZero), // |
+ B(LdaSmi8), U8(1), // |
+ B(Return) // |
+ }, |
0}}; |
for (size_t i = 0; i < arraysize(snippets); i++) { |