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

runtime/lib/error.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 "lib/error.h"
 
 #include "vm/bootstrap_natives.h"
 #include "vm/exceptions.h"
 #include "vm/object_store.h"
 #include "vm/runtime_entry.h"
@@ skipping 208 matching lines @@
       AbstractTypeArguments::CheckedHandle(arguments.At(3));
   const String& dst_name = String::CheckedHandle(arguments.At(4));
   ASSERT(!dst_type.IsDynamicType());  // No need to check assignment.
   ASSERT(!src_instance.IsNull());  // Already checked in inlined code.
 
   const bool is_assignable =
       src_instance.IsAssignableTo(dst_type, dst_type_instantiator);
 
   if (FLAG_trace_type_checks) {
     const Type& src_type = Type::Handle(src_instance.GetType());
-    AbstractType& instantiated_dst_type = AbstractType::Handle(dst_type.raw());
-    if (!dst_type.IsInstantiated()) {
+    if (dst_type.IsInstantiated()) {
+      OS::Print("TypeCheck: '%s' %s assignable to '%s' of '%s'.\n",
+                String::Handle(src_type.Name()).ToCString(),
+                is_assignable ? "is" : "is not",
+                String::Handle(dst_type.Name()).ToCString(),
+                dst_name.ToCString());
+    } else {
       // Instantiate dst_type before printing.
-      instantiated_dst_type =
-          dst_type.InstantiateFrom(dst_type_instantiator, 0);
+      const AbstractType& instantiated_dst_type = AbstractType::Handle(
+          dst_type.InstantiateFrom(dst_type_instantiator));
+      OS::Print("TypeCheck: '%s' %s assignable to '%s' of '%s' "
+                "instantiated from '%s'.\n",
+                String::Handle(src_type.Name()).ToCString(),
+                is_assignable ? "is" : "is not",
+                String::Handle(instantiated_dst_type.Name()).ToCString(),
+                dst_name.ToCString(),
+                String::Handle(dst_type.Name()).ToCString());
     }
-    OS::Print("TypeCheck: '%s' %s assignable to '%s'.\n",
-              String::Handle(src_type.Name()).ToCString(),
-              is_assignable ? "is" : "is not",
-              String::Handle(dst_type.Name()).ToCString());
   }
   if (!is_assignable) {
     const Type& src_type = Type::Handle(src_instance.GetType());
     const String& src_type_name = String::Handle(src_type.Name());
     String& dst_type_name = String::Handle();
     if (!dst_type.IsInstantiated()) {
       // Instantiate dst_type before reporting the error.
       const AbstractType& instantiated_dst_type = AbstractType::Handle(
-          dst_type.InstantiateFrom(dst_type_instantiator, 0));
+          dst_type.InstantiateFrom(dst_type_instantiator));
       dst_type_name = instantiated_dst_type.Name();
     } else {
       dst_type_name = dst_type.Name();
     }
     ThrowTypeError(location, src_type_name, dst_type_name, dst_name);
     UNREACHABLE();
   }
   arguments.SetReturn(src_instance);
 }
 
@@ skipping 48 matching lines @@
       // Allocate and throw a new instance of TypeError.
       char buf[256];
       OS::SNPrint(buf, sizeof(buf), "%s[%d]",
                   rest_name.ToCString(), static_cast<int>(i));
       const String& src_type_name =
           String::Handle(Type::Handle(elem.GetType()).Name());
       String& dst_type_name = String::Handle();
       if (!element_type.IsInstantiated()) {
         // Instantiate element_type before reporting the error.
         const AbstractType& instantiated_element_type = AbstractType::Handle(
-            element_type.InstantiateFrom(element_type_instantiator, 0));
+            element_type.InstantiateFrom(element_type_instantiator));
         dst_type_name = instantiated_element_type.Name();
       } else {
         dst_type_name = element_type.Name();
       }
       const String& dst_name = String::Handle(String::New(buf));
       ThrowTypeError(location, src_type_name, dst_type_name, dst_name);
       UNREACHABLE();
     }
   }
 }
 
 }  // namespace dart