Migrate Compare ICs to new type rep

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 12 matching lines @@
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // 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 "types.h"
 
 namespace v8 {
 namespace internal {
 
+int Type::NumClasses() {
+  if (is_class()) {
+    return 1;
+  } else if (is_union()) {
+    Handle<Unioned> unioned = as_union();
+    int result = 0;
+    for (int i = 0; i < unioned->length(); ++i) {
+      if (union_get(unioned, i)->is_class()) ++result;
+    }
+    return result;
+  } else {
+    return 0;
+  }
+}
+
+
+int Type::NumConstants() {
+  if (is_constant()) {
+    return 1;
+  } else if (is_union()) {
+    Handle<Unioned> unioned = as_union();
+    int result = 0;
+    for (int i = 0; i < unioned->length(); ++i) {
+      if (union_get(unioned, i)->is_constant()) ++result;
+    }
+    return result;
+  } else {
+    return 0;
+  }
+}
+
+
+template<class T>
+Handle<Type> Type::Iterator<T>::get_type() {
+  ASSERT(!Done());
+  return type_->is_union() ? union_get(type_->as_union(), index_) : type_;
+}
+
+template<>
+Handle<Map> Type::Iterator<Map>::Current() {
+  return get_type()->as_class();
+}
+
+template<>
+Handle<v8::internal::Object> Type::Iterator<v8::internal::Object>::Current() {
+  return get_type()->as_constant();
+}
+
+
+template<>
+bool Type::Iterator<Map>::matches(Handle<Type> type) {
+  return type->is_class();
+}
+
+template<>
+bool Type::Iterator<v8::internal::Object>::matches(Handle<Type> type) {
+  return type->is_constant();
+}
+
+
+template<class T>
+void Type::Iterator<T>::Advance() {
+  ++index_;
+  if (type_->is_union()) {
+    Handle<Unioned> unioned = type_->as_union();
+    for (; index_ < unioned->length(); ++index_) {
+      if (matches(union_get(unioned, index_))) return;
+    }
+  } else if (index_ == 0 && matches(type_)) {
+    return;
+  }
+  index_ = -1;
+}
+
+template class Type::Iterator<Map>;
+template class Type::Iterator<v8::internal::Object>;
+
+
 // Get the smallest bitset subsuming this type.
 int Type::LubBitset() {
   if (this->is_bitset()) {
     return this->as_bitset();
   } else if (this->is_union()) {
     Handle<Unioned> unioned = this->as_union();
     int bitset = kNone;
     for (int i = 0; i < unioned->length(); ++i) {
       bitset |= union_get(unioned, i)->LubBitset();
     }
     return bitset;
   } else {
     Map* map = NULL;
     if (this->is_class()) {
       map = *this->as_class();
     } else {
-      v8::internal::Object* value = this->as_constant()->value();
-      if (value->IsSmi()) return kSmi;
-      map = HeapObject::cast(value)->map();
+      Handle<v8::internal::Object> value = this->as_constant();
+      if (value->IsSmi()) return kInteger31;
+      map = HeapObject::cast(*value)->map();
+      if (map->instance_type() == ODDBALL_TYPE) {
+        if (value->IsUndefined()) return kUndefined;
+        if (value->IsNull()) return kNull;
+        if (value->IsTrue() || value->IsFalse()) return kBoolean;
+      }
     }
     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:
       case EXTERNAL_ASCII_STRING_TYPE:
       case EXTERNAL_STRING_WITH_ONE_BYTE_DATA_TYPE:
       case SHORT_EXTERNAL_STRING_TYPE:
       case SHORT_EXTERNAL_ASCII_STRING_TYPE:
       case SHORT_EXTERNAL_STRING_WITH_ONE_BYTE_DATA_TYPE:
       case INTERNALIZED_STRING_TYPE:
       case ASCII_INTERNALIZED_STRING_TYPE:
       case CONS_INTERNALIZED_STRING_TYPE:
       case CONS_ASCII_INTERNALIZED_STRING_TYPE:
@@ skipping 16 matching lines @@
       case JS_CONTEXT_EXTENSION_OBJECT_TYPE:
       case JS_GENERATOR_OBJECT_TYPE:
       case JS_MODULE_TYPE:
       case JS_GLOBAL_OBJECT_TYPE:
       case JS_BUILTINS_OBJECT_TYPE:
       case JS_GLOBAL_PROXY_TYPE:
       case JS_ARRAY_BUFFER_TYPE:
       case JS_TYPED_ARRAY_TYPE:
       case JS_WEAK_MAP_TYPE:
       case JS_REGEXP_TYPE:
+        if (map->is_undetectable()) return kUndetectable;
         return kOtherObject;
       case JS_ARRAY_TYPE:
         return kArray;
       case JS_FUNCTION_TYPE:
         return kFunction;
       case JS_PROXY_TYPE:
       case JS_FUNCTION_PROXY_TYPE:
         return kProxy;
+      case MAP_TYPE:
+        // When compiling stub templates, the meta map is used as a place holder
+        // for the actual map with which the template is later instantiated.
+        // We treat it as a kind of type variable whose upper bound is Any.
+        // TODO(rossberg): for caching of CompareNilIC stubs to work correctly,
+        // we must exclude Undetectable here. This makes no sense, really,
+        // because it means that the template isn't actually parametric.
+        // Also, it doesn't apply elsewhere. 8-(
+        // We ought to find a cleaner solution for compiling stubs parameterised
+        // over type or class variables, esp ones with bounds...
+        return kDetectable;
       default:
         UNREACHABLE();
         return kNone;
     }
   }
 }
 
 
 // Get the largest bitset subsumed by this type.
 int Type::GlbBitset() {
   if (this->is_bitset()) {
     return this->as_bitset();
   } 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::Is(Handle<Type> that) {
+bool Type::Is(Type* that) {
   // Fast path for bitsets.
   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()->value() == that->as_constant()->value();
+    return this->is_constant() && *this->as_constant() == *that->as_constant();
   }
 
   // (T1 \/ ... \/ Tn) <= T  <=>  (T1 <= T) /\ ... /\ (Tn <= T)
   if (this->is_union()) {
     Handle<Unioned> unioned = this->as_union();
     for (int i = 0; i < unioned->length(); ++i) {
       Handle<Type> this_i = union_get(unioned, i);
       if (!this_i->Is(that)) return false;
     }
     return true;
   }
 
   // T <= (T1 \/ ... \/ Tn)  <=>  (T <= T1) \/ ... \/ (T <= Tn)
   // (iff T is not a union)
   if (that->is_union()) {
     Handle<Unioned> unioned = that->as_union();
     for (int i = 0; i < unioned->length(); ++i) {
       Handle<Type> that_i = union_get(unioned, i);
       if (this->Is(that_i)) return true;
       if (this->is_bitset()) break;  // Fast fail, no other field is a bitset.
     }
     return false;
   }
 
   return false;
 }
 
 
 // Check this overlaps that.
-bool Type::Maybe(Handle<Type> that) {
+bool Type::Maybe(Type* that) {
   // Fast path for bitsets.
   if (this->is_bitset()) {
     return (this->as_bitset() & that->LubBitset()) != 0;
   }
   if (that->is_bitset()) {
     return (this->LubBitset() & that->as_bitset()) != 0;
   }
 
   if (this->is_class()) {
     return that->is_class() && *this->as_class() == *that->as_class();
   }
   if (this->is_constant()) {
-    return that->is_constant() &&
-        this->as_constant()->value() == that->as_constant()->value();
+    return that->is_constant() && *this->as_constant() == *that->as_constant();
   }
 
   // (T1 \/ ... \/ Tn) overlaps T <=> (T1 overlaps T) \/ ... \/ (Tn overlaps T)
   if (this->is_union()) {
     Handle<Unioned> unioned = this->as_union();
     for (int i = 0; i < unioned->length(); ++i) {
       Handle<Type> this_i = union_get(unioned, i);
       if (this_i->Maybe(that)) return true;
     }
     return false;
@@ skipping 89 matching lines @@
 }
 
 
 Type* Type::Optional(Handle<Type> type) {
   return type->is_bitset()
       ? from_bitset(type->as_bitset() | kUndefined)
       : Union(type, Undefined()->handle_via_isolate_of(*type));
 }
 
 } }  // namespace v8::internal