Adjust index of type parameters at finalization time (fix issue 718).

runtime/vm/code_generator.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/code_generator.h"
 
 #include "vm/code_index_table.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
@@ skipping 311 matching lines @@
   const AbstractTypeArguments& type_instantiator =
       AbstractTypeArguments::CheckedHandle(arguments.At(2));
   ASSERT(type.IsFinalized());
   const Bool& result = Bool::Handle(
       instance.IsInstanceOf(type, type_instantiator) ?
       Bool::True() : Bool::False());
   if (FLAG_trace_type_checks) {
     const Type& instance_type = Type::Handle(instance.GetType());
     ASSERT(instance_type.IsInstantiated());
     if (type.IsInstantiated()) {
-      OS::Print("InstanceOf: '%s' %s '%s'\n",
+      OS::Print("InstanceOf: '%s' %s '%s'.\n",
                 String::Handle(instance_type.Name()).ToCString(),
                 (result.raw() == Bool::True()) ? "is" : "is !",
                 String::Handle(type.Name()).ToCString());
     } else {
       // Instantiate type before printing.
       const AbstractType& instantiated_type =
-          AbstractType::Handle(type.InstantiateFrom(type_instantiator, 0));
-      OS::Print("InstanceOf: '%s' %s '%s' instantiated from '%s'\n",
+          AbstractType::Handle(type.InstantiateFrom(type_instantiator));
+      OS::Print("InstanceOf: '%s' %s '%s' instantiated from '%s'.\n",
                 String::Handle(instance_type.Name()).ToCString(),
                 (result.raw() == Bool::True()) ? "is" : "is !",
                 String::Handle(instantiated_type.Name()).ToCString(),
                 String::Handle(type.Name()).ToCString());
     }
   }
   arguments.SetReturn(result);
 }
 
 
@@ skipping 687 matching lines @@
       }
     }
   }
   // The cache is null terminated, therefore the loop above should never
   // terminate by itself.
   UNREACHABLE();
   return Code::null();
 }
 
 }  // namespace dart