Chromium Code Reviews| 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 55fe9e8a54fc2da45eb299efe21d7db26c4fa960..2fad1a66a09e2781ceaa1939e9b75e351c97652b 100644 |
| --- a/test/cctest/interpreter/test-bytecode-generator.cc |
| +++ b/test/cctest/interpreter/test-bytecode-generator.cc |
| @@ -395,6 +395,18 @@ 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++) { |
| @@ -405,6 +417,90 @@ TEST(PrimitiveExpressions) { |
| } |
| +TEST(LogicalExpressions) { |
| + InitializedHandleScope handle_scope; |
| + BytecodeGeneratorHelper helper; |
| + |
| + Handle<Object> unused = helper.factory()->undefined_value(); |
| + |
| + ExpectedSnippet<Handle<Object>> 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, |
| + {unused, unused, unused, unused}}, |
| + {"var x = 1; var a = 2, b = 3; return x || (" |
|
rmcilroy
2015/10/13 15:43:24
Could you make a similar test for && as well pleas
mythria
2015/10/14 13:33:42
Done.
|
| +#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), |
|
rmcilroy
2015/10/13 15:43:24
nit - indentation, and add '//' after
mythria
2015/10/14 13:33:42
Done.
|
| + U8(3), // |
| + B(Return) // |
| + }, |
| + 1, |
| + {helper.factory()->NewNumberFromInt(268), unused, unused, unused}}, |
| + {"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, |
| + {unused, unused, unused, unused}}, |
|
rmcilroy
2015/10/13 15:43:24
nit - would be nice to have one test that is neste
mythria
2015/10/14 13:33:42
Done.
|
| + {"return 0 && 3;", |
| + 0 * kPointerSize, |
| + 1, |
| + 2, |
| + {B(LdaZero), B(Return)}, |
|
rmcilroy
2015/10/13 15:43:24
nit - new bytecode on new line (use '//' to avoid
mythria
2015/10/14 13:33:42
Done.
|
| + 0, |
| + {unused, unused, unused, unused}}, |
| + {" return 1 || 3;", |
|
rmcilroy
2015/10/13 15:43:24
nit - remove extra space at start
mythria
2015/10/14 13:33:42
Done.
|
| + 0 * kPointerSize, |
| + 1, |
| + 3, |
| + {B(LdaSmi8), U8(1), B(Return)}, |
|
rmcilroy
2015/10/13 15:43:24
ditto
mythria
2015/10/14 13:33:42
Done.
|
| + 0, |
| + {unused, unused, unused, unused}}}; |
| + |
| + for (size_t i = 0; i < arraysize(snippets); i++) { |
| + Handle<BytecodeArray> bytecode_array = |
| + helper.MakeBytecodeForFunctionBody(snippets[i].code_snippet); |
| + CheckBytecodeArrayEqual(snippets[i], bytecode_array); |
| + } |
| +} |
| + |
| + |
| TEST(Parameters) { |
| InitializedHandleScope handle_scope; |
| BytecodeGeneratorHelper helper; |