Complete generic closure type checking.

runtime/vm/object.h

 // Copyright (c) 2011, 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 "vm/assert.h"
 #include "vm/dart.h"
 #include "vm/globals.h"
@@ skipping 1175 matching lines @@
   // ast printing. The special ':' character, if present, is replaced by '_'.
   const char* ToFullyQualifiedCString() const;
 
   // 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 Function& other) const {
-    return TestType(kIsSubtypeOf, other);
+  bool IsSubtypeOf(const TypeArguments& type_arguments,
+                   const Function& other,
+                   const TypeArguments& other_type_arguments) const {
+    return TestType(kIsSubtypeOf,
+                    type_arguments,
+                    other,
+                    other_type_arguments);
   }
 
   // Returns true if the type of this function can be assigned to the type of
   // the destination function.
-  bool IsAssignableTo(const Function& dst) const {
-    return TestType(kIsAssignableTo, dst);
+  bool IsAssignableTo(const TypeArguments& type_arguments,
+                      const Function& dst,
+                      const TypeArguments& dst_type_arguments) const {
+    return TestType(kIsAssignableTo,
+                    type_arguments,
+                    dst,
+                    dst_type_arguments);
   }
 
   // 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_token_index(intptr_t value) const;
   void set_implicit_closure_function(const Function& value) const;
   static RawFunction* New();
 
   RawString* BuildSignature(bool instantiate,
                             const TypeArguments& instantiator,
                             intptr_t offset) 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 Function& other) const;
+  bool TestType(TypeTestKind test,
+                const TypeArguments& type_arguments,
+                const Function& other,
+                const TypeArguments& other_type_arguments) const;
 
   HEAP_OBJECT_IMPLEMENTATION(Function, Object);
   friend class Class;
 };
 
 
 class Field : public Object {
  public:
   RawString* name() const { return raw_ptr()->name_; }
   bool is_static() const { return raw_ptr()->is_static_; }
@@ skipping 1668 matching lines @@
 }
 
 
 void Context::SetAt(intptr_t index, const Instance& value) const {
   StorePointer(InstanceAddr(index), value.raw());
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_