[strong] Refactor ObjectStrength into a replacement for strong boolean args

test/cctest/compiler/test-js-typed-lowering.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/js-graph.h"
 #include "src/compiler/js-typed-lowering.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node-properties.h"
 #include "src/compiler/opcodes.h"
 #include "src/compiler/operator-properties.h"
 #include "src/compiler/typer.h"
 #include "test/cctest/cctest.h"
 
 using namespace v8::internal;
 using namespace v8::internal::compiler;
 
-#ifndef TEST_WITH_STRONG
-#define TEST_WITH_STRONG(Name)                                                 \
-  static void Test##Name();                                                    \
-  static void TestWithStrong##Name(LanguageMode language_mode);                \
-  CcTest register_test_##Name(Test##Name, __FILE__, #Name, NULL, true, true);  \
-  static void Test##Name() {                                                   \
-    TestWithStrong##Name(LanguageMode::SLOPPY);                                \
-    TestWithStrong##Name(LanguageMode::STRONG);                                \
-  }                                                                            \
-  static void TestWithStrong##Name(LanguageMode language_mode)
+#ifndef TEST_WITH_STRENGTH
+#define TEST_WITH_STRENGTH(Name)                                              \
+  static void Test##Name();                                                   \
+  static void TestWithStrength##Name(Strength strength);                      \
+  CcTest register_test_##Name(Test##Name, __FILE__, #Name, NULL, true, true); \
+  static void Test##Name() {                                                  \
+    TestWithStrength##Name(Strength::NORMAL);                                 \
+    TestWithStrength##Name(Strength::STRONG);                                 \
+  }                                                                           \
+  static void TestWithStrength##Name(Strength strength)
 #endif
 
 
 class JSTypedLoweringTester : public HandleAndZoneScope {
  public:
   explicit JSTypedLoweringTester(int num_parameters = 0)
       : isolate(main_isolate()),
         binop(NULL),
         unop(NULL),
         javascript(main_zone()),
@@ skipping 189 matching lines @@
 }
 
 
 static IrOpcode::Value NumberToI32(bool is_signed) {
   return is_signed ? IrOpcode::kNumberToInt32 : IrOpcode::kNumberToUint32;
 }
 
 
 // TODO(turbofan): Lowering of StringAdd is disabled for now.
 #if 0
-TEST_WITH_STRONG(StringBinops) {
+TEST_WITH_STRENGTH(StringBinops) {
   JSTypedLoweringTester R;
 
   for (size_t i = 0; i < arraysize(kStringTypes); ++i) {
     Node* p0 = R.Parameter(kStringTypes[i], 0);
 
     for (size_t j = 0; j < arraysize(kStringTypes); ++j) {
       Node* p1 = R.Parameter(kStringTypes[j], 1);
 
-      Node* add = R.Binop(R.javascript.Add(language_mode), p0, p1);
+      Node* add = R.Binop(R.javascript.Add(strength), p0, p1);
       Node* r = R.reduce(add);
 
       R.CheckPureBinop(IrOpcode::kStringAdd, r);
       CHECK_EQ(p0, r->InputAt(0));
       CHECK_EQ(p1, r->InputAt(1));
     }
   }
 }
 #endif
 
 
-TEST_WITH_STRONG(AddNumber1) {
+TEST_WITH_STRENGTH(AddNumber1) {
   JSTypedLoweringTester R;
   for (size_t i = 0; i < arraysize(kNumberTypes); ++i) {
     Node* p0 = R.Parameter(kNumberTypes[i], 0);
     Node* p1 = R.Parameter(kNumberTypes[i], 1);
-    Node* add = R.Binop(R.javascript.Add(language_mode), p0, p1);
+    Node* add = R.Binop(R.javascript.Add(strength), p0, p1);
     Node* r = R.reduce(add);
 
     R.CheckPureBinop(IrOpcode::kNumberAdd, r);
     CHECK_EQ(p0, r->InputAt(0));
     CHECK_EQ(p1, r->InputAt(1));
   }
 }
 
 
-TEST_WITH_STRONG(NumberBinops) {
+TEST_WITH_STRENGTH(NumberBinops) {
   JSTypedLoweringTester R;
   const Operator* ops[] = {
-      R.javascript.Add(language_mode),      R.simplified.NumberAdd(),
-      R.javascript.Subtract(language_mode), R.simplified.NumberSubtract(),
-      R.javascript.Multiply(language_mode), R.simplified.NumberMultiply(),
-      R.javascript.Divide(language_mode),   R.simplified.NumberDivide(),
-      R.javascript.Modulus(language_mode),  R.simplified.NumberModulus(),
+      R.javascript.Add(strength),      R.simplified.NumberAdd(),
+      R.javascript.Subtract(strength), R.simplified.NumberSubtract(),
+      R.javascript.Multiply(strength), R.simplified.NumberMultiply(),
+      R.javascript.Divide(strength),   R.simplified.NumberDivide(),
+      R.javascript.Modulus(strength),  R.simplified.NumberModulus(),
   };
 
   for (size_t i = 0; i < arraysize(kNumberTypes); ++i) {
     Node* p0 = R.Parameter(kNumberTypes[i], 0);
 
     for (size_t j = 0; j < arraysize(kNumberTypes); ++j) {
       Node* p1 = R.Parameter(kNumberTypes[j], 1);
 
       for (size_t k = 0; k < arraysize(ops); k += 2) {
         Node* add = R.Binop(ops[k], p0, p1);
@@ skipping 19 matching lines @@
     double v = OpParameter<double>(new_input);
     double e = static_cast<double>(is_signed ? FastD2I(v) : FastD2UI(v));
     CHECK_EQ(e, v);
   }
 }
 
 
 // A helper class for testing lowering of bitwise shift operators.
 class JSBitwiseShiftTypedLoweringTester : public JSTypedLoweringTester {
  public:
-  explicit JSBitwiseShiftTypedLoweringTester(LanguageMode language_mode)
-      : JSTypedLoweringTester(), language_mode_(language_mode) {
+  explicit JSBitwiseShiftTypedLoweringTester(Strength strength)
+      : JSTypedLoweringTester(), strength_(strength) {
     int i = 0;
-    set(i++, javascript.ShiftLeft(language_mode_), true);
+    set(i++, javascript.ShiftLeft(strength_), true);
     set(i++, machine.Word32Shl(), false);
-    set(i++, javascript.ShiftRight(language_mode_), true);
+    set(i++, javascript.ShiftRight(strength_), true);
     set(i++, machine.Word32Sar(), false);
-    set(i++, javascript.ShiftRightLogical(language_mode_), false);
+    set(i++, javascript.ShiftRightLogical(strength_), false);
     set(i++, machine.Word32Shr(), false);
   }
   static const int kNumberOps = 6;
   const Operator* ops[kNumberOps];
   bool signedness[kNumberOps];
 
  private:
-  LanguageMode language_mode_;
+  Strength strength_;
   void set(int idx, const Operator* op, bool s) {
     ops[idx] = op;
     signedness[idx] = s;
   }
 };
 
 
 TEST(Int32BitwiseShifts) {
-  JSBitwiseShiftTypedLoweringTester R(LanguageMode::SLOPPY);
+  JSBitwiseShiftTypedLoweringTester R(Strength::NORMAL);
 
   Type* types[] = {
       Type::SignedSmall(), Type::UnsignedSmall(), Type::Negative32(),
       Type::Unsigned31(),  Type::Unsigned32(),    Type::Signed32(),
       Type::MinusZero(),   Type::NaN(),           Type::Undefined(),
       Type::Null(),        Type::Boolean(),       Type::Number(),
       Type::PlainNumber(), Type::String()};
 
   for (size_t i = 0; i < arraysize(types); ++i) {
     Node* p0 = R.Parameter(types[i], 0);
@@ skipping 20 matching lines @@
         }
       }
     }
   }
 }
 
 
 // A helper class for testing lowering of bitwise operators.
 class JSBitwiseTypedLoweringTester : public JSTypedLoweringTester {
  public:
-  explicit JSBitwiseTypedLoweringTester(LanguageMode language_mode)
-      : JSTypedLoweringTester(), language_mode_(language_mode) {
+  explicit JSBitwiseTypedLoweringTester(Strength strength)
+      : JSTypedLoweringTester(), strength_(strength) {
     int i = 0;
-    set(i++, javascript.BitwiseOr(language_mode_), true);
+    set(i++, javascript.BitwiseOr(strength_), true);
     set(i++, machine.Word32Or(), true);
-    set(i++, javascript.BitwiseXor(language_mode_), true);
+    set(i++, javascript.BitwiseXor(strength_), true);
     set(i++, machine.Word32Xor(), true);
-    set(i++, javascript.BitwiseAnd(language_mode_), true);
+    set(i++, javascript.BitwiseAnd(strength_), true);
     set(i++, machine.Word32And(), true);
   }
   static const int kNumberOps = 6;
   const Operator* ops[kNumberOps];
   bool signedness[kNumberOps];
 
  private:
-  LanguageMode language_mode_;
+  Strength strength_;
   void set(int idx, const Operator* op, bool s) {
     ops[idx] = op;
     signedness[idx] = s;
   }
 };
 
 
 TEST(Int32BitwiseBinops) {
-  JSBitwiseTypedLoweringTester R(LanguageMode::SLOPPY);
+  JSBitwiseTypedLoweringTester R(Strength::NORMAL);
 
   Type* types[] = {
       Type::SignedSmall(),   Type::UnsignedSmall(), Type::Unsigned32(),
       Type::Signed32(),      Type::MinusZero(),     Type::NaN(),
       Type::OrderedNumber(), Type::PlainNumber(),   Type::Undefined(),
       Type::Null(),          Type::Boolean(),       Type::Number(),
       Type::String()};
 
   for (size_t i = 0; i < arraysize(types); ++i) {
     Node* p0 = R.Parameter(types[i], 0);
@@ skipping 171 matching lines @@
       CHECK_EQ(IrOpcode::kHeapConstant, r->opcode());
     }
 
     CHECK_EQ(n, add->InputAt(0));
     CHECK_EQ(r, add->InputAt(1));
     R.CheckEffectInput(R.start(), effect_use);
   }
 }
 
 
-TEST_WITH_STRONG(StringComparison) {
+TEST_WITH_STRENGTH(StringComparison) {
   JSTypedLoweringTester R;
 
   const Operator* ops[] = {
-      R.javascript.LessThan(language_mode), R.simplified.StringLessThan(),
-      R.javascript.LessThanOrEqual(language_mode),
-      R.simplified.StringLessThanOrEqual(),
-      R.javascript.GreaterThan(language_mode), R.simplified.StringLessThan(),
-      R.javascript.GreaterThanOrEqual(language_mode),
+      R.javascript.LessThan(strength), R.simplified.StringLessThan(),
+      R.javascript.LessThanOrEqual(strength),
+      R.simplified.StringLessThanOrEqual(), R.javascript.GreaterThan(strength),
+      R.simplified.StringLessThan(), R.javascript.GreaterThanOrEqual(strength),
       R.simplified.StringLessThanOrEqual()};
 
   for (size_t i = 0; i < arraysize(kStringTypes); i++) {
     Node* p0 = R.Parameter(kStringTypes[i], 0);
     for (size_t j = 0; j < arraysize(kStringTypes); j++) {
       Node* p1 = R.Parameter(kStringTypes[j], 1);
 
       for (size_t k = 0; k < arraysize(ops); k += 2) {
         Node* cmp = R.Binop(ops[k], p0, p1);
         Node* r = R.reduce(cmp);
@@ skipping 21 matching lines @@
     CHECK_EQ(IrOpcode::kBooleanToNumber, converted->opcode());
     CHECK_EQ(val, converted->InputAt(0));
   } else {
     if (converted->opcode() == IrOpcode::kNumberConstant) return;
     CHECK_EQ(IrOpcode::kJSToNumber, converted->opcode());
     CHECK_EQ(val, converted->InputAt(0));
   }
 }
 
 
-TEST_WITH_STRONG(NumberComparison) {
+TEST_WITH_STRENGTH(NumberComparison) {
   JSTypedLoweringTester R;
 
   const Operator* ops[] = {
-      R.javascript.LessThan(language_mode), R.simplified.NumberLessThan(),
-      R.javascript.LessThanOrEqual(language_mode),
-      R.simplified.NumberLessThanOrEqual(),
-      R.javascript.GreaterThan(language_mode), R.simplified.NumberLessThan(),
-      R.javascript.GreaterThanOrEqual(language_mode),
+      R.javascript.LessThan(strength), R.simplified.NumberLessThan(),
+      R.javascript.LessThanOrEqual(strength),
+      R.simplified.NumberLessThanOrEqual(), R.javascript.GreaterThan(strength),
+      R.simplified.NumberLessThan(), R.javascript.GreaterThanOrEqual(strength),
       R.simplified.NumberLessThanOrEqual()};
 
   Node* const p0 = R.Parameter(Type::Number(), 0);
   Node* const p1 = R.Parameter(Type::Number(), 1);
 
   for (size_t k = 0; k < arraysize(ops); k += 2) {
     Node* cmp = R.Binop(ops[k], p0, p1);
     Node* r = R.reduce(cmp);
 
     R.CheckPureBinop(ops[k + 1], r);
     if (k >= 4) {
       // GreaterThan and GreaterThanOrEqual commute the inputs
       // and use the LessThan and LessThanOrEqual operators.
       CheckIsConvertedToNumber(p1, r->InputAt(0));
       CheckIsConvertedToNumber(p0, r->InputAt(1));
     } else {
       CheckIsConvertedToNumber(p0, r->InputAt(0));
       CheckIsConvertedToNumber(p1, r->InputAt(1));
     }
   }
 }
 
 
-TEST_WITH_STRONG(MixedComparison1) {
+TEST_WITH_STRENGTH(MixedComparison1) {
   JSTypedLoweringTester R;
 
   Type* types[] = {Type::Number(), Type::String(),
                    Type::Union(Type::Number(), Type::String(), R.main_zone())};
 
   for (size_t i = 0; i < arraysize(types); i++) {
     Node* p0 = R.Parameter(types[i], 0);
 
     for (size_t j = 0; j < arraysize(types); j++) {
       Node* p1 = R.Parameter(types[j], 1);
       {
-        const Operator* less_than = R.javascript.LessThan(language_mode);
+        const Operator* less_than = R.javascript.LessThan(strength);
         Node* cmp = R.Binop(less_than, p0, p1);
         Node* r = R.reduce(cmp);
         if (types[i]->Is(Type::String()) && types[j]->Is(Type::String())) {
           R.CheckPureBinop(R.simplified.StringLessThan(), r);
         } else if ((types[i]->Is(Type::Number()) &&
                     types[j]->Is(Type::Number())) ||
-                   (!is_strong(language_mode) &&
+                   (!is_strong(strength) &&
                     (!types[i]->Maybe(Type::String()) ||
                      !types[j]->Maybe(Type::String())))) {
           R.CheckPureBinop(R.simplified.NumberLessThan(), r);
         } else {
           // No reduction of mixed types.
           CHECK_EQ(r->op(), less_than);
         }
       }
     }
   }
 }
 
 
-TEST_WITH_STRONG(RemoveToNumberEffects) {
+TEST_WITH_STRENGTH(RemoveToNumberEffects) {
   JSTypedLoweringTester R;
 
   Node* effect_use = NULL;
   for (int i = 0; i < 10; i++) {
     Node* p0 = R.Parameter(Type::Number());
     Node* ton = R.Unop(R.javascript.ToNumber(), p0);
     Node* frame_state = R.EmptyFrameState(R.context());
     effect_use = NULL;
 
     switch (i) {
       case 0:
         DCHECK(OperatorProperties::GetFrameStateInputCount(
                    R.javascript.ToNumber()) == 1);
         effect_use = R.graph.NewNode(R.javascript.ToNumber(), p0, R.context(),
                                      frame_state, ton, R.start());
         break;
       case 1:
         DCHECK(OperatorProperties::GetFrameStateInputCount(
                    R.javascript.ToNumber()) == 1);
         effect_use = R.graph.NewNode(R.javascript.ToNumber(), ton, R.context(),
                                      frame_state, ton, R.start());
         break;
       case 2:
         effect_use = R.graph.NewNode(R.common.EffectPhi(1), ton, R.start());
       case 3:
-        effect_use = R.graph.NewNode(R.javascript.Add(language_mode), ton, ton,
-                                     R.context(), frame_state, frame_state, ton,
-                                     R.start());
+        effect_use =
+            R.graph.NewNode(R.javascript.Add(strength), ton, ton, R.context(),
+                            frame_state, frame_state, ton, R.start());
         break;
       case 4:
-        effect_use = R.graph.NewNode(R.javascript.Add(language_mode), p0, p0,
-                                     R.context(), frame_state, frame_state, ton,
-                                     R.start());
+        effect_use =
+            R.graph.NewNode(R.javascript.Add(strength), p0, p0, R.context(),
+                            frame_state, frame_state, ton, R.start());
         break;
       case 5:
         effect_use = R.graph.NewNode(R.common.Return(), p0, ton, R.start());
         break;
       case 6:
         effect_use = R.graph.NewNode(R.common.Return(), ton, ton, R.start());
     }
 
     R.CheckEffectInput(R.start(), ton);
     if (effect_use != NULL) R.CheckEffectInput(ton, effect_use);
@@ skipping 137 matching lines @@
 TEST(StringEquality) {
   JSTypedLoweringTester R;
   Node* p0 = R.Parameter(Type::String());
   Node* p1 = R.Parameter(Type::String());
 
   CheckEqualityReduction(&R, true, p0, p1, IrOpcode::kStringEqual);
   CheckEqualityReduction(&R, false, p0, p1, IrOpcode::kStringEqual);
 }
 
 
-TEST_WITH_STRONG(RemovePureNumberBinopEffects) {
+TEST_WITH_STRENGTH(RemovePureNumberBinopEffects) {
   JSTypedLoweringTester R;
 
   const Operator* ops[] = {
-      R.javascript.Equal(),           R.simplified.NumberEqual(),
-      R.javascript.Add(language_mode),      R.simplified.NumberAdd(),
-      R.javascript.Subtract(language_mode), R.simplified.NumberSubtract(),
-      R.javascript.Multiply(language_mode), R.simplified.NumberMultiply(),
-      R.javascript.Divide(language_mode),   R.simplified.NumberDivide(),
-      R.javascript.Modulus(language_mode),  R.simplified.NumberModulus(),
-      R.javascript.LessThan(language_mode), R.simplified.NumberLessThan(),
-      R.javascript.LessThanOrEqual(language_mode),
+      R.javascript.Equal(), R.simplified.NumberEqual(),
+      R.javascript.Add(strength), R.simplified.NumberAdd(),
+      R.javascript.Subtract(strength), R.simplified.NumberSubtract(),
+      R.javascript.Multiply(strength), R.simplified.NumberMultiply(),
+      R.javascript.Divide(strength), R.simplified.NumberDivide(),
+      R.javascript.Modulus(strength), R.simplified.NumberModulus(),
+      R.javascript.LessThan(strength), R.simplified.NumberLessThan(),
+      R.javascript.LessThanOrEqual(strength),
       R.simplified.NumberLessThanOrEqual(),
   };
 
   for (size_t j = 0; j < arraysize(ops); j += 2) {
     BinopEffectsTester B(ops[j], Type::Number(), Type::Number());
     CHECK_EQ(ops[j + 1]->opcode(), B.result->op()->opcode());
 
     B.R.CheckPureBinop(B.result->opcode(), B.result);
 
     B.CheckNoOp(0);
     B.CheckNoOp(1);
 
     B.CheckEffectsRemoved();
   }
 }
 
 
 TEST(OrderNumberBinopEffects1) {
   JSTypedLoweringTester R;
 
   const Operator* ops[] = {
-      R.javascript.Subtract(LanguageMode::SLOPPY),
-      R.simplified.NumberSubtract(),
-      R.javascript.Multiply(LanguageMode::SLOPPY),
-      R.simplified.NumberMultiply(),
-      R.javascript.Divide(LanguageMode::SLOPPY),
-      R.simplified.NumberDivide(),
-  };
+      R.javascript.Subtract(Strength::NORMAL), R.simplified.NumberSubtract(),
+      R.javascript.Multiply(Strength::NORMAL), R.simplified.NumberMultiply(),
+      R.javascript.Divide(Strength::NORMAL),   R.simplified.NumberDivide()};
 
   for (size_t j = 0; j < arraysize(ops); j += 2) {
     BinopEffectsTester B(ops[j], Type::Symbol(), Type::Symbol());
     CHECK_EQ(ops[j + 1]->opcode(), B.result->op()->opcode());
 
     Node* i0 = B.CheckConvertedInput(IrOpcode::kJSToNumber, 0, true);
     Node* i1 = B.CheckConvertedInput(IrOpcode::kJSToNumber, 1, true);
 
     CHECK_EQ(B.p0, i0->InputAt(0));
     CHECK_EQ(B.p1, i1->InputAt(0));
 
     // Effects should be ordered start -> i0 -> i1 -> effect_use
     B.CheckEffectOrdering(i0, i1);
   }
 }
 
 
 TEST(OrderNumberBinopEffects2) {
   JSTypedLoweringTester R;
 
   const Operator* ops[] = {
-      R.javascript.Add(LanguageMode::SLOPPY),
-      R.simplified.NumberAdd(),
-      R.javascript.Subtract(LanguageMode::SLOPPY),
-      R.simplified.NumberSubtract(),
-      R.javascript.Multiply(LanguageMode::SLOPPY),
-      R.simplified.NumberMultiply(),
-      R.javascript.Divide(LanguageMode::SLOPPY),
-      R.simplified.NumberDivide(),
-  };
+      R.javascript.Add(Strength::NORMAL), R.simplified.NumberAdd(),
+      R.javascript.Subtract(Strength::NORMAL), R.simplified.NumberSubtract(),
+      R.javascript.Multiply(Strength::NORMAL), R.simplified.NumberMultiply(),
+      R.javascript.Divide(Strength::NORMAL), R.simplified.NumberDivide()};
 
   for (size_t j = 0; j < arraysize(ops); j += 2) {
     BinopEffectsTester B(ops[j], Type::Number(), Type::Symbol());
 
     Node* i0 = B.CheckNoOp(0);
     Node* i1 = B.CheckConvertedInput(IrOpcode::kJSToNumber, 1, true);
 
     CHECK_EQ(B.p0, i0);
     CHECK_EQ(B.p1, i1->InputAt(0));
 
@@ skipping 13 matching lines @@
     // Effects should be ordered start -> i0 -> effect_use
     B.CheckEffectOrdering(i0);
   }
 }
 
 
 TEST(OrderCompareEffects) {
   JSTypedLoweringTester R;
 
   const Operator* ops[] = {
-      R.javascript.GreaterThan(LanguageMode::SLOPPY),
-      R.simplified.NumberLessThan(),
-      R.javascript.GreaterThanOrEqual(LanguageMode::SLOPPY),
+      R.javascript.GreaterThan(Strength::NORMAL), R.simplified.NumberLessThan(),
+      R.javascript.GreaterThanOrEqual(Strength::NORMAL),
       R.simplified.NumberLessThanOrEqual(),
   };
 
   for (size_t j = 0; j < arraysize(ops); j += 2) {
     BinopEffectsTester B(ops[j], Type::Symbol(), Type::String());
     CHECK_EQ(ops[j + 1]->opcode(), B.result->op()->opcode());
 
     Node* i0 = B.CheckConvertedInput(IrOpcode::kJSToNumber, 0, true);
     Node* i1 = B.CheckConvertedInput(IrOpcode::kJSToNumber, 1, true);
 
@@ skipping 27 matching lines @@
     CHECK_EQ(B.p1, i0);  // Should be commuted.
     CHECK_EQ(B.p0, i1->InputAt(0));
 
     // Effects should be ordered start -> i0 -> effect_use
     B.CheckEffectOrdering(i1);
   }
 }
 
 
 TEST(Int32BinopEffects) {
-  JSBitwiseTypedLoweringTester R(LanguageMode::SLOPPY);
+  JSBitwiseTypedLoweringTester R(Strength::NORMAL);
   for (int j = 0; j < R.kNumberOps; j += 2) {
     bool signed_left = R.signedness[j], signed_right = R.signedness[j + 1];
     BinopEffectsTester B(R.ops[j], I32Type(signed_left), I32Type(signed_right));
     CHECK_EQ(R.ops[j + 1]->opcode(), B.result->op()->opcode());
 
     B.R.CheckPureBinop(B.result->opcode(), B.result);
 
     B.CheckNoOp(0);
     B.CheckNoOp(1);
 
@@ skipping 60 matching lines @@
     Node* ii1 = B.CheckConverted(IrOpcode::kJSToNumber, i1->InputAt(0), true);
 
     CHECK_EQ(B.p0, ii0->InputAt(0));
     CHECK_EQ(B.p1, ii1->InputAt(0));
 
     B.CheckEffectOrdering(ii0, ii1);
   }
 }
 
 
-TEST_WITH_STRONG(Int32AddNarrowing) {
+TEST_WITH_STRENGTH(Int32AddNarrowing) {
   {
-    JSBitwiseTypedLoweringTester R(language_mode);
+    JSBitwiseTypedLoweringTester R(strength);
 
     for (int o = 0; o < R.kNumberOps; o += 2) {
       for (size_t i = 0; i < arraysize(kInt32Types); i++) {
         Node* n0 = R.Parameter(kInt32Types[i]);
         for (size_t j = 0; j < arraysize(kInt32Types); j++) {
           Node* n1 = R.Parameter(kInt32Types[j]);
           Node* one = R.graph.NewNode(R.common.NumberConstant(1));
 
           for (int l = 0; l < 2; l++) {
             Node* add_node = R.Binop(R.simplified.NumberAdd(), n0, n1);
             Node* or_node =
                 R.Binop(R.ops[o], l ? add_node : one, l ? one : add_node);
             Node* r = R.reduce(or_node);
 
             CHECK_EQ(R.ops[o + 1]->opcode(), r->op()->opcode());
             CHECK_EQ(IrOpcode::kNumberAdd, add_node->opcode());
           }
         }
       }
     }
   }
   {
-    JSBitwiseShiftTypedLoweringTester R(language_mode);
+    JSBitwiseShiftTypedLoweringTester R(strength);
 
     for (int o = 0; o < R.kNumberOps; o += 2) {
       for (size_t i = 0; i < arraysize(kInt32Types); i++) {
         Node* n0 = R.Parameter(kInt32Types[i]);
         for (size_t j = 0; j < arraysize(kInt32Types); j++) {
           Node* n1 = R.Parameter(kInt32Types[j]);
           Node* one = R.graph.NewNode(R.common.NumberConstant(1));
 
           for (int l = 0; l < 2; l++) {
             Node* add_node = R.Binop(R.simplified.NumberAdd(), n0, n1);
             Node* or_node =
                 R.Binop(R.ops[o], l ? add_node : one, l ? one : add_node);
             Node* r = R.reduce(or_node);
 
             CHECK_EQ(R.ops[o + 1]->opcode(), r->op()->opcode());
             CHECK_EQ(IrOpcode::kNumberAdd, add_node->opcode());
           }
         }
       }
     }
   }
   {
-    JSBitwiseTypedLoweringTester R(language_mode);
+    JSBitwiseTypedLoweringTester R(strength);
 
     for (int o = 0; o < R.kNumberOps; o += 2) {
       Node* n0 = R.Parameter(I32Type(R.signedness[o]));
       Node* n1 = R.Parameter(I32Type(R.signedness[o + 1]));
       Node* one = R.graph.NewNode(R.common.NumberConstant(1));
 
       Node* add_node = R.Binop(R.simplified.NumberAdd(), n0, n1);
       Node* or_node = R.Binop(R.ops[o], add_node, one);
       Node* other_use = R.Binop(R.simplified.NumberAdd(), add_node, one);
       Node* r = R.reduce(or_node);
       CHECK_EQ(R.ops[o + 1]->opcode(), r->op()->opcode());
       CHECK_EQ(IrOpcode::kNumberAdd, add_node->opcode());
       // Conversion to int32 should be done.
       CheckToI32(add_node, r->InputAt(0), R.signedness[o]);
       CheckToI32(one, r->InputAt(1), R.signedness[o + 1]);
       // The other use should also not be touched.
       CHECK_EQ(add_node, other_use->InputAt(0));
       CHECK_EQ(one, other_use->InputAt(1));
     }
   }
 }
 
 
-TEST_WITH_STRONG(Int32Comparisons) {
+TEST_WITH_STRENGTH(Int32Comparisons) {
   JSTypedLoweringTester R;
 
   struct Entry {
     const Operator* js_op;
     const Operator* uint_op;
     const Operator* int_op;
     const Operator* num_op;
     bool commute;
   };
 
   Entry ops[] = {
-      {R.javascript.LessThan(language_mode), R.machine.Uint32LessThan(),
+      {R.javascript.LessThan(strength), R.machine.Uint32LessThan(),
        R.machine.Int32LessThan(), R.simplified.NumberLessThan(), false},
-      {R.javascript.LessThanOrEqual(language_mode),
+      {R.javascript.LessThanOrEqual(strength),
        R.machine.Uint32LessThanOrEqual(), R.machine.Int32LessThanOrEqual(),
        R.simplified.NumberLessThanOrEqual(), false},
-      {R.javascript.GreaterThan(language_mode), R.machine.Uint32LessThan(),
+      {R.javascript.GreaterThan(strength), R.machine.Uint32LessThan(),
        R.machine.Int32LessThan(), R.simplified.NumberLessThan(), true},
-      {R.javascript.GreaterThanOrEqual(language_mode),
+      {R.javascript.GreaterThanOrEqual(strength),
        R.machine.Uint32LessThanOrEqual(), R.machine.Int32LessThanOrEqual(),
-       R.simplified.NumberLessThanOrEqual(), true}
-  };
+       R.simplified.NumberLessThanOrEqual(), true}};
 
   for (size_t o = 0; o < arraysize(ops); o++) {
     for (size_t i = 0; i < arraysize(kNumberTypes); i++) {
       Type* t0 = kNumberTypes[i];
       Node* p0 = R.Parameter(t0, 0);
 
       for (size_t j = 0; j < arraysize(kNumberTypes); j++) {
         Type* t1 = kNumberTypes[j];
         Node* p1 = R.Parameter(t1, 1);
 
@@ skipping 13 matching lines @@
           CHECK_EQ(p1, r->InputAt(0));
           CHECK_EQ(p0, r->InputAt(1));
         } else {
           CHECK_EQ(p0, r->InputAt(0));
           CHECK_EQ(p1, r->InputAt(1));
         }
       }
     }
   }
 }