Don't force range of the RangeBoundary::Shl into the Smi.

runtime/vm/intermediate_language_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/intermediate_language.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
 TEST_CASE(InstructionTests) {
@@ skipping 44 matching lines @@
       RangeBoundary::FromConstant(100));
   EXPECT(positive->IsPositive());
   EXPECT(zero->Overlaps(0, 0));
   EXPECT(positive->Overlaps(0, 0));
   EXPECT(!negative->Overlaps(0, 0));
   EXPECT(range_x->Overlaps(0, 0));
   EXPECT(range_x->IsWithin(-15, 100));
   EXPECT(!range_x->IsWithin(-15, 99));
   EXPECT(!range_x->IsWithin(-14, 100));
 
-#define TEST_RANGE_OP(Op, l_min, l_max, r_min, r_max, result_min, result_max)  \
+#define TEST_RANGE_OP_(Op, l_min, l_max, r_min, r_max, Clamp, res_min, res_max)\
   {                                                                            \
     RangeBoundary min, max;                                                    \
     Range* left_range = new Range(                                             \
       RangeBoundary::FromConstant(l_min),                                      \
       RangeBoundary::FromConstant(l_max));                                     \
     Range* shift_range = new Range(                                            \
       RangeBoundary::FromConstant(r_min),                                      \
       RangeBoundary::FromConstant(r_max));                                     \
     Op(left_range, shift_range, &min, &max);                                   \
-    EXPECT(min.Equals(result_min));                                            \
-    if (!min.Equals(result_min)) OS::Print("%s\n", min.ToCString());           \
-    EXPECT(max.Equals(result_max));                                            \
-    if (!max.Equals(result_max)) OS::Print("%s\n", max.ToCString());           \
+    min = Clamp(min);                                                          \
+    max = Clamp(max);                                                          \
+    EXPECT(min.Equals(res_min));                                               \
+    if (!min.Equals(res_min)) OS::Print("%s\n", min.ToCString());              \
+    EXPECT(max.Equals(res_max));                                               \
+    if (!max.Equals(res_max)) OS::Print("%s\n", max.ToCString());              \
   }
 
+#define NO_CLAMP(b) (b)
+#define TEST_RANGE_OP(Op, l_min, l_max, r_min, r_max, result_min, result_max)  \
+  TEST_RANGE_OP_(Op, l_min, l_max, r_min, r_max,                               \
+                 NO_CLAMP, result_min, result_max)
+
+#define CLAMP_TO_SMI(b) (b.Clamp(RangeBoundary::kRangeBoundarySmi))
+#define TEST_RANGE_OP_SMI(Op, l_min, l_max, r_min, r_max, res_min, res_max)    \
+  TEST_RANGE_OP_(Op, l_min, l_max, r_min, r_max,                               \
+                 CLAMP_TO_SMI, res_min, res_max)
+
   TEST_RANGE_OP(Range::Shl, -15, 100, 0, 2,
                 RangeBoundary(-60), RangeBoundary(400));
   TEST_RANGE_OP(Range::Shl, -15, 100, -2, 2,
                 RangeBoundary(-60), RangeBoundary(400));
   TEST_RANGE_OP(Range::Shl, -15, -10, 1, 2,
                 RangeBoundary(-60), RangeBoundary(-20));
   TEST_RANGE_OP(Range::Shl, 5, 10, -2, 2,
                 RangeBoundary(5), RangeBoundary(40));
   TEST_RANGE_OP(Range::Shl, -15, 100, 0, 64,
                 RangeBoundary::NegativeInfinity(),
                 RangeBoundary::PositiveInfinity());
   TEST_RANGE_OP(Range::Shl, -1, 1, 63, 63,
-                RangeBoundary::NegativeInfinity(),
+                RangeBoundary(kMinInt64),
                 RangeBoundary::PositiveInfinity());
   if (kBitsPerWord == 64) {
-    TEST_RANGE_OP(Range::Shl, -1, 1, 62, 62,
+    TEST_RANGE_OP_SMI(Range::Shl, -1, 1, 62, 62,
                   RangeBoundary(kSmiMin),
-                  RangeBoundary::PositiveInfinity());
-    TEST_RANGE_OP(Range::Shl, -1, 1, 30, 30,
+                  RangeBoundary(kSmiMax));
+    TEST_RANGE_OP_SMI(Range::Shl, -1, 1, 30, 30,
                   RangeBoundary(-1 << 30),
                   RangeBoundary(1 << 30));
   } else {
-    TEST_RANGE_OP(Range::Shl, -1, 1, 30, 30,
+    TEST_RANGE_OP_SMI(Range::Shl, -1, 1, 30, 30,
                   RangeBoundary(kSmiMin),
-                  RangeBoundary::PositiveInfinity());
-    TEST_RANGE_OP(Range::Shl, -1, 1, 62, 62,
-                  RangeBoundary::NegativeInfinity(),
-                  RangeBoundary::PositiveInfinity());
+                  RangeBoundary(kSmiMax));
+    TEST_RANGE_OP_SMI(Range::Shl, -1, 1, 62, 62,
+                  RangeBoundary(kSmiMin),
+                  RangeBoundary(kSmiMax));
   }
   TEST_RANGE_OP(Range::Shl, 0, 100, 0, 64,
                 RangeBoundary(0), RangeBoundary::PositiveInfinity());
   TEST_RANGE_OP(Range::Shl, -100, 0, 0, 64,
                 RangeBoundary::NegativeInfinity(), RangeBoundary(0));
 
   TEST_RANGE_OP(Range::Shr, -8, 8, 1, 2, RangeBoundary(-4), RangeBoundary(4));
   TEST_RANGE_OP(Range::Shr, 1, 8, 1, 2, RangeBoundary(0), RangeBoundary(4));
   TEST_RANGE_OP(Range::Shr, -16, -8, 1, 2,
                 RangeBoundary(-8), RangeBoundary(-2));
@@ skipping 533 matching lines @@
       RangeBoundary(static_cast<int64_t>(kMaxInt32)),
       RangeBoundary::kRangeBoundaryInt64).ConstantValue() == kMaxInt32);
 
   EXPECT(RangeBoundary::Max(
       RangeBoundary(static_cast<int64_t>(kMaxInt64)),
       RangeBoundary(static_cast<int64_t>(kMaxInt32)),
       RangeBoundary::kRangeBoundaryInt64).ConstantValue() == kMaxInt64);
 }
 
 }  // namespace dart