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

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 310 matching lines @@
   const Type& type = Type::CheckedHandle(arguments.At(1));
   const TypeArguments& type_instantiator =
       TypeArguments::CheckedHandle(arguments.At(2));
   ASSERT(type.IsFinalized());
   ASSERT(!instance.IsNull());
   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());
-    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);
 }
 
 
 DEFINE_RUNTIME_ENTRY(Throw, 1) {
   ASSERT(arguments.Count() == kThrowRuntimeEntry.argument_count());
   const Instance& exception = Instance::CheckedHandle(arguments.At(0));
   Exceptions::Throw(exception);
 }
@@ skipping 657 matching lines @@
       }
     }
   }
   // The cache is null terminated, therefore the loop above should never
   // terminate by itself.
   UNREACHABLE();
   return Code::null();
 }
 
 }  // namespace dart