Merge bleeding_edge.

src/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 110 matching lines @@
     }
     return bitset;
   } else {
     Map* map = NULL;
     if (this->is_class()) {
       map = *this->as_class();
     } else {
       Handle<v8::internal::Object> value = this->as_constant();
       if (value->IsSmi()) return kSmi;
       map = HeapObject::cast(*value)->map();
+      if (map->instance_type() == HEAP_NUMBER_TYPE) {
+        int32_t i;
+        uint32_t u;
+        if (value->ToInt32(&i)) return Smi::IsValid(i) ? kSmi : kOtherSigned32;
+        if (value->ToUint32(&u)) return kUnsigned32;
+        return kDouble;
+      }
       if (map->instance_type() == ODDBALL_TYPE) {
         if (value->IsUndefined()) return kUndefined;
         if (value->IsNull()) return kNull;
         if (value->IsTrue() || value->IsFalse()) return kBoolean;
-        if (value->IsTheHole()) return kAny;
+        if (value->IsTheHole()) return kAny;  // TODO(rossberg): kNone?
+        UNREACHABLE();
       }
     }
     switch (map->instance_type()) {
       case STRING_TYPE:
       case ASCII_STRING_TYPE:
       case CONS_STRING_TYPE:
       case CONS_ASCII_STRING_TYPE:
       case SLICED_STRING_TYPE:
       case SLICED_ASCII_STRING_TYPE:
       case EXTERNAL_STRING_TYPE:
@@ skipping 77 matching lines @@
   } else if (this->is_union()) {
     // All but the first are non-bitsets and thus would yield kNone anyway.
     return union_get(this->as_union(), 0)->GlbBitset();
   } else {
     return kNone;
   }
 }
 
 
 // Check this <= that.
-bool Type::IsSlowCase(Type* that) {
+bool Type::SlowIs(Type* that) {
   // Fast path for bitsets.
+  if (this->is_none()) return true;
   if (that->is_bitset()) {
     return (this->LubBitset() | that->as_bitset()) == that->as_bitset();
   }
 
   if (that->is_class()) {
     return this->is_class() && *this->as_class() == *that->as_class();
   }
   if (that->is_constant()) {
     return this->is_constant() && *this->as_constant() == *that->as_constant();
   }
@@ skipping 266 matching lines @@
     for (unsigned i = 0; i < sizeof(val)*8; ++i) {
       int mask = (1 << i);
       if ((val & mask) != 0) {
         if (!first_entry) PrintF(out, ",");
         first_entry = false;
         PrintF(out, "%s", GetPrimitiveName(mask));
       }
     }
     PrintF(out, "}");
   } else if (is_constant()) {
-    PrintF(out, "Constant(%p)", static_cast<void*>(*as_constant()));
+    PrintF(out, "Constant(%p : ", static_cast<void*>(*as_constant()));
+    from_bitset(LubBitset())->TypePrint(out);
+    PrintF(")");
   } else if (is_class()) {
-    PrintF(out, "Class(%p)", static_cast<void*>(*as_class()));
+    PrintF(out, "Class(%p < ", static_cast<void*>(*as_class()));
+    from_bitset(LubBitset())->TypePrint(out);
+    PrintF(")");
   } else if (is_union()) {
     PrintF(out, "{");
     Handle<Unioned> unioned = as_union();
     for (int i = 0; i < unioned->length(); ++i) {
       Handle<Type> type_i = union_get(unioned, i);
       if (i > 0) PrintF(out, ",");
       type_i->TypePrint(out);
     }
     PrintF(out, "}");
   }
 }
 #endif
 
 
 } }  // namespace v8::internal