Fix wrong type test optimization when testing against a signature class: we must always consider th…

runtime/vm/code_generator.cc

 // Copyright (c) 2013, 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/assembler.h"
 #include "vm/ast.h"
 #include "vm/bigint_operations.h"
 #include "vm/code_patcher.h"
@@ skipping 515 matching lines @@
                        result);
   }
   if (FLAG_trace_type_checks) {
     AbstractType& test_type = AbstractType::Handle(type.raw());
     if (!test_type.IsInstantiated()) {
       Error& malformed_error = Error::Handle();
       test_type = type.InstantiateFrom(instantiator_type_arguments,
                                        &malformed_error);
       ASSERT(malformed_error.IsNull());  // Malformed types are not optimized.
     }
-    OS::PrintErr("  Updated test cache %p ix: %"Pd" with (%"Pd", %p, %p, %s)\n"
-        "    [%p %s %"Pd", %p %s]\n"
-        "    [%p %s %"Pd", %p %s] %s\n",
+    OS::PrintErr("  Updated test cache %p ix: %"Pd" with "
+        "(cid: %"Pd", type-args: %p, instantiator: %p, result: %s)\n"
+        "    instance  [class: (%p '%s' cid: %"Pd"),    type-args: %p %s]\n"
+        "    test-type [class: (%p '%s' cid: %"Pd"), in-type-args: %p %s]\n",
         new_cache.raw(),
         len,
+
         instance_class.id(),
-
         instance_type_arguments.raw(),
         instantiator_type_arguments.raw(),
         result.ToCString(),
 
         instance_class.raw(),
-        instance_class.ToCString(),
+        String::Handle(instance_class.Name()).ToCString(),
         instance_class.id(),
         instance_type_arguments.raw(),
         instance_type_arguments.ToCString(),
 
         test_type.type_class(),
-        Class::Handle(test_type.type_class()).ToCString(),
+        String::Handle(Class::Handle(test_type.type_class()).Name()).
+            ToCString(),
         Class::Handle(test_type.type_class()).id(),
         instantiator_type_arguments.raw(),
-        instantiator_type_arguments.ToCString(),
-        result.ToCString());
+        instantiator_type_arguments.ToCString());
   }
 }
 
 
 // Check that the given instance is an instance of the given type.
 // Tested instance may not be null, because the null test is inlined.
 // Arg0: instance being checked.
 // Arg1: type.
 // Arg2: instantiator (or null).
 // Arg3: type arguments of the instantiator of the type.
@@ skipping 1300 matching lines @@
 //   Arg1: Value that is being stored.
 DEFINE_RUNTIME_ENTRY(UpdateFieldCid, 2) {
   ASSERT(arguments.ArgCount() == kUpdateFieldCidRuntimeEntry.argument_count());
   const Field& field = Field::CheckedHandle(arguments.ArgAt(0));
   const Object& value = Object::Handle(arguments.ArgAt(1));
 
   field.UpdateCid(value.GetClassId());
 }
 
 }  // namespace dart