Templatise type representation

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 13 matching lines @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "cctest.h"
 #include "types.h"
 
 using namespace v8::internal;
 
 // Testing auxiliaries (breaking the Type abstraction).
-static bool IsBitset(Type* type) { return type->IsSmi(); }
-static bool IsClass(Type* type) { return type->IsMap(); }
-static bool IsConstant(Type* type) { return type->IsBox(); }
-static bool IsUnion(Type* type) { return type->IsFixedArray(); }
+static bool IsBitset(Handle<Type> t) { return t->IsSmi(); }
+static bool IsClass(Handle<Type> t) { return t->IsMap(); }
+static bool IsConstant(Handle<Type> t) { return t->IsBox(); }
+static bool IsUnion(Handle<Type> t) { return t->IsFixedArray(); }
 
-static int AsBitset(Type* type) { return Smi::cast(type)->value(); }
-static Map* AsClass(Type* type) { return Map::cast(type); }
-static Object* AsConstant(Type* type) { return Box::cast(type)->value(); }
-static FixedArray* AsUnion(Type* type) { return FixedArray::cast(type); }
+static int AsBitset(Handle<Type> t) { return Smi::cast(*t)->value(); }
+static Map* AsClass(Handle<Type> t) { return Map::cast(*t); }
+static Object* AsConstant(Handle<Type> t) { return Box::cast(*t)->value(); }
+static FixedArray* AsUnion(Handle<Type> t) { return FixedArray::cast(*t); }
 
 
 static void CheckEqual(Handle<Type> type1, Handle<Type> type2) {
-  CHECK_EQ(IsBitset(*type1), IsBitset(*type2));
-  CHECK_EQ(IsClass(*type1), IsClass(*type2));
-  CHECK_EQ(IsConstant(*type1), IsConstant(*type2));
-  CHECK_EQ(IsUnion(*type1), IsUnion(*type2));
+  CHECK_EQ(IsBitset(type1), IsBitset(type2));
+  CHECK_EQ(IsClass(type1), IsClass(type2));
+  CHECK_EQ(IsConstant(type1), IsConstant(type2));
+  CHECK_EQ(IsUnion(type1), IsUnion(type2));
   CHECK_EQ(type1->NumClasses(), type2->NumClasses());
   CHECK_EQ(type1->NumConstants(), type2->NumConstants());
-  if (IsBitset(*type1)) {
-    CHECK_EQ(AsBitset(*type1), AsBitset(*type2));
-  } else if (IsClass(*type1)) {
-    CHECK_EQ(AsClass(*type1), AsClass(*type2));
-  } else if (IsConstant(*type1)) {
-    CHECK_EQ(AsConstant(*type1), AsConstant(*type2));
-  } else if (IsUnion(*type1)) {
-    CHECK_EQ(AsUnion(*type1)->length(), AsUnion(*type2)->length());
+  if (IsBitset(type1)) {
+    CHECK_EQ(AsBitset(type1), AsBitset(type2));
+  } else if (IsClass(type1)) {
+    CHECK_EQ(AsClass(type1), AsClass(type2));
+  } else if (IsConstant(type1)) {
+    CHECK_EQ(AsConstant(type1), AsConstant(type2));
+  } else if (IsUnion(type1)) {
+    CHECK_EQ(AsUnion(type1)->length(), AsUnion(type2)->length());
   }
   CHECK(type1->Is(type2));
   CHECK(type2->Is(type1));
 }
 
 
 static void CheckSub(Handle<Type> type1, Handle<Type> type2) {
   CHECK(type1->Is(type2));
   CHECK(!type2->Is(type1));
-  if (IsBitset(*type1) && IsBitset(*type2)) {
-    CHECK_NE(AsBitset(*type1), AsBitset(*type2));
+  if (IsBitset(type1) && IsBitset(type2)) {
+    CHECK_NE(AsBitset(type1), AsBitset(type2));
   }
 }
 
 
 static void CheckUnordered(Handle<Type> type1, Handle<Type> type2) {
   CHECK(!type1->Is(type2));
   CHECK(!type2->Is(type1));
-  if (IsBitset(*type1) && IsBitset(*type2)) {
-    CHECK_NE(AsBitset(*type1), AsBitset(*type2));
+  if (IsBitset(type1) && IsBitset(type2)) {
+    CHECK_NE(AsBitset(type1), AsBitset(type2));
   }
 }
 
 
 static void CheckOverlap(Handle<Type> type1, Handle<Type> type2) {
   CHECK(type1->Maybe(type2));
   CHECK(type2->Maybe(type1));
-  if (IsBitset(*type1) && IsBitset(*type2)) {
-    CHECK_NE(0, AsBitset(*type1) & AsBitset(*type2));
+  if (IsBitset(type1) && IsBitset(type2)) {
+    CHECK_NE(0, AsBitset(type1) & AsBitset(type2));
   }
 }
 
 
 static void CheckDisjoint(Handle<Type> type1, Handle<Type> type2) {
   CHECK(!type1->Is(type2));
   CHECK(!type2->Is(type1));
   CHECK(!type1->Maybe(type2));
   CHECK(!type2->Maybe(type1));
-  if (IsBitset(*type1) && IsBitset(*type2)) {
-    CHECK_EQ(0, AsBitset(*type1) & AsBitset(*type2));
+  if (IsBitset(type1) && IsBitset(type2)) {
+    CHECK_EQ(0, AsBitset(type1) & AsBitset(type2));
   }
 }
 
 
 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),
-      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),
+      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)),
+      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 = 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);
+    ObjectClass = Type::Class(object_map, isolate);
+    ArrayClass = Type::Class(array_map, isolate);
+    SmiConstant = Type::Constant(smi, isolate);
+    Signed32Constant = Type::Constant(signed32, isolate);
+    ObjectConstant1 = Type::Constant(object1, isolate);
+    ObjectConstant2 = Type::Constant(object2, isolate);
+    ArrayConstant1 = Type::Constant(array, isolate);
+    ArrayConstant2 = Type::Constant(array, isolate);
   }
 
   Handle<Type> None;
   Handle<Type> Any;
   Handle<Type> Oddball;
   Handle<Type> Boolean;
   Handle<Type> Null;
   Handle<Type> Undefined;
   Handle<Type> Number;
   Handle<Type> Smi;
@@ skipping 22 matching lines @@
 
   Handle<Map> object_map;
   Handle<Map> array_map;
 
   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> Union(Handle<Type> t1, Handle<Type> t2) {
+    return Type::Union(t1, t2, 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_);
+  Handle<Type> Intersect(Handle<Type> t1, Handle<Type> t2) {
+    return Type::Intersect(t1, t2, isolate_);
   }
 
  private:
   Isolate* isolate_;
 };
 
 
 TEST(Bitset) {
   CcTest::InitializeVM();
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
   HandlifiedTypes T(isolate);
 
-  CHECK(IsBitset(*T.None));
-  CHECK(IsBitset(*T.Any));
-  CHECK(IsBitset(*T.String));
-  CHECK(IsBitset(*T.Object));
+  CHECK(IsBitset(T.None));
+  CHECK(IsBitset(T.Any));
+  CHECK(IsBitset(T.String));
+  CHECK(IsBitset(T.Object));
 
-  CHECK(IsBitset(Type::Union(T.String, T.Number)));
-  CHECK(IsBitset(Type::Union(T.String, T.Receiver)));
-  CHECK(IsBitset(Type::Optional(T.Object)));
+  CHECK(IsBitset(T.Union(T.String, T.Number)));
+  CHECK(IsBitset(T.Union(T.String, T.Receiver)));
 
-  CHECK_EQ(0, AsBitset(*T.None));
-  CHECK_EQ(AsBitset(*T.Number) | AsBitset(*T.String),
-           AsBitset(Type::Union(T.String, T.Number)));
-  CHECK_EQ(AsBitset(*T.Receiver),
-           AsBitset(Type::Union(T.Receiver, T.Object)));
-  CHECK_EQ(AsBitset(*T.String) | AsBitset(*T.Undefined),
-           AsBitset(Type::Optional(T.String)));
+  CHECK_EQ(0, AsBitset(T.None));
+  CHECK_EQ(AsBitset(T.Number) | AsBitset(T.String),
+           AsBitset(T.Union(T.String, T.Number)));
+  CHECK_EQ(AsBitset(T.Receiver),
+           AsBitset(T.Union(T.Receiver, T.Object)));
 }
 
 
 TEST(Class) {
   CcTest::InitializeVM();
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
   HandlifiedTypes T(isolate);
 
-  CHECK(IsClass(*T.ObjectClass));
-  CHECK(IsClass(*T.ArrayClass));
+  CHECK(IsClass(T.ObjectClass));
+  CHECK(IsClass(T.ArrayClass));
 
-  CHECK(*T.object_map == AsClass(*T.ObjectClass));
-  CHECK(*T.array_map == AsClass(*T.ArrayClass));
+  CHECK(*T.object_map == AsClass(T.ObjectClass));
+  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.SmiConstant));
-  CHECK(IsConstant(*T.ObjectConstant1));
-  CHECK(IsConstant(*T.ObjectConstant2));
-  CHECK(IsConstant(*T.ArrayConstant1));
-  CHECK(IsConstant(*T.ArrayConstant2));
+  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.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));
+  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();
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
   HandlifiedTypes T(isolate);
 
   // Reflexivity
@@ skipping 149 matching lines @@
 }
 
 
 TEST(Union) {
   CcTest::InitializeVM();
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
   HandlifiedTypes T(isolate);
 
   // Bitset-bitset
-  CHECK(IsBitset(Type::Union(T.Object, T.Number)));
-  CHECK(IsBitset(Type::Union(T.Object, T.Object)));
-  CHECK(IsBitset(Type::Union(T.Any, T.None)));
+  CHECK(IsBitset(T.Union(T.Object, T.Number)));
+  CHECK(IsBitset(T.Union(T.Object, T.Object)));
+  CHECK(IsBitset(T.Union(T.Any, T.None)));
 
   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)));
+  CHECK(IsClass(T.Union(T.ObjectClass, T.ObjectClass)));
+  CHECK(IsUnion(T.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)));
+  CHECK(IsConstant(T.Union(T.ObjectConstant1, T.ObjectConstant1)));
+  CHECK(IsConstant(T.Union(T.ArrayConstant1, T.ArrayConstant1)));
+  CHECK(IsUnion(T.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)));
+  CHECK(IsBitset(T.Union(T.ObjectClass, T.Object)));
+  CHECK(IsUnion(T.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.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.SmiConstant, T.Number)));
-  CHECK(IsBitset(Type::Union(T.ObjectConstant1, T.Object)));
-  CHECK(IsUnion(Type::Union(T.ObjectConstant2, T.Number)));
+  CHECK(IsBitset(T.Union(T.SmiConstant, T.Number)));
+  CHECK(IsBitset(T.Union(T.ObjectConstant1, T.Object)));
+  CHECK(IsUnion(T.Union(T.ObjectConstant2, 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.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)));
+  CHECK(IsUnion(T.Union(T.ObjectConstant1, T.ObjectClass)));
+  CHECK(IsUnion(T.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)));
+  CHECK(IsBitset(T.Union(T.Object, T.Union(T.ObjectConstant1, T.ObjectClass))));
+  CHECK(IsUnion(T.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)));
+      T.Union(T.Union(T.ArrayClass, T.ObjectConstant2), T.ArrayClass)));
   CHECK(IsUnion(
-      Type::Union(T.Union(T.ArrayClass, T.ObjectConstant2), T.ObjectClass)));
+      T.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(
+  CHECK(IsUnion(T.Union(
       T.ObjectConstant1, T.Union(T.ObjectConstant1, T.ObjectConstant2))));
-  CHECK(IsUnion(Type::Union(
+  CHECK(IsUnion(T.Union(
       T.Union(T.ArrayConstant1, T.ObjectClass), T.ObjectConstant1)));
-  CHECK(IsUnion(Type::Union(
+  CHECK(IsUnion(T.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(
+  CHECK(IsBitset(T.Union(
       T.Union(T.Number, T.ArrayClass), T.Union(T.Signed32, T.Array))));
-  CHECK(IsUnion(Type::Union(
+  CHECK(IsUnion(T.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.Smi, T.Array)),
       T.Union(T.Number, T.Array));
 }
 
 
 TEST(Intersect) {
   CcTest::InitializeVM();
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
   HandlifiedTypes T(isolate);
 
   // Bitset-bitset
-  CHECK(IsBitset(Type::Intersect(T.Object, T.Number)));
-  CHECK(IsBitset(Type::Intersect(T.Object, T.Object)));
-  CHECK(IsBitset(Type::Intersect(T.Any, T.None)));
+  CHECK(IsBitset(T.Intersect(T.Object, T.Number)));
+  CHECK(IsBitset(T.Intersect(T.Object, T.Object)));
+  CHECK(IsBitset(T.Intersect(T.Any, T.None)));
 
   CheckEqual(T.Intersect(T.None, T.Number), T.None);
   CheckEqual(T.Intersect(T.Object, T.Proxy), T.None);
   CheckEqual(T.Intersect(T.Name, T.String), T.Intersect(T.String, T.Name));
   CheckEqual(T.Intersect(T.UniqueName, T.String), T.InternalizedString);
 
   // Class-class
-  CHECK(IsClass(Type::Intersect(T.ObjectClass, T.ObjectClass)));
-  CHECK(IsBitset(Type::Intersect(T.ObjectClass, T.ArrayClass)));
+  CHECK(IsClass(T.Intersect(T.ObjectClass, T.ObjectClass)));
+  CHECK(IsBitset(T.Intersect(T.ObjectClass, T.ArrayClass)));
 
   CheckEqual(T.Intersect(T.ObjectClass, T.ObjectClass), T.ObjectClass);
   CheckEqual(T.Intersect(T.ObjectClass, T.ArrayClass), T.None);
 
   // Constant-constant
-  CHECK(IsConstant(Type::Intersect(T.ObjectConstant1, T.ObjectConstant1)));
-  CHECK(IsConstant(Type::Intersect(T.ArrayConstant1, T.ArrayConstant2)));
-  CHECK(IsBitset(Type::Intersect(T.ObjectConstant1, T.ObjectConstant2)));
+  CHECK(IsConstant(T.Intersect(T.ObjectConstant1, T.ObjectConstant1)));
+  CHECK(IsConstant(T.Intersect(T.ArrayConstant1, T.ArrayConstant2)));
+  CHECK(IsBitset(T.Intersect(T.ObjectConstant1, T.ObjectConstant2)));
 
   CheckEqual(
       T.Intersect(T.ObjectConstant1, T.ObjectConstant1), T.ObjectConstant1);
   CheckEqual(
       T.Intersect(T.ArrayConstant1, T.ArrayConstant2), T.ArrayConstant1);
   CheckEqual(T.Intersect(T.ObjectConstant1, T.ObjectConstant2), T.None);
 
   // Bitset-class
-  CHECK(IsClass(Type::Intersect(T.ObjectClass, T.Object)));
-  CHECK(IsBitset(Type::Intersect(T.ObjectClass, T.Number)));
+  CHECK(IsClass(T.Intersect(T.ObjectClass, T.Object)));
+  CHECK(IsBitset(T.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.Smi, T.Number)));
-  CHECK(IsConstant(Type::Intersect(T.SmiConstant, T.Number)));
-  CHECK(IsConstant(Type::Intersect(T.ObjectConstant1, T.Object)));
+  CHECK(IsBitset(T.Intersect(T.Smi, T.Number)));
+  CHECK(IsConstant(T.Intersect(T.SmiConstant, T.Number)));
+  CHECK(IsConstant(T.Intersect(T.ObjectConstant1, T.Object)));
 
   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)));
+  CHECK(IsBitset(T.Intersect(T.ObjectConstant1, T.ObjectClass)));
+  CHECK(IsBitset(T.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))));
+      T.Intersect(T.Object, T.Union(T.ObjectConstant1, T.ObjectClass))));
   CHECK(IsBitset(
-      Type::Intersect(T.Union(T.ArrayClass, T.ObjectConstant2), T.Number)));
+      T.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)));
+      T.Intersect(T.Union(T.ArrayClass, T.ObjectConstant2), T.ArrayClass)));
   CHECK(IsClass(
-      Type::Intersect(T.Union(T.Object, T.SmiConstant), T.ArrayClass)));
+      T.Intersect(T.Union(T.Object, T.SmiConstant), T.ArrayClass)));
   CHECK(IsBitset(
-      Type::Intersect(T.Union(T.ObjectClass, T.ArrayConstant1), T.ArrayClass)));
+      T.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.SmiConstant)),
       T.ArrayClass);
   CheckEqual(
       T.Intersect(T.Union(T.ObjectClass, T.ArrayConstant1), T.ArrayClass),
       T.None);
 
   // Constant-union
-  CHECK(IsConstant(Type::Intersect(
+  CHECK(IsConstant(T.Intersect(
       T.ObjectConstant1, T.Union(T.ObjectConstant1, T.ObjectConstant2))));
-  CHECK(IsConstant(Type::Intersect(
+  CHECK(IsConstant(T.Intersect(
       T.Union(T.Number, T.ObjectClass), T.SmiConstant)));
-  CHECK(IsBitset(Type::Intersect(
+  CHECK(IsBitset(T.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.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(
+  CHECK(IsUnion(T.Intersect(
       T.Union(T.Number, T.ArrayClass), T.Union(T.Signed32, T.Array))));
-  CHECK(IsBitset(Type::Intersect(
+  CHECK(IsBitset(T.Intersect(
       T.Union(T.Number, T.ObjectClass), T.Union(T.Signed32, T.Array))));
 
   CheckEqual(
       T.Intersect(
           T.Union(T.Number, 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.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);
 }