Index: test/unittests/compiler/js-typed-lowering-unittest.cc |
diff --git a/test/unittests/compiler/js-typed-lowering-unittest.cc b/test/unittests/compiler/js-typed-lowering-unittest.cc |
index db62a119f2be4b699b42a12a852797c892a12972..ca9812c9b1eb049cbd1f774d98b03ab80ed5b379 100644 |
--- a/test/unittests/compiler/js-typed-lowering-unittest.cc |
+++ b/test/unittests/compiler/js-typed-lowering-unittest.cc |
@@ -67,6 +67,7 @@ Type* const kJSTypes[] = {Type::Undefined(), Type::Null(), Type::Boolean(), |
STATIC_ASSERT(LANGUAGE_END == 3); |
const LanguageMode kLanguageModes[] = {SLOPPY, STRICT, STRONG}; |
+const Strength kStrengths[] = {Strength::NORMAL, Strength::STRONG}; |
} // namespace |
@@ -461,10 +462,10 @@ TEST_F(JSTypedLoweringTest, JSShiftLeftWithSigned32AndConstant) { |
Node* const effect = graph()->start(); |
Node* const control = graph()->start(); |
TRACED_FORRANGE(double, rhs, 0, 31) { |
- TRACED_FOREACH(LanguageMode, language_mode, kLanguageModes) { |
+ TRACED_FOREACH(Strength, strength, kStrengths) { |
Reduction r = Reduce(graph()->NewNode( |
- javascript()->ShiftLeft(language_mode), lhs, NumberConstant(rhs), |
- context, EmptyFrameState(), EmptyFrameState(), effect, control)); |
+ javascript()->ShiftLeft(strength), lhs, NumberConstant(rhs), context, |
+ EmptyFrameState(), EmptyFrameState(), effect, control)); |
ASSERT_TRUE(r.Changed()); |
EXPECT_THAT(r.replacement(), |
IsWord32Shl(lhs, IsNumberConstant(BitEq(rhs)))); |
@@ -479,10 +480,10 @@ TEST_F(JSTypedLoweringTest, JSShiftLeftWithSigned32AndUnsigned32) { |
Node* const context = UndefinedConstant(); |
Node* const effect = graph()->start(); |
Node* const control = graph()->start(); |
- TRACED_FOREACH(LanguageMode, language_mode, kLanguageModes) { |
- Reduction r = Reduce(graph()->NewNode( |
- javascript()->ShiftLeft(language_mode), lhs, rhs, context, |
- EmptyFrameState(), EmptyFrameState(), effect, control)); |
+ TRACED_FOREACH(Strength, strength, kStrengths) { |
+ Reduction r = Reduce(graph()->NewNode(javascript()->ShiftLeft(strength), |
+ lhs, rhs, context, EmptyFrameState(), |
+ EmptyFrameState(), effect, control)); |
ASSERT_TRUE(r.Changed()); |
EXPECT_THAT(r.replacement(), |
IsWord32Shl(lhs, IsWord32And(rhs, IsInt32Constant(0x1f)))); |
@@ -500,10 +501,10 @@ TEST_F(JSTypedLoweringTest, JSShiftRightWithSigned32AndConstant) { |
Node* const effect = graph()->start(); |
Node* const control = graph()->start(); |
TRACED_FORRANGE(double, rhs, 0, 31) { |
- TRACED_FOREACH(LanguageMode, language_mode, kLanguageModes) { |
+ TRACED_FOREACH(Strength, strength, kStrengths) { |
Reduction r = Reduce(graph()->NewNode( |
- javascript()->ShiftRight(language_mode), lhs, NumberConstant(rhs), |
- context, EmptyFrameState(), EmptyFrameState(), effect, control)); |
+ javascript()->ShiftRight(strength), lhs, NumberConstant(rhs), context, |
+ EmptyFrameState(), EmptyFrameState(), effect, control)); |
ASSERT_TRUE(r.Changed()); |
EXPECT_THAT(r.replacement(), |
IsWord32Sar(lhs, IsNumberConstant(BitEq(rhs)))); |
@@ -518,10 +519,10 @@ TEST_F(JSTypedLoweringTest, JSShiftRightWithSigned32AndUnsigned32) { |
Node* const context = UndefinedConstant(); |
Node* const effect = graph()->start(); |
Node* const control = graph()->start(); |
- TRACED_FOREACH(LanguageMode, language_mode, kLanguageModes) { |
- Reduction r = Reduce(graph()->NewNode( |
- javascript()->ShiftRight(language_mode), lhs, rhs, context, |
- EmptyFrameState(), EmptyFrameState(), effect, control)); |
+ TRACED_FOREACH(Strength, strength, kStrengths) { |
+ Reduction r = Reduce(graph()->NewNode(javascript()->ShiftRight(strength), |
+ lhs, rhs, context, EmptyFrameState(), |
+ EmptyFrameState(), effect, control)); |
ASSERT_TRUE(r.Changed()); |
EXPECT_THAT(r.replacement(), |
IsWord32Sar(lhs, IsWord32And(rhs, IsInt32Constant(0x1f)))); |
@@ -540,11 +541,10 @@ TEST_F(JSTypedLoweringTest, |
Node* const effect = graph()->start(); |
Node* const control = graph()->start(); |
TRACED_FORRANGE(double, rhs, 0, 31) { |
- TRACED_FOREACH(LanguageMode, language_mode, kLanguageModes) { |
- Reduction r = Reduce( |
- graph()->NewNode(javascript()->ShiftRightLogical(language_mode), lhs, |
- NumberConstant(rhs), context, EmptyFrameState(), |
- EmptyFrameState(), effect, control)); |
+ TRACED_FOREACH(Strength, strength, kStrengths) { |
+ Reduction r = Reduce(graph()->NewNode( |
+ javascript()->ShiftRightLogical(strength), lhs, NumberConstant(rhs), |
+ context, EmptyFrameState(), EmptyFrameState(), effect, control)); |
ASSERT_TRUE(r.Changed()); |
EXPECT_THAT(r.replacement(), |
IsWord32Shr(lhs, IsNumberConstant(BitEq(rhs)))); |
@@ -560,9 +560,9 @@ TEST_F(JSTypedLoweringTest, |
Node* const context = UndefinedConstant(); |
Node* const effect = graph()->start(); |
Node* const control = graph()->start(); |
- TRACED_FOREACH(LanguageMode, language_mode, kLanguageModes) { |
+ TRACED_FOREACH(Strength, strength, kStrengths) { |
Reduction r = Reduce(graph()->NewNode( |
- javascript()->ShiftRightLogical(language_mode), lhs, rhs, context, |
+ javascript()->ShiftRightLogical(strength), lhs, rhs, context, |
EmptyFrameState(), EmptyFrameState(), effect, control)); |
ASSERT_TRUE(r.Changed()); |
EXPECT_THAT(r.replacement(), |
@@ -938,7 +938,7 @@ TEST_F(JSTypedLoweringTest, JSLoadDynamicGlobal) { |
TEST_F(JSTypedLoweringTest, JSAddWithString) { |
- TRACED_FOREACH(LanguageMode, language_mode, kLanguageModes) { |
+ TRACED_FOREACH(Strength, strength, kStrengths) { |
Node* lhs = Parameter(Type::String(), 0); |
Node* rhs = Parameter(Type::String(), 1); |
Node* context = Parameter(Type::Any(), 2); |
@@ -946,9 +946,9 @@ TEST_F(JSTypedLoweringTest, JSAddWithString) { |
Node* frame_state1 = EmptyFrameState(); |
Node* effect = graph()->start(); |
Node* control = graph()->start(); |
- Reduction r = Reduce(graph()->NewNode(javascript()->Add(language_mode), lhs, |
- rhs, context, frame_state0, |
- frame_state1, effect, control)); |
+ Reduction r = |
+ Reduce(graph()->NewNode(javascript()->Add(strength), lhs, rhs, context, |
+ frame_state0, frame_state1, effect, control)); |
ASSERT_TRUE(r.Changed()); |
EXPECT_THAT( |
r.replacement(), |