Print uninstantiated type with --trace_type_checks for instanceof (easier to identify what caused...

runtime/vm/code_generator.cc

Index: runtime/vm/code_generator.cc
===================================================================
--- runtime/vm/code_generator.cc	(revision 1669)
+++ runtime/vm/code_generator.cc	(working copy)
@@ -328,15 +328,21 @@
       Bool::True() : Bool::False());
   if (FLAG_trace_type_checks) {
     const Type& instance_type = Type::Handle(instance.GetType());
-    Type& instantiated_type = Type::Handle(type.raw());
-    if (!type.IsInstantiated()) {
+    if (type.IsInstantiated()) {
+      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.
-      instantiated_type = type.InstantiateFrom(type_instantiator, 0);
+      const Type& instantiated_type =
+          Type::Handle(type.InstantiateFrom(type_instantiator, 0));
+      OS::Print("InstanceOf: '%s' %s '%s (%s)'\n",

[regis, 2011/11/18 22:26:18]

Using parenthesis to display the uninstantiated type together with the
instantiated one may be confusing in the presence of function types. How about
adding a separate line showing the generic (non-instantiated) version of the
type?

[srdjan, 2011/11/18 22:49:55]

Changed to output of fromm:

InstanceOf: 'Smi' is ! 'A<int>' instantiated from 'A<T>'

+                String::Handle(instance_type.Name()).ToCString(),
+                (result.raw() == Bool::True()) ? "is" : "is !",
+                String::Handle(instantiated_type.Name()).ToCString(),
+                String::Handle(type.Name()).ToCString());
     }
-    OS::Print("InstanceOf: '%s' %s '%s'\n",
-              String::Handle(instance_type.Name()).ToCString(),
-              (result.raw() == Bool::True()) ? "is" : "is !",
-              String::Handle(instantiated_type.Name()).ToCString());
   }
   arguments.SetReturn(result);
 }