[turbofan] Remove int32 add/subtract narrowing during typed lowering.

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/v8.h"
 #include "test/cctest/cctest.h"
 
 #include "src/compiler/graph-inl.h"
 #include "src/compiler/js-typed-lowering.h"
 #include "src/compiler/node-properties-inl.h"
@@ skipping 1195 matching lines @@
       R.CheckEffectInput(orig, effect_use);
     } else {
       // effect should have been removed from this node.
       CHECK_EQ(IrOpcode::kBooleanNot, r->opcode());
       R.CheckEffectInput(R.start(), effect_use);
     }
   }
 }
 
 
-TEST(Int32AddNarrowing) {
-  {
-    JSBitwiseTypedLoweringTester R;
-
-    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::kInt32Add, add_node->opcode());
-            bool is_signed = l ? R.signedness[o] : R.signedness[o + 1];
-
-            Type* add_type = NodeProperties::GetBounds(add_node).upper;
-            CHECK(add_type->Is(I32Type(is_signed)));
-          }
-        }
-      }
-    }
-  }
-  {
-    JSBitwiseShiftTypedLoweringTester R;
-
-    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::kInt32Add, add_node->opcode());
-            bool is_signed = l ? R.signedness[o] : R.signedness[o + 1];
-
-            Type* add_type = NodeProperties::GetBounds(add_node).upper;
-            CHECK(add_type->Is(I32Type(is_signed)));
-          }
-        }
-      }
-    }
-  }
-}
-
-
-TEST(Int32AddNarrowingNotOwned) {
+TEST(Int32AddLowering) {

[titzer, 2014/11/14 14:26:20]

I think we should keep these tests but assert now that they are
NumberAdd/NumberSubtract.

   JSBitwiseTypedLoweringTester R;
 
   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());
-    // Should not be reduced to Int32Add because of the other number add.
     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));
   }
 }
 
@@ skipping 46 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));
         }
       }
     }
   }
 }