Steps towards unification of number bitset and range types.

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

Index: test/cctest/compiler/test-js-typed-lowering.cc
diff --git a/test/cctest/compiler/test-js-typed-lowering.cc b/test/cctest/compiler/test-js-typed-lowering.cc
index 667ed61d1bd707549ad37ca5edcf4038daee1b44..819560e645a8df5ed1959f4ac2824bab51c72bee 100644
--- a/test/cctest/compiler/test-js-typed-lowering.cc
+++ b/test/cctest/compiler/test-js-typed-lowering.cc
@@ -166,20 +166,17 @@ static Type* kStringTypes[] = {Type::InternalizedString(), Type::OtherString(),
                                Type::String()};
 
 
-static Type* kInt32Types[] = {
-    Type::UnsignedSmall(),       Type::NegativeSigned32(),
-    Type::NonNegativeSigned32(), Type::SignedSmall(),
-    Type::Signed32(),            Type::Unsigned32(),
-    Type::Integral32()};
+static Type* kInt32Types[] = {Type::Unsigned30(), Type::Negative32(),
+                              Type::Unsigned31(), Type::Signed31(),
+                              Type::Signed32(),   Type::Unsigned32(),
+                              Type::Integral32()};
 
 
 static Type* kNumberTypes[] = {
-    Type::UnsignedSmall(),       Type::NegativeSigned32(),
-    Type::NonNegativeSigned32(), Type::SignedSmall(),
-    Type::Signed32(),            Type::Unsigned32(),
-    Type::Integral32(),          Type::MinusZero(),
-    Type::NaN(),                 Type::OrderedNumber(),
-    Type::PlainNumber(),         Type::Number()};
+    Type::Unsigned30(),    Type::Negative32(),  Type::Unsigned31(),
+    Type::Signed31(),      Type::Signed32(),    Type::Unsigned32(),
+    Type::Integral32(),    Type::MinusZero(),   Type::NaN(),
+    Type::OrderedNumber(), Type::PlainNumber(), Type::Number()};
 
 
 static Type* kJSTypes[] = {Type::Undefined(), Type::Null(),   Type::Boolean(),
@@ -306,13 +303,11 @@ class JSBitwiseShiftTypedLoweringTester : public JSTypedLoweringTester {
 TEST(Int32BitwiseShifts) {
   JSBitwiseShiftTypedLoweringTester R;
 
-  Type* types[] = {Type::SignedSmall(),      Type::UnsignedSmall(),
-                   Type::NegativeSigned32(), Type::NonNegativeSigned32(),
-                   Type::Unsigned32(),       Type::Signed32(),
-                   Type::MinusZero(),        Type::NaN(),
-                   Type::Undefined(),        Type::Null(),
-                   Type::Boolean(),          Type::Number(),
-                   Type::PlainNumber(),      Type::String()};
+  Type* types[] = {Type::Signed31(),    Type::Unsigned30(), 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);
@@ -372,10 +367,10 @@ TEST(Int32BitwiseBinops) {
   JSBitwiseTypedLoweringTester R;
 
   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::Signed31(),      Type::Unsigned30(),  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) {
@@ -908,7 +903,7 @@ void CheckEqualityReduction(JSTypedLoweringTester* R, bool strict, Node* l,
 TEST(EqualityForNumbers) {
   JSTypedLoweringTester R;
 
-  Type* simple_number_types[] = {Type::UnsignedSmall(), Type::SignedSmall(),
+  Type* simple_number_types[] = {Type::Unsigned30(), Type::Signed31(),
                                  Type::Signed32(), Type::Unsigned32(),
                                  Type::Number()};