Merge bleeding_edge.

test/cctest/test-types.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 93 matching lines @@
 class HandlifiedTypes {
  public:
   explicit HandlifiedTypes(Isolate* isolate) :
       None(Type::None(), isolate),
       Any(Type::Any(), isolate),
       Oddball(Type::Oddball(), isolate),
       Boolean(Type::Boolean(), isolate),
       Null(Type::Null(), isolate),
       Undefined(Type::Undefined(), isolate),
       Number(Type::Number(), isolate),
-      Integer31(Type::Smi(), isolate),
-      Integer32(Type::Signed32(), isolate),
+      Smi(Type::Smi(), isolate),
+      Signed32(Type::Signed32(), isolate),
       Double(Type::Double(), isolate),
       Name(Type::Name(), isolate),
       UniqueName(Type::UniqueName(), isolate),
       String(Type::String(), isolate),
       InternalizedString(Type::InternalizedString(), isolate),
       Symbol(Type::Symbol(), isolate),
       Receiver(Type::Receiver(), isolate),
       Object(Type::Object(), isolate),
       Array(Type::Array(), isolate),
       Function(Type::Function(), isolate),
       Proxy(Type::Proxy(), isolate),
       object_map(isolate->factory()->NewMap(JS_OBJECT_TYPE, 3 * kPointerSize)),
       array_map(isolate->factory()->NewMap(JS_ARRAY_TYPE, 4 * kPointerSize)),
       isolate_(isolate) {
     smi = handle(Smi::FromInt(666), isolate);
+    signed32 = isolate->factory()->NewHeapNumber(0x40000000);
     object1 = isolate->factory()->NewJSObjectFromMap(object_map);
     object2 = isolate->factory()->NewJSObjectFromMap(object_map);
     array = isolate->factory()->NewJSArray(20);
-    ObjectClass = handle(Type::Class(object_map), isolate);
-    ArrayClass = handle(Type::Class(array_map), isolate);
-    Integer31Constant = handle(Type::Constant(smi, isolate), isolate);
-    ObjectConstant1 = handle(Type::Constant(object1), isolate);
-    ObjectConstant2 = handle(Type::Constant(object2), isolate);
-    ArrayConstant1 = handle(Type::Constant(array), isolate);
-    ArrayConstant2 = handle(Type::Constant(array), isolate);
+    ObjectClass = Class(object_map);
+    ArrayClass = Class(array_map);
+    SmiConstant = Constant(smi);
+    Signed32Constant = Constant(signed32);
+    ObjectConstant1 = Constant(object1);
+    ObjectConstant2 = Constant(object2);
+    ArrayConstant1 = Constant(array);
+    ArrayConstant2 = Constant(array);
   }
 
   Handle<Type> None;
   Handle<Type> Any;
   Handle<Type> Oddball;
   Handle<Type> Boolean;
   Handle<Type> Null;
   Handle<Type> Undefined;
   Handle<Type> Number;
-  Handle<Type> Integer31;
-  Handle<Type> Integer32;
+  Handle<Type> Smi;
+  Handle<Type> Signed32;
   Handle<Type> Double;
   Handle<Type> Name;
   Handle<Type> UniqueName;
   Handle<Type> String;
   Handle<Type> InternalizedString;
   Handle<Type> Symbol;
   Handle<Type> Receiver;
   Handle<Type> Object;
   Handle<Type> Array;
   Handle<Type> Function;
   Handle<Type> Proxy;
 
   Handle<Type> ObjectClass;
   Handle<Type> ArrayClass;
 
-  Handle<Type> Integer31Constant;
+  Handle<Type> SmiConstant;
+  Handle<Type> Signed32Constant;
   Handle<Type> ObjectConstant1;
   Handle<Type> ObjectConstant2;
   Handle<Type> ArrayConstant1;
   Handle<Type> ArrayConstant2;
 
   Handle<Map> object_map;
   Handle<Map> array_map;
 
-  Handle<v8::internal::Smi> smi;
+  Handle<i::Smi> smi;
+  Handle<HeapNumber> signed32;
   Handle<JSObject> object1;
   Handle<JSObject> object2;
   Handle<JSArray> array;
 
+  Handle<Type> Class(Handle<Map> map) {
+    return handle(Type::Class(map), isolate_);
+  }
+  Handle<Type> Constant(Handle<i::Object> value) {
+    return handle(Type::Constant(value, isolate_), isolate_);
+  }
   Handle<Type> Union(Handle<Type> type1, Handle<Type> type2) {
     return handle(Type::Union(type1, type2), isolate_);
   }
   Handle<Type> Intersect(Handle<Type> type1, Handle<Type> type2) {
     return handle(Type::Intersect(type1, type2), isolate_);
   }
 
  private:
   Isolate* isolate_;
 };
@@ skipping 37 matching lines @@
   CHECK(*T.array_map == AsClass(*T.ArrayClass));
 }
 
 
 TEST(Constant) {
   CcTest::InitializeVM();
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
   HandlifiedTypes T(isolate);
 
-  CHECK(IsConstant(*T.Integer31Constant));
+  CHECK(IsConstant(*T.SmiConstant));
   CHECK(IsConstant(*T.ObjectConstant1));
   CHECK(IsConstant(*T.ObjectConstant2));
   CHECK(IsConstant(*T.ArrayConstant1));
   CHECK(IsConstant(*T.ArrayConstant2));
 
-  CHECK(*T.smi == AsConstant(*T.Integer31Constant));
+  CHECK(*T.smi == AsConstant(*T.SmiConstant));
   CHECK(*T.object1 == AsConstant(*T.ObjectConstant1));
   CHECK(*T.object2 == AsConstant(*T.ObjectConstant2));
   CHECK(*T.object1 != AsConstant(*T.ObjectConstant2));
   CHECK(*T.array == AsConstant(*T.ArrayConstant1));
   CHECK(*T.array == AsConstant(*T.ArrayConstant2));
 }
 
 
 TEST(Is) {
   CcTest::InitializeVM();
@@ skipping 16 matching lines @@
 
   CheckSub(T.Oddball, T.Any);
   CheckSub(T.Boolean, T.Oddball);
   CheckSub(T.Null, T.Oddball);
   CheckSub(T.Undefined, T.Oddball);
   CheckUnordered(T.Boolean, T.Null);
   CheckUnordered(T.Undefined, T.Null);
   CheckUnordered(T.Boolean, T.Undefined);
 
   CheckSub(T.Number, T.Any);
-  CheckSub(T.Integer31, T.Number);
-  CheckSub(T.Integer32, T.Number);
+  CheckSub(T.Smi, T.Number);
+  CheckSub(T.Signed32, T.Number);
   CheckSub(T.Double, T.Number);
-  CheckSub(T.Integer31, T.Integer32);
-  CheckUnordered(T.Integer31, T.Double);
-  CheckUnordered(T.Integer32, T.Double);
+  CheckSub(T.Smi, T.Signed32);
+  CheckUnordered(T.Smi, T.Double);
+  CheckUnordered(T.Signed32, T.Double);
 
   CheckSub(T.Name, T.Any);
   CheckSub(T.UniqueName, T.Any);
   CheckSub(T.UniqueName, T.Name);
   CheckSub(T.String, T.Name);
   CheckSub(T.InternalizedString, T.String);
   CheckSub(T.InternalizedString, T.UniqueName);
   CheckSub(T.InternalizedString, T.Name);
   CheckSub(T.Symbol, T.UniqueName);
   CheckSub(T.Symbol, T.Name);
   CheckUnordered(T.String, T.UniqueName);
   CheckUnordered(T.String, T.Symbol);
   CheckUnordered(T.InternalizedString, T.Symbol);
 
   CheckSub(T.Receiver, T.Any);
   CheckSub(T.Object, T.Any);
   CheckSub(T.Object, T.Receiver);
   CheckSub(T.Array, T.Object);
   CheckSub(T.Function, T.Object);
   CheckSub(T.Proxy, T.Receiver);
   CheckUnordered(T.Object, T.Proxy);
   CheckUnordered(T.Array, T.Function);
 
   // Structured subtyping
+  CheckSub(T.None, T.ObjectClass);
+  CheckSub(T.None, T.ObjectConstant1);
+  CheckSub(T.ObjectClass, T.Any);
+  CheckSub(T.ObjectConstant1, T.Any);
+
   CheckSub(T.ObjectClass, T.Object);
   CheckSub(T.ArrayClass, T.Object);
   CheckUnordered(T.ObjectClass, T.ArrayClass);
 
-  CheckSub(T.Integer31Constant, T.Integer31);
-  CheckSub(T.Integer31Constant, T.Integer32);
-  CheckSub(T.Integer31Constant, T.Number);
+  CheckSub(T.SmiConstant, T.Smi);
+  CheckSub(T.SmiConstant, T.Signed32);
+  CheckSub(T.SmiConstant, T.Number);
   CheckSub(T.ObjectConstant1, T.Object);
   CheckSub(T.ObjectConstant2, T.Object);
   CheckSub(T.ArrayConstant1, T.Object);
   CheckSub(T.ArrayConstant1, T.Array);
   CheckUnordered(T.ObjectConstant1, T.ObjectConstant2);
   CheckUnordered(T.ObjectConstant1, T.ArrayConstant1);
 
   CheckUnordered(T.ObjectConstant1, T.ObjectClass);
   CheckUnordered(T.ObjectConstant2, T.ObjectClass);
   CheckUnordered(T.ObjectConstant1, T.ArrayClass);
@@ skipping 13 matching lines @@
 
   CheckOverlap(T.Oddball, T.Any);
   CheckOverlap(T.Boolean, T.Oddball);
   CheckOverlap(T.Null, T.Oddball);
   CheckOverlap(T.Undefined, T.Oddball);
   CheckDisjoint(T.Boolean, T.Null);
   CheckDisjoint(T.Undefined, T.Null);
   CheckDisjoint(T.Boolean, T.Undefined);
 
   CheckOverlap(T.Number, T.Any);
-  CheckOverlap(T.Integer31, T.Number);
+  CheckOverlap(T.Smi, T.Number);
   CheckOverlap(T.Double, T.Number);
-  CheckDisjoint(T.Integer32, T.Double);
+  CheckDisjoint(T.Signed32, T.Double);
 
   CheckOverlap(T.Name, T.Any);
   CheckOverlap(T.UniqueName, T.Any);
   CheckOverlap(T.UniqueName, T.Name);
   CheckOverlap(T.String, T.Name);
   CheckOverlap(T.InternalizedString, T.String);
   CheckOverlap(T.InternalizedString, T.UniqueName);
   CheckOverlap(T.InternalizedString, T.Name);
   CheckOverlap(T.Symbol, T.UniqueName);
   CheckOverlap(T.Symbol, T.Name);
   CheckOverlap(T.String, T.UniqueName);
   CheckDisjoint(T.String, T.Symbol);
   CheckDisjoint(T.InternalizedString, T.Symbol);
 
   CheckOverlap(T.Receiver, T.Any);
   CheckOverlap(T.Object, T.Any);
   CheckOverlap(T.Object, T.Receiver);
   CheckOverlap(T.Array, T.Object);
   CheckOverlap(T.Function, T.Object);
   CheckOverlap(T.Proxy, T.Receiver);
   CheckDisjoint(T.Object, T.Proxy);
   CheckDisjoint(T.Array, T.Function);
 
+  CheckOverlap(T.ObjectClass, T.Any);
+  CheckOverlap(T.ObjectConstant1, T.Any);
+
   CheckOverlap(T.ObjectClass, T.Object);
   CheckOverlap(T.ArrayClass, T.Object);
   CheckOverlap(T.ObjectClass, T.ObjectClass);
   CheckOverlap(T.ArrayClass, T.ArrayClass);
   CheckDisjoint(T.ObjectClass, T.ArrayClass);
 
-  CheckOverlap(T.Integer31Constant, T.Integer31);
-  CheckOverlap(T.Integer31Constant, T.Integer32);
-  CheckOverlap(T.Integer31Constant, T.Number);
-  CheckDisjoint(T.Integer31Constant, T.Double);
+  CheckOverlap(T.SmiConstant, T.Smi);
+  CheckOverlap(T.SmiConstant, T.Signed32);
+  CheckOverlap(T.SmiConstant, T.Number);
+  CheckDisjoint(T.SmiConstant, T.Double);
   CheckOverlap(T.ObjectConstant1, T.Object);
   CheckOverlap(T.ObjectConstant2, T.Object);
   CheckOverlap(T.ArrayConstant1, T.Object);
   CheckOverlap(T.ArrayConstant1, T.Array);
   CheckOverlap(T.ArrayConstant1, T.ArrayConstant2);
   CheckOverlap(T.ObjectConstant1, T.ObjectConstant1);
   CheckDisjoint(T.ObjectConstant1, T.ObjectConstant2);
   CheckDisjoint(T.ObjectConstant1, T.ArrayConstant1);
 
   CheckDisjoint(T.ObjectConstant1, T.ObjectClass);
@@ skipping 18 matching lines @@
   CheckEqual(T.Union(T.None, T.Number), T.Number);
   CheckEqual(T.Union(T.Object, T.Proxy), T.Receiver);
   CheckEqual(T.Union(T.Number, T.String), T.Union(T.String, T.Number));
   CheckSub(T.Union(T.Number, T.String), T.Any);
 
   // Class-class
   CHECK(IsClass(Type::Union(T.ObjectClass, T.ObjectClass)));
   CHECK(IsUnion(Type::Union(T.ObjectClass, T.ArrayClass)));
 
   CheckEqual(T.Union(T.ObjectClass, T.ObjectClass), T.ObjectClass);
+  CheckSub(T.None, T.Union(T.ObjectClass, T.ArrayClass));
+  CheckSub(T.Union(T.ObjectClass, T.ArrayClass), T.Any);
   CheckSub(T.ObjectClass, T.Union(T.ObjectClass, T.ArrayClass));
   CheckSub(T.ArrayClass, T.Union(T.ObjectClass, T.ArrayClass));
   CheckSub(T.Union(T.ObjectClass, T.ArrayClass), T.Object);
   CheckUnordered(T.Union(T.ObjectClass, T.ArrayClass), T.Array);
   CheckOverlap(T.Union(T.ObjectClass, T.ArrayClass), T.Array);
   CheckDisjoint(T.Union(T.ObjectClass, T.ArrayClass), T.Number);
 
   // Constant-constant
   CHECK(IsConstant(Type::Union(T.ObjectConstant1, T.ObjectConstant1)));
   CHECK(IsConstant(Type::Union(T.ArrayConstant1, T.ArrayConstant1)));
   CHECK(IsUnion(Type::Union(T.ObjectConstant1, T.ObjectConstant2)));
 
   CheckEqual(T.Union(T.ObjectConstant1, T.ObjectConstant1), T.ObjectConstant1);
   CheckEqual(T.Union(T.ArrayConstant1, T.ArrayConstant1), T.ArrayConstant1);
   CheckEqual(T.Union(T.ArrayConstant1, T.ArrayConstant1), T.ArrayConstant2);
+  CheckSub(T.None, T.Union(T.ObjectConstant1, T.ObjectConstant2));
+  CheckSub(T.Union(T.ObjectConstant1, T.ObjectConstant2), T.Any);
   CheckSub(T.ObjectConstant1, T.Union(T.ObjectConstant1, T.ObjectConstant2));
   CheckSub(T.ObjectConstant2, T.Union(T.ObjectConstant1, T.ObjectConstant2));
   CheckSub(T.ArrayConstant2, T.Union(T.ArrayConstant1, T.ObjectConstant2));
   CheckSub(T.Union(T.ObjectConstant1, T.ObjectConstant2), T.Object);
   CheckUnordered(T.Union(T.ObjectConstant1, T.ObjectConstant2), T.ObjectClass);
   CheckUnordered(T.Union(T.ObjectConstant1, T.ArrayConstant1), T.Array);
   CheckOverlap(T.Union(T.ObjectConstant1, T.ArrayConstant1), T.Array);
   CheckOverlap(T.Union(T.ObjectConstant1, T.ArrayConstant1), T.ArrayConstant2);
   CheckDisjoint(T.Union(T.ObjectConstant1, T.ArrayConstant1), T.Number);
   CheckDisjoint(T.Union(T.ObjectConstant1, T.ArrayConstant1), T.ObjectClass);
 
   // Bitset-class
   CHECK(IsBitset(Type::Union(T.ObjectClass, T.Object)));
   CHECK(IsUnion(Type::Union(T.ObjectClass, T.Number)));
 
   CheckEqual(T.Union(T.ObjectClass, T.Object), T.Object);
+  CheckSub(T.None, T.Union(T.ObjectClass, T.Number));
   CheckSub(T.Union(T.ObjectClass, T.Number), T.Any);
-  CheckSub(T.Union(T.ObjectClass, T.Integer31), T.Union(T.Object, T.Number));
+  CheckSub(T.Union(T.ObjectClass, T.Smi), T.Union(T.Object, T.Number));
   CheckSub(T.Union(T.ObjectClass, T.Array), T.Object);
   CheckUnordered(T.Union(T.ObjectClass, T.String), T.Array);
   CheckOverlap(T.Union(T.ObjectClass, T.String), T.Object);
   CheckDisjoint(T.Union(T.ObjectClass, T.String), T.Number);
 
   // Bitset-constant
-  CHECK(IsBitset(Type::Union(T.Integer31Constant, T.Number)));
+  CHECK(IsBitset(Type::Union(T.SmiConstant, T.Number)));
   CHECK(IsBitset(Type::Union(T.ObjectConstant1, T.Object)));
   CHECK(IsUnion(Type::Union(T.ObjectConstant2, T.Number)));
 
-  CheckEqual(T.Union(T.Integer31Constant, T.Number), T.Number);
+  CheckEqual(T.Union(T.SmiConstant, T.Number), T.Number);
   CheckEqual(T.Union(T.ObjectConstant1, T.Object), T.Object);
+  CheckSub(T.None, T.Union(T.ObjectConstant1, T.Number));
   CheckSub(T.Union(T.ObjectConstant1, T.Number), T.Any);
-  CheckSub(
-      T.Union(T.ObjectConstant1, T.Integer32), T.Union(T.Object, T.Number));
+  CheckSub(T.Union(T.ObjectConstant1, T.Signed32), T.Union(T.Object, T.Number));
   CheckSub(T.Union(T.ObjectConstant1, T.Array), T.Object);
   CheckUnordered(T.Union(T.ObjectConstant1, T.String), T.Array);
   CheckOverlap(T.Union(T.ObjectConstant1, T.String), T.Object);
   CheckDisjoint(T.Union(T.ObjectConstant1, T.String), T.Number);
+  CheckEqual(T.Union(T.Signed32, T.Signed32Constant), T.Signed32);
 
   // Class-constant
   CHECK(IsUnion(Type::Union(T.ObjectConstant1, T.ObjectClass)));
   CHECK(IsUnion(Type::Union(T.ArrayClass, T.ObjectConstant2)));
 
+  CheckSub(T.None, T.Union(T.ObjectConstant1, T.ArrayClass));
+  CheckSub(T.Union(T.ObjectConstant1, T.ArrayClass), T.Any);
   CheckSub(T.Union(T.ObjectConstant1, T.ArrayClass), T.Object);
   CheckSub(T.ObjectConstant1, T.Union(T.ObjectConstant1, T.ArrayClass));
   CheckSub(T.ArrayClass, T.Union(T.ObjectConstant1, T.ArrayClass));
   CheckUnordered(T.ObjectClass, T.Union(T.ObjectConstant1, T.ArrayClass));
   CheckSub(
       T.Union(T.ObjectConstant1, T.ArrayClass), T.Union(T.Array, T.Object));
   CheckUnordered(T.Union(T.ObjectConstant1, T.ArrayClass), T.ArrayConstant1);
   CheckDisjoint(T.Union(T.ObjectConstant1, T.ArrayClass), T.ObjectConstant2);
   CheckDisjoint(T.Union(T.ObjectConstant1, T.ArrayClass), T.ObjectClass);
 
   // Bitset-union
   CHECK(IsBitset(
       Type::Union(T.Object, T.Union(T.ObjectConstant1, T.ObjectClass))));
   CHECK(IsUnion(
       Type::Union(T.Union(T.ArrayClass, T.ObjectConstant2), T.Number)));
 
   CheckEqual(
       T.Union(T.Object, T.Union(T.ObjectConstant1, T.ObjectClass)),
       T.Object);
   CheckEqual(
       T.Union(T.Union(T.ArrayClass, T.ObjectConstant1), T.Number),
       T.Union(T.ObjectConstant1, T.Union(T.Number, T.ArrayClass)));
   CheckSub(
       T.Double,
       T.Union(T.Union(T.ArrayClass, T.ObjectConstant1), T.Number));
   CheckSub(
       T.ObjectConstant1,
       T.Union(T.Union(T.ArrayClass, T.ObjectConstant1), T.Double));
   CheckSub(
+      T.None,
+      T.Union(T.Union(T.ArrayClass, T.ObjectConstant1), T.Double));
+  CheckSub(
       T.Union(T.Union(T.ArrayClass, T.ObjectConstant1), T.Double),
       T.Any);
   CheckSub(
       T.Union(T.Union(T.ArrayClass, T.ObjectConstant1), T.Double),
       T.Union(T.ObjectConstant1, T.Union(T.Number, T.ArrayClass)));
 
   // Class-union
   CHECK(IsUnion(
       Type::Union(T.Union(T.ArrayClass, T.ObjectConstant2), T.ArrayClass)));
   CHECK(IsUnion(
       Type::Union(T.Union(T.ArrayClass, T.ObjectConstant2), T.ObjectClass)));
 
   CheckEqual(
       T.Union(T.ObjectClass, T.Union(T.ObjectConstant1, T.ObjectClass)),
       T.Union(T.ObjectClass, T.ObjectConstant1));
   CheckSub(
+      T.None,
+      T.Union(T.ObjectClass, T.Union(T.ObjectConstant1, T.ObjectClass)));
+  CheckSub(
+      T.Union(T.ObjectClass, T.Union(T.ObjectConstant1, T.ObjectClass)),
+      T.Any);
+  CheckSub(
       T.Union(T.ObjectClass, T.Union(T.ObjectConstant1, T.ObjectClass)),
       T.Object);
   CheckEqual(
       T.Union(T.Union(T.ArrayClass, T.ObjectConstant2), T.ArrayClass),
       T.Union(T.ArrayClass, T.ObjectConstant2));
 
   // Constant-union
   CHECK(IsUnion(Type::Union(
       T.ObjectConstant1, T.Union(T.ObjectConstant1, T.ObjectConstant2))));
   CHECK(IsUnion(Type::Union(
       T.Union(T.ArrayConstant1, T.ObjectClass), T.ObjectConstant1)));
   CHECK(IsUnion(Type::Union(
       T.Union(T.ArrayConstant1, T.ObjectConstant2), T.ObjectConstant1)));
 
   CheckEqual(
       T.Union(T.ObjectConstant1, T.Union(T.ObjectConstant1, T.ObjectConstant2)),
       T.Union(T.ObjectConstant2, T.ObjectConstant1));
   CheckEqual(
       T.Union(T.Union(T.ArrayConstant1, T.ObjectConstant2), T.ObjectConstant1),
       T.Union(T.ObjectConstant2, T.Union(T.ArrayConstant1, T.ObjectConstant1)));
 
   // Union-union
   CHECK(IsBitset(Type::Union(
-      T.Union(T.Number, T.ArrayClass), T.Union(T.Integer32, T.Array))));
+      T.Union(T.Number, T.ArrayClass), T.Union(T.Signed32, T.Array))));
   CHECK(IsUnion(Type::Union(
       T.Union(T.Number, T.ArrayClass), T.Union(T.ObjectClass, T.ArrayClass))));
 
   CheckEqual(
       T.Union(
           T.Union(T.ObjectConstant2, T.ObjectConstant1),
           T.Union(T.ObjectConstant1, T.ObjectConstant2)),
       T.Union(T.ObjectConstant2, T.ObjectConstant1));
   CheckEqual(
       T.Union(
           T.Union(T.ObjectConstant2, T.ArrayConstant1),
           T.Union(T.ObjectConstant1, T.ArrayConstant2)),
       T.Union(T.Union(T.ObjectConstant1, T.ObjectConstant2), T.ArrayConstant1));
   CheckEqual(
-      T.Union(T.Union(T.Number, T.ArrayClass), T.Union(T.Integer31, T.Array)),
+      T.Union(T.Union(T.Number, T.ArrayClass), T.Union(T.Smi, T.Array)),
       T.Union(T.Number, T.Array));
 }
 
 
 TEST(Intersect) {
   CcTest::InitializeVM();
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
   HandlifiedTypes T(isolate);
 
@@ skipping 27 matching lines @@
 
   // Bitset-class
   CHECK(IsClass(Type::Intersect(T.ObjectClass, T.Object)));
   CHECK(IsBitset(Type::Intersect(T.ObjectClass, T.Number)));
 
   CheckEqual(T.Intersect(T.ObjectClass, T.Object), T.ObjectClass);
   CheckEqual(T.Intersect(T.ObjectClass, T.Array), T.None);
   CheckEqual(T.Intersect(T.ObjectClass, T.Number), T.None);
 
   // Bitset-constant
-  CHECK(IsBitset(Type::Intersect(T.Integer31, T.Number)));
-  CHECK(IsConstant(Type::Intersect(T.Integer31Constant, T.Number)));
+  CHECK(IsBitset(Type::Intersect(T.Smi, T.Number)));
+  CHECK(IsConstant(Type::Intersect(T.SmiConstant, T.Number)));
   CHECK(IsConstant(Type::Intersect(T.ObjectConstant1, T.Object)));
 
-  CheckEqual(T.Intersect(T.Integer31, T.Number), T.Integer31);
-  CheckEqual(T.Intersect(T.Integer31Constant, T.Number), T.Integer31Constant);
+  CheckEqual(T.Intersect(T.Smi, T.Number), T.Smi);
+  CheckEqual(T.Intersect(T.SmiConstant, T.Number), T.SmiConstant);
   CheckEqual(T.Intersect(T.ObjectConstant1, T.Object), T.ObjectConstant1);
 
   // Class-constant
   CHECK(IsBitset(Type::Intersect(T.ObjectConstant1, T.ObjectClass)));
   CHECK(IsBitset(Type::Intersect(T.ArrayClass, T.ObjectConstant2)));
 
   CheckEqual(T.Intersect(T.ObjectConstant1, T.ObjectClass), T.None);
   CheckEqual(T.Intersect(T.ArrayClass, T.ObjectConstant2), T.None);
 
   // Bitset-union
   CHECK(IsUnion(
       Type::Intersect(T.Object, T.Union(T.ObjectConstant1, T.ObjectClass))));
   CHECK(IsBitset(
       Type::Intersect(T.Union(T.ArrayClass, T.ObjectConstant2), T.Number)));
 
   CheckEqual(
       T.Intersect(T.Object, T.Union(T.ObjectConstant1, T.ObjectClass)),
       T.Union(T.ObjectConstant1, T.ObjectClass));
   CheckEqual(
       T.Intersect(T.Union(T.ArrayClass, T.ObjectConstant1), T.Number),
       T.None);
 
   // Class-union
   CHECK(IsClass(
       Type::Intersect(T.Union(T.ArrayClass, T.ObjectConstant2), T.ArrayClass)));
   CHECK(IsClass(
-      Type::Intersect(T.Union(T.Object, T.Integer31Constant), T.ArrayClass)));
+      Type::Intersect(T.Union(T.Object, T.SmiConstant), T.ArrayClass)));
   CHECK(IsBitset(
       Type::Intersect(T.Union(T.ObjectClass, T.ArrayConstant1), T.ArrayClass)));
 
   CheckEqual(
       T.Intersect(T.ArrayClass, T.Union(T.ObjectConstant2, T.ArrayClass)),
       T.ArrayClass);
   CheckEqual(
-      T.Intersect(T.ArrayClass, T.Union(T.Object, T.Integer31Constant)),
+      T.Intersect(T.ArrayClass, T.Union(T.Object, T.SmiConstant)),
       T.ArrayClass);
   CheckEqual(
       T.Intersect(T.Union(T.ObjectClass, T.ArrayConstant1), T.ArrayClass),
       T.None);
 
   // Constant-union
   CHECK(IsConstant(Type::Intersect(
       T.ObjectConstant1, T.Union(T.ObjectConstant1, T.ObjectConstant2))));
   CHECK(IsConstant(Type::Intersect(
-      T.Union(T.Number, T.ObjectClass), T.Integer31Constant)));
+      T.Union(T.Number, T.ObjectClass), T.SmiConstant)));
   CHECK(IsBitset(Type::Intersect(
       T.Union(T.ArrayConstant1, T.ObjectClass), T.ObjectConstant1)));
 
   CheckEqual(
       T.Intersect(
           T.ObjectConstant1, T.Union(T.ObjectConstant1, T.ObjectConstant2)),
       T.ObjectConstant1);
   CheckEqual(
-      T.Intersect(T.Integer31Constant, T.Union(T.Number, T.ObjectConstant2)),
-      T.Integer31Constant);
+      T.Intersect(T.SmiConstant, T.Union(T.Number, T.ObjectConstant2)),
+      T.SmiConstant);
   CheckEqual(
       T.Intersect(T.Union(T.ArrayConstant1, T.ObjectClass), T.ObjectConstant1),
       T.None);
 
   // Union-union
   CHECK(IsUnion(Type::Intersect(
-      T.Union(T.Number, T.ArrayClass), T.Union(T.Integer32, T.Array))));
+      T.Union(T.Number, T.ArrayClass), T.Union(T.Signed32, T.Array))));
   CHECK(IsBitset(Type::Intersect(
-      T.Union(T.Number, T.ObjectClass), T.Union(T.Integer32, T.Array))));
+      T.Union(T.Number, T.ObjectClass), T.Union(T.Signed32, T.Array))));
 
   CheckEqual(
       T.Intersect(
           T.Union(T.Number, T.ArrayClass),
-          T.Union(T.Integer31, T.Array)),
-      T.Union(T.Integer31, T.ArrayClass));
+          T.Union(T.Smi, T.Array)),
+      T.Union(T.Smi, T.ArrayClass));
   CheckEqual(
       T.Intersect(
           T.Union(T.Number, T.ObjectClass),
-          T.Union(T.Integer32, T.Array)),
-      T.Integer32);
+          T.Union(T.Signed32, T.Array)),
+      T.Signed32);
   CheckEqual(
       T.Intersect(
           T.Union(T.ObjectConstant2, T.ObjectConstant1),
           T.Union(T.ObjectConstant1, T.ObjectConstant2)),
       T.Union(T.ObjectConstant2, T.ObjectConstant1));
   CheckEqual(
       T.Intersect(
           T.Union(T.Union(T.ObjectConstant2, T.ObjectConstant1), T.ArrayClass),
           T.Union(
               T.ObjectConstant1, T.Union(T.ArrayConstant1, T.ObjectConstant2))),
       T.Union(T.ObjectConstant2, T.ObjectConstant1));
   CheckEqual(
       T.Intersect(
           T.Union(T.ObjectConstant2, T.ArrayConstant1),
           T.Union(T.ObjectConstant1, T.ArrayConstant2)),
       T.ArrayConstant1);
 }