| Index: test/cctest/compiler/test-simplified-lowering.cc
|
| diff --git a/test/cctest/compiler/test-simplified-lowering.cc b/test/cctest/compiler/test-simplified-lowering.cc
|
| index 6d9a7ab461e81abcead98e50e7e000e2cdf9a734..47acbe1a9b02d4a88f58e76ea80988860c6068e2 100644
|
| --- a/test/cctest/compiler/test-simplified-lowering.cc
|
| +++ b/test/cctest/compiler/test-simplified-lowering.cc
|
| @@ -61,7 +61,7 @@ class SimplifiedLoweringTester : public GraphBuilderTester<ReturnType> {
|
| Zone* zone = this->zone();
|
| CompilationInfo info(zone->isolate(), zone);
|
| Linkage linkage(
|
| - &info, Linkage::GetSimplifiedCDescriptor(zone, this->machine_sig_));
|
| + zone, Linkage::GetSimplifiedCDescriptor(zone, this->machine_sig_));
|
| ChangeLowering lowering(&jsgraph, &linkage);
|
| GraphReducer reducer(this->graph());
|
| reducer.AddReducer(&lowering);
|
| @@ -791,7 +791,7 @@ TEST(LowerBooleanNot_bit_bit) {
|
| Node* use = t.Branch(inv);
|
| t.Lower();
|
| Node* cmp = use->InputAt(0);
|
| - CHECK_EQ(t.machine()->WordEqual()->opcode(), cmp->opcode());
|
| + CHECK_EQ(t.machine()->Word32Equal()->opcode(), cmp->opcode());
|
| CHECK(b == cmp->InputAt(0) || b == cmp->InputAt(1));
|
| Node* f = t.jsgraph.Int32Constant(0);
|
| CHECK(f == cmp->InputAt(0) || f == cmp->InputAt(1));
|
| @@ -808,7 +808,7 @@ TEST(LowerBooleanNot_bit_tagged) {
|
| t.Lower();
|
| CHECK_EQ(IrOpcode::kChangeBitToBool, use->InputAt(0)->opcode());
|
| Node* cmp = use->InputAt(0)->InputAt(0);
|
| - CHECK_EQ(t.machine()->WordEqual()->opcode(), cmp->opcode());
|
| + CHECK_EQ(t.machine()->Word32Equal()->opcode(), cmp->opcode());
|
| CHECK(b == cmp->InputAt(0) || b == cmp->InputAt(1));
|
| Node* f = t.jsgraph.Int32Constant(0);
|
| CHECK(f == cmp->InputAt(0) || f == cmp->InputAt(1));
|
| @@ -947,24 +947,50 @@ TEST(LowerNumberCmp_to_float64) {
|
|
|
|
|
| TEST(LowerNumberAddSub_to_int32) {
|
| - TestingGraph t(Type::Signed32(), Type::Signed32());
|
| - t.CheckLoweringTruncatedBinop(IrOpcode::kInt32Add,
|
| - t.simplified()->NumberAdd(),
|
| - t.simplified()->NumberToInt32());
|
| - t.CheckLoweringTruncatedBinop(IrOpcode::kInt32Sub,
|
| - t.simplified()->NumberSubtract(),
|
| - t.simplified()->NumberToInt32());
|
| + HandleAndZoneScope scope;
|
| + Factory* f = scope.main_zone()->isolate()->factory();
|
| + Type* small_range =
|
| + Type::Range(f->NewNumber(1), f->NewNumber(10), scope.main_zone());
|
| + Type* large_range =
|
| + Type::Range(f->NewNumber(-1e+13), f->NewNumber(1e+14), scope.main_zone());
|
| + static Type* types[] = {Type::Signed32(), Type::Integral32(), small_range,
|
| + large_range};
|
| +
|
| + for (size_t i = 0; i < arraysize(types); i++) {
|
| + for (size_t j = 0; j < arraysize(types); j++) {
|
| + TestingGraph t(types[i], types[j]);
|
| + t.CheckLoweringTruncatedBinop(IrOpcode::kInt32Add,
|
| + t.simplified()->NumberAdd(),
|
| + t.simplified()->NumberToInt32());
|
| + t.CheckLoweringTruncatedBinop(IrOpcode::kInt32Sub,
|
| + t.simplified()->NumberSubtract(),
|
| + t.simplified()->NumberToInt32());
|
| + }
|
| + }
|
| }
|
|
|
|
|
| TEST(LowerNumberAddSub_to_uint32) {
|
| - TestingGraph t(Type::Unsigned32(), Type::Unsigned32());
|
| - t.CheckLoweringTruncatedBinop(IrOpcode::kInt32Add,
|
| - t.simplified()->NumberAdd(),
|
| - t.simplified()->NumberToUint32());
|
| - t.CheckLoweringTruncatedBinop(IrOpcode::kInt32Sub,
|
| - t.simplified()->NumberSubtract(),
|
| - t.simplified()->NumberToUint32());
|
| + HandleAndZoneScope scope;
|
| + Factory* f = scope.main_zone()->isolate()->factory();
|
| + Type* small_range =
|
| + Type::Range(f->NewNumber(1), f->NewNumber(10), scope.main_zone());
|
| + Type* large_range =
|
| + Type::Range(f->NewNumber(-1e+13), f->NewNumber(1e+14), scope.main_zone());
|
| + static Type* types[] = {Type::Signed32(), Type::Integral32(), small_range,
|
| + large_range};
|
| +
|
| + for (size_t i = 0; i < arraysize(types); i++) {
|
| + for (size_t j = 0; j < arraysize(types); j++) {
|
| + TestingGraph t(types[i], types[j]);
|
| + t.CheckLoweringTruncatedBinop(IrOpcode::kInt32Add,
|
| + t.simplified()->NumberAdd(),
|
| + t.simplified()->NumberToUint32());
|
| + t.CheckLoweringTruncatedBinop(IrOpcode::kInt32Sub,
|
| + t.simplified()->NumberSubtract(),
|
| + t.simplified()->NumberToUint32());
|
| + }
|
| + }
|
| }
|
|
|
|
|
|
|