Fix type test elimination of function types using static type propagation in

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 1450 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;
+                   Error* malformed_error) const {
+    return TypeTest(kIsSubtypeOf,
+                    type_arguments,
+                    other,
+                    other_type_arguments,
+                    malformed_error);
+  }
+
+  // Returns true if the type of this function is more specific than the type of
+  // the other function.
+  bool IsMoreSpecificThan(const AbstractTypeArguments& type_arguments,
+                          const Function& other,
+                          const AbstractTypeArguments& other_type_arguments,
+                          Error* malformed_error) const {
+    return TypeTest(kIsMoreSpecificThan,
+                    type_arguments,
+                    other,
+                    other_type_arguments,
+                    malformed_error);
+  }
 
   // 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;
 
+  // Check the subtype or 'more specific' relationship.
+  bool TypeTest(TypeTestKind test_kind,
+                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;
+  // 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,
+                         const AbstractTypeArguments& type_arguments,
+                         const Function& other,
+                         const AbstractTypeArguments& other_type_arguments,
+                         Error* malformed_error) 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 3482 matching lines @@
 }
 
 
 intptr_t Stackmap::SizeInBits() const {
   return (Smi::Value(raw_ptr()->bitmap_size_in_bytes_) * kBitsPerByte);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_