Fix type check to perform a subtype test at top level instead of an

runtime/vm/object.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 306 matching lines @@
   static RawError* Init(Isolate* isolate);
   static void InitFromSnapshot(Isolate* isolate);
   static void InitOnce();
 
   static intptr_t InstanceSize() {
     return RoundedAllocationSize(sizeof(RawObject));
   }
 
   static const ObjectKind kInstanceKind = kObject;
 
-  enum TypeTestKind {
-    kIsSubtypeOf,
-    kIsAssignableTo
-  };
-
  protected:
   // Used for extracting the C++ vtable during bringup.
   Object() : raw_(null_) {}
 
   uword raw_value() const {
     return reinterpret_cast<uword>(raw());
   }
 
   inline void SetRaw(RawObject* value);
 
@@ skipping 222 matching lines @@
 
   // Check if this class represents a signature class.
   bool IsSignatureClass() const {
     return signature_function() != Object::null();
   }
 
   // Check if this class represents a canonical signature class, i.e. not an
   // alias as defined in a typedef.
   bool IsCanonicalSignatureClass() const;
 
-  // Check the "more specific than" relationship.
-  bool IsMoreSpecificThan(
-      const AbstractTypeArguments& type_arguments,
-      const Class& other,
-      const AbstractTypeArguments& other_type_arguments,
-      Error* malformed_error) const;
-
   // Check the subtype relationship.
   bool IsSubtypeOf(const AbstractTypeArguments& type_arguments,
                    const Class& other,
                    const AbstractTypeArguments& other_type_arguments,
-                   Error* malformed_error) const {
-    return TestType(kIsSubtypeOf,
-                    type_arguments,
-                    other,
-                    other_type_arguments,
-                    malformed_error);
-  }
-
-  // Check the assignability relationship.
-  bool IsAssignableTo(const AbstractTypeArguments& type_arguments,
-                      const Class& dst,
-                      const AbstractTypeArguments& dst_type_arguments,
-                      Error* malformed_error) const {
-    return TestType(kIsAssignableTo,
-                    type_arguments,
-                    dst,
-                    dst_type_arguments,
-                    malformed_error);
-  }
+                   Error* malformed_error) const;
 
   // Check if this is the top level class.
   bool IsTopLevel() const;
 
   RawArray* fields() const { return raw_ptr()->fields_; }
   void SetFields(const Array& value) const;
 
   RawArray* functions() const { return raw_ptr()->functions_; }
   void SetFunctions(const Array& value) const;
 
@@ skipping 97 matching lines @@
   void set_signature_type(const AbstractType& value) const;
   void set_class_state(int8_t state) const;
 
   void set_constants(const Array& value) const;
 
   void set_canonical_types(const Array& value) const;
   RawArray* canonical_types() const;
 
   void CalculateFieldOffsets() const;
 
-  // Check the subtype or assignability relationship.
-  bool TestType(TypeTestKind test,
-                const AbstractTypeArguments& type_arguments,
-                const Class& other,
-                const AbstractTypeArguments& other_type_arguments,
-                Error* malformed_error) const;
-
   // Assigns empty array to all raw class array fields.
   void InitEmptyFields();
 
   RawFunction* LookupAccessorFunction(const char* prefix,
                                       intptr_t prefix_length,
                                       const String& name) const;
 
   HEAP_OBJECT_IMPLEMENTATION(Class, Object);
   friend class Object;
   friend class Instance;
@@ skipping 117 matching lines @@
 
   // Check if this type is an interface type.
   bool IsInterfaceType() const {
     if (!HasResolvedTypeClass()) {
       return false;
     }
     const Class& cls = Class::Handle(type_class());
     return !cls.IsNull() && cls.is_interface();
   }
 
-  // Check the "more specific than" relationship.
-  bool IsMoreSpecificThan(const AbstractType& other,
-                          Error* malformed_error) const;
-
   // Check the subtype relationship.
-  bool IsSubtypeOf(const AbstractType& other, Error* malformed_error) const {
-    return Test(kIsSubtypeOf, other, malformed_error);
-  }
-
-  // Check the assignability relationship.
-  bool IsAssignableTo(const AbstractType& dst,
-                      Error* malformed_error) const {
-    return Test(kIsAssignableTo, dst, malformed_error);
-  }
+  bool IsSubtypeOf(const AbstractType& other, Error* malformed_error) const;
 
   static RawAbstractType* NewTypeParameter(intptr_t index,
                                            const String& name,
                                            intptr_t token_index);
 
   static RawAbstractType* NewInstantiatedType(
       const AbstractType& uninstantiated_type,
       const AbstractTypeArguments& instantiator_type_arguments);
 
  protected:
-  // Check the subtype or assignability relationship.
-  bool Test(TypeTestKind test,
-            const AbstractType& other,
-            Error* malformed_error) const;
-
   HEAP_OBJECT_IMPLEMENTATION(AbstractType, Object);
   friend class Class;
 };
 
 
 // A Type consists of a class, possibly parameterized with type
 // arguments. Example: C<T1, T2>.
 // An unresolved class is a String specifying the class name.
 class Type : public AbstractType {
  public:
@@ skipping 190 matching lines @@
   // Check if this type argument vector consists solely of DynamicType,
   // considering only a prefix of length 'len'.
   bool IsDynamicTypes(intptr_t len) const;
 
   // Check that this type argument vector is within the declared bounds of the
   // given class or interface. If not, set malformed_error (if not yet set).
   bool IsWithinBoundsOf(const Class& cls,
                         const AbstractTypeArguments& bounds_instantiator,
                         Error* malformed_error) const;
 
-  // Check the "more specific than" relationship, considering only a prefix of
-  // length 'len'.
-  bool IsMoreSpecificThan(const AbstractTypeArguments& other,
-                          intptr_t len,
-                          Error* malformed_error) const;
+  // Check the subtype relationship, considering only a prefix of length 'len'.
+  bool IsSubtypeOf(const AbstractTypeArguments& other,
+                   intptr_t len,
+                   Error* malformed_error) const;
 
   bool Equals(const AbstractTypeArguments& other) const;
 
   // UNREACHABLEs as AbstractTypeArguments is an abstract class.
   virtual intptr_t Length() const;
   virtual RawAbstractType* TypeAt(intptr_t index) const;
   virtual void SetTypeAt(intptr_t index, const AbstractType& value) const;
   virtual bool IsResolved() const;
   virtual bool IsInstantiated() const;
   virtual bool IsUninstantiatedIdentity() const;
@@ skipping 285 matching lines @@
   // Returns true if this function has parameters that are compatible with the
   // parameters of the other function in order for this function to override the
   // other function. Parameter types are ignored.
   bool HasCompatibleParametersWith(const Function& other) const;
 
   // Returns true if the type of this function is a subtype of the type of
   // the other function.
   bool IsSubtypeOf(const AbstractTypeArguments& type_arguments,
                    const Function& other,
                    const AbstractTypeArguments& other_type_arguments,
-                   Error* malformed_error) const {
-    return TestType(kIsSubtypeOf,
-                    type_arguments,
-                    other,
-                    other_type_arguments,
-                    malformed_error);
-  }
-
-  // Returns true if the type of this function can be assigned to the type of
-  // the destination function.
-  bool IsAssignableTo(const AbstractTypeArguments& type_arguments,
-                      const Function& dst,
-                      const AbstractTypeArguments& dst_type_arguments,
-                      Error* malformed_error) const {
-    return TestType(kIsAssignableTo,
-                    type_arguments,
-                    dst,
-                    dst_type_arguments,
-                    malformed_error);
-  }
+                   Error* malformed_error) const;
 
   // Returns true if this function represents a (possibly implicit) closure
   // function.
   bool IsClosureFunction() const {
     return kind() == RawFunction::kClosureFunction;
   }
 
   // Returns true if this function represents an implicit closure function.
   bool IsImplicitClosureFunction() const;
 
@@ skipping 53 matching lines @@
   void set_is_static(bool is_static) const;
   void set_is_const(bool is_const) const;
   void set_parent_function(const Function& value) const;
   void set_token_index(intptr_t value) const;
   void set_implicit_closure_function(const Function& value) const;
   static RawFunction* New();
 
   RawString* BuildSignature(bool instantiate,
                             const AbstractTypeArguments& instantiator) const;
 
-  // Checks the subtype or assignability relationship between the type of this
-  // function and the type of the other function.
-  bool TestType(TypeTestKind test,
-                const AbstractTypeArguments& type_arguments,
-                const Function& other,
-                const AbstractTypeArguments& other_type_arguments,
-                Error* malformed_error) const;
-
   // Checks the type of the formal parameter at the given position for
   // assignability relationship between the type of this function and the type
   // of the other function.
   bool TestParameterType(
       intptr_t parameter_position,
       const AbstractTypeArguments& type_arguments,
       const Function& other,
       const AbstractTypeArguments& other_type_arguments,
       Error* malformed_error) const;
 
@@ skipping 1025 matching lines @@
 
   void SetField(const Field& field, const Object& value) const {
     StorePointer(FieldAddr(field), value.raw());
   }
 
   RawType* GetType() const;
 
   virtual RawAbstractTypeArguments* GetTypeArguments() const;
   virtual void SetTypeArguments(const AbstractTypeArguments& value) const;
 
-  // Check if this instance is an instance of the given type.
+  // Check if the type of this instance is a subtype of the given type.
   bool IsInstanceOf(const AbstractType& type,
                     const AbstractTypeArguments& type_instantiator,
-                    Error* malformed_error) const {
-    return TestType(kIsSubtypeOf, type, type_instantiator, malformed_error);
-  }
-
-  // Check if this instance is assignable to the given type.
-  bool IsAssignableTo(const AbstractType& type,
-                      const AbstractTypeArguments& type_instantiator,
-                      Error* malformed_error) const {
-    return TestType(kIsAssignableTo, type, type_instantiator, malformed_error);
-  }
+                    Error* malformed_error) const;
 
   bool IsValidNativeIndex(int index) const;
 
   intptr_t GetNativeField(int index) const {
     return *NativeFieldAddr(index);
   }
 
   void SetNativeField(int index, intptr_t value) const {
     *NativeFieldAddr(index) = value;
   }
@@ skipping 16 matching lines @@
     ASSERT(IsValidNativeIndex(index));
     return reinterpret_cast<intptr_t*>((raw_value() - kHeapObjectTag)
                                        + (index * kWordSize)
                                        + sizeof(RawObject));
   }
   void SetFieldAtOffset(intptr_t offset, const Object& value) const {
     StorePointer(FieldAddrAtOffset(offset), value.raw());
   }
   bool IsValidFieldOffset(int offset) const;
 
-  // Check the subtype or assignability relationship between the type of this
-  // instance and the given type.
-  bool TestType(TypeTestKind test,
-                const AbstractType& type,
-                const AbstractTypeArguments& type_instantiator,
-                Error* malformed_error) const;
-
   // TODO(iposva): Determine if this gets in the way of Smi.
   HEAP_OBJECT_IMPLEMENTATION(Instance, Object);
   friend class Class;
 };
 
 
 class Number : public Instance {
  public:
   // TODO(iposva): Fill in a useful Number interface.
   virtual bool IsZero() const {
@@ skipping 1300 matching lines @@
 }
 
 
 void Context::SetAt(intptr_t index, const Instance& value) const {
   StorePointer(InstanceAddr(index), value.raw());
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_