Remove instantiator argument in generated code for type tests.

runtime/lib/object.cc

 // 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.
 
 #include "vm/bootstrap_natives.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/code_patcher.h"
 #include "vm/exceptions.h"
 #include "vm/heap.h"
@@ skipping 137 matching lines @@
     ASSERT(instance_is_int);
     if (instantiated_type.IsDoubleType()) {
       Report::JSWarningFromNative(
           false,  // Object_instanceOf and Object_as are not static calls.
           "integer value is also considered to be of type 'double'");
     }
   }
 }
 
 
-DEFINE_NATIVE_ENTRY(Object_instanceOf, 5) {
+DEFINE_NATIVE_ENTRY(Object_instanceOf, 4) {
   const Instance& instance =
       Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
-  // Instantiator at position 1 is not used. It is passed along so that the call
-  // can be easily converted to an optimized implementation. Instantiator is
-  // used to populate the subtype cache.
   const TypeArguments& instantiator_type_arguments =
-      TypeArguments::CheckedHandle(zone, arguments->NativeArgAt(2));
+      TypeArguments::CheckedHandle(zone, arguments->NativeArgAt(1));
   const AbstractType& type =
-      AbstractType::CheckedHandle(zone, arguments->NativeArgAt(3));
-  const Bool& negate = Bool::CheckedHandle(zone, arguments->NativeArgAt(4));
+      AbstractType::CheckedHandle(zone, arguments->NativeArgAt(2));
+  const Bool& negate = Bool::CheckedHandle(zone, arguments->NativeArgAt(3));
   ASSERT(type.IsFinalized());
   ASSERT(!type.IsMalformed());
   ASSERT(!type.IsMalbounded());
 
   // Check for javascript compatibility.
   if (FLAG_warn_on_javascript_compatibility) {
     WarnOnJSIntegralNumTypeTest(instance, instantiator_type_arguments, type);
   }
 
   Error& bound_error = Error::Handle(zone, Error::null());
@@ skipping 81 matching lines @@
       Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
   const Bool& negate = Bool::CheckedHandle(zone, arguments->NativeArgAt(1));
   bool is_instance_of = instance.IsString();
   if (negate.value()) {
     is_instance_of = !is_instance_of;
   }
   return Bool::Get(is_instance_of).raw();
 }
 
 
-DEFINE_NATIVE_ENTRY(Object_as, 4) {
+DEFINE_NATIVE_ENTRY(Object_as, 3) {
   const Instance& instance = Instance::CheckedHandle(arguments->NativeArgAt(0));
-  // Instantiator at position 1 is not used. It is passed along so that the call
-  // can be easily converted to an optimized implementation. Instantiator is
-  // used to populate the subtype cache.
   const TypeArguments& instantiator_type_arguments =
-      TypeArguments::CheckedHandle(arguments->NativeArgAt(2));
+      TypeArguments::CheckedHandle(arguments->NativeArgAt(1));
   const AbstractType& type =
-      AbstractType::CheckedHandle(arguments->NativeArgAt(3));
+      AbstractType::CheckedHandle(arguments->NativeArgAt(2));
   ASSERT(type.IsFinalized());
   ASSERT(!type.IsMalformed());
   ASSERT(!type.IsMalbounded());
   Error& bound_error = Error::Handle();
   if (instance.IsNull()) {
     return instance.raw();
   }
 
   // Check for javascript compatibility.
   if (FLAG_warn_on_javascript_compatibility) {
@@ skipping 98 matching lines @@
 
 DEFINE_NATIVE_ENTRY(Internal_inquireIs64Bit, 0) {
 #if defined(ARCH_IS_64_BIT)
   return Bool::True().raw();
 #else
   return Bool::False().raw();
 #endif  // defined(ARCH_IS_64_BIT)
 }
 
 }  // namespace dart