Keep types in signatures of function types properly instantiated as the function

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 RUNTIME_VM_OBJECT_H_
 #define RUNTIME_VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 2182 matching lines @@
   // For example, if this function has a signature of the form
   // '(T, [B, C]) => R', where 'T' and 'R' are type parameters of the
   // owner class of this function, then its signature type is a parameterized
   // function type with uninstantiated type arguments 'T' and 'R' as elements of
   // its type argument vector.
   RawType* SignatureType() const;
 
   // Update the signature type (with a canonical version).
   void SetSignatureType(const Type& value) const;
 
-  // Build a string of the form 'C<T, R>(T, {B b, C c}) => R' representing the
+  // Return a new function with instantiated result and parameter types.
+  RawFunction* InstantiateSignatureFrom(
+      const TypeArguments& instantiator_type_arguments,
+      Heap::Space space) const;
+
+  // Build a string of the form '(T, {B b, C c}) => R' representing the
   // internal signature of the given function. In this example, T and R are
   // type parameters of class C, the owner of the function.
-  RawString* Signature() const {
-    const bool instantiate = false;
-    return BuildSignature(instantiate, kInternalName,
-                          Object::null_type_arguments());
-  }
+  RawString* Signature() const { return BuildSignature(kInternalName); }
 
   // Build a string of the form '(T, {B b, C c}) => R' representing the
   // user visible signature of the given function. In this example, T and R are
-  // type parameters of class C, the owner of the function, also called the
-  // scope class of the function type.
-  // Implicit parameters are hidden, as well as the prefix denoting the
-  // scope class and its type parameters.
+  // type parameters of class C, the owner of the function.
+  // Implicit parameters are hidden.
   RawString* UserVisibleSignature() const {
-    const bool instantiate = false;
-    return BuildSignature(instantiate, kUserVisibleName,
-                          Object::null_type_arguments());
-  }
-
-  // Build a string of the form '(A, {B b, C c}) => D' representing the
-  // signature of the given function, where all generic types (e.g. '<T, R>' in
-  // 'C<T, R>(T, {B b, C c}) => R') are instantiated using the given
-  // instantiator type argument vector of a C instance (e.g. '<A, D>').
-  RawString* InstantiatedSignatureFrom(const TypeArguments& instantiator,
-                                       NameVisibility name_visibility) const {
-    const bool instantiate = true;
-    return BuildSignature(instantiate, name_visibility, instantiator);
+    return BuildSignature(kUserVisibleName);
   }
 
   // Returns true if the signature of this function is instantiated, i.e. if it
   // does not involve generic parameter types or generic result type.
-  bool HasInstantiatedSignature() const;
+  bool HasInstantiatedSignature(Genericity genericity = kAny,
+                                TrailPtr trail = NULL) const;
 
   // Build a string of the form 'T, {B b, C c}' representing the user
   // visible formal parameters of the function.
   RawString* UserVisibleFormalParameters() const;
 
   // Reloading support:
   void Reparent(const Class& new_cls) const;
   void ZeroEdgeCounters() const;
 
   RawClass* Owner() const;
@@ skipping 414 matching lines @@
   const char* ToQualifiedCString() 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.
   bool HasCompatibleParametersWith(const Function& other,
                                    Error* bound_error) const;
 
   // Returns true if the type of this function is a subtype of the type of
   // the other function.
-  bool IsSubtypeOf(const TypeArguments& type_arguments,
-                   const Function& other,
-                   const TypeArguments& other_type_arguments,
+  bool IsSubtypeOf(const Function& other,
                    Error* bound_error,
                    Heap::Space space) const {
-    return TypeTest(kIsSubtypeOf, type_arguments, other, other_type_arguments,
-                    bound_error, space);
+    return TypeTest(kIsSubtypeOf, other, bound_error, space);
   }
 
   // Returns true if the type of this function is more specific than the type of
   // the other function.
-  bool IsMoreSpecificThan(const TypeArguments& type_arguments,
-                          const Function& other,
-                          const TypeArguments& other_type_arguments,
+  bool IsMoreSpecificThan(const Function& other,
                           Error* bound_error,
                           Heap::Space space) const {
-    return TypeTest(kIsMoreSpecificThan, type_arguments, other,
-                    other_type_arguments, bound_error, space);
+    return TypeTest(kIsMoreSpecificThan, other, bound_error, space);
   }
 
   // Check the subtype or 'more specific' relationship.
   bool TypeTest(TypeTestKind test_kind,
-                const TypeArguments& type_arguments,
                 const Function& other,
-                const TypeArguments& other_type_arguments,
                 Error* bound_error,
                 Heap::Space space) const;
 
   bool IsDispatcherOrImplicitAccessor() const {
     switch (kind()) {
       case RawFunction::kImplicitGetter:
       case RawFunction::kImplicitSetter:
       case RawFunction::kNoSuchMethodDispatcher:
       case RawFunction::kInvokeFieldDispatcher:
         return true;
@@ skipping 122 matching lines @@
                           const Object& owner,
                           TokenPosition token_pos);
 
   // Allocates a new Function object representing a closure function.
   static RawFunction* NewClosureFunction(const String& name,
                                          const Function& parent,
                                          TokenPosition token_pos);
 
   // Allocates a new Function object representing a signature function.
   // The owner is the scope class of the function type.
-  static RawFunction* NewSignatureFunction(const Class& owner,
+  static RawFunction* NewSignatureFunction(const Object& owner,
                                            TokenPosition token_pos);
 
   static RawFunction* NewEvalFunction(const Class& owner,
                                       const Script& script,
                                       bool is_static);
 
   RawFunction* CreateMethodExtractor(const String& getter_name) const;
   RawFunction* GetMethodExtractor(const String& getter_name) const;
 
   // Allocate new function object, clone values from this function. The
@@ skipping 152 matching lines @@
   void set_kind_tag(uint32_t value) const;
   void set_data(const Object& value) const;
 
   static RawFunction* New();
 
   RawString* QualifiedName(NameVisibility name_visibility) const;
 
   void BuildSignatureParameters(
       Thread* thread,
       Zone* zone,
-      bool instantiate,
       NameVisibility name_visibility,
-      const TypeArguments& instantiator,
       GrowableHandlePtrArray<const String>* pieces) const;
-  RawString* BuildSignature(bool instantiate,
-                            NameVisibility name_visibility,
-                            const TypeArguments& instantiator) const;
+  RawString* BuildSignature(NameVisibility name_visibility) const;
 
   // Checks the type of the formal parameter at the given position for
   // subtyping or 'more specific' relationship between the type of this function
   // and the type of the other function.
   bool TestParameterType(TypeTestKind test_kind,
                          intptr_t parameter_position,
                          intptr_t other_parameter_position,
-                         const TypeArguments& type_arguments,
                          const Function& other,
-                         const TypeArguments& other_type_arguments,
                          Error* bound_error,
                          Heap::Space space) const;
 
   FINAL_HEAP_OBJECT_IMPLEMENTATION(Function, Object);
   friend class Class;
   friend class SnapshotWriter;
   friend class Parser;  // For set_eval_script.
   // RawFunction::VisitFunctionPointers accesses the private constructor of
   // Function.
   friend class RawFunction;
@@ skipping 2885 matching lines @@
   void set_type_class(const Class& value) const;
   void set_unresolved_class(const Object& value) const;
   virtual RawUnresolvedClass* unresolved_class() const;
   virtual RawTypeArguments* arguments() const { return raw_ptr()->arguments_; }
   virtual void set_arguments(const TypeArguments& value) const;
   virtual TokenPosition token_pos() const { return raw_ptr()->token_pos_; }
   virtual bool IsInstantiated(Genericity genericity = kAny,
                               TrailPtr trail = NULL) const;
   virtual bool IsEquivalent(const Instance& other, TrailPtr trail = NULL) const;
   virtual bool IsRecursive() const;
-  // If signature is not null, this type represents a function type.
+  // If signature is not null, this type represents a function type. Note that
+  // the signature fully represents the type and type arguments can be ignored.
+  // However, in case of a generic typedef, they document how the typedef class
+  // was parameterized to obtain the actual signature.
   RawFunction* signature() const;
   void set_signature(const Function& value) const;
   virtual bool IsFunctionType() const {
     return signature() != Function::null();
   }
   virtual RawAbstractType* InstantiateFrom(
       const TypeArguments& instantiator_type_arguments,
       Error* bound_error,
       TrailPtr instantiation_trail,
       TrailPtr bound_trail,
@@ skipping 3025 matching lines @@
 
 inline void TypeArguments::SetHash(intptr_t value) const {
   // This is only safe because we create a new Smi, which does not cause
   // heap allocation.
   StoreSmi(&raw_ptr()->hash_, Smi::New(value));
 }
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_OBJECT_H_