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

runtime/lib/object.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/bootstrap_natives.h"
 
 #include "vm/exceptions.h"
 #include "vm/heap.h"
 #include "vm/native_entry.h"
 #include "vm/object.h"
 #include "vm/stack_frame.h"
 #include "vm/symbols.h"
 
 namespace dart {
 
 DECLARE_FLAG(bool, enable_type_checks);
+DECLARE_FLAG(bool, trace_type_checks);
 
 
 DEFINE_NATIVE_ENTRY(Object_cid, 1) {
   const Instance& instance = Instance::CheckedHandle(arguments->NativeArgAt(0));
   return Smi::New(instance.GetClassId());
 }
 
 
 DEFINE_NATIVE_ENTRY(Object_getHash, 1) {
   const Instance& instance = Instance::CheckedHandle(arguments->NativeArgAt(0));
@@ skipping 93 matching lines @@
     StackFrame* caller_frame = iterator.NextFrame();
     ASSERT(caller_frame != NULL);
     const intptr_t location = caller_frame->GetTokenPos();
     String& malformed_error_message = String::Handle(
         String::New(malformed_error.ToErrorCString()));
     Exceptions::CreateAndThrowTypeError(
         location, Symbols::Empty(), Symbols::Empty(),
         Symbols::Empty(), malformed_error_message);
     UNREACHABLE();
   }
+
+  if (FLAG_trace_type_checks) {
+    const char* result_str = is_instance_of ? "true" : "false";
+    OS::Print("Object.instanceOf: result %s\n", result_str);
+    const Class& instance_class = Class::Handle(instance.clazz());
+    OS::Print("  instance  [class: %s]\n",
+        String::Handle(instance_class.Name()).ToCString());
+    OS::Print("  test-type [class: %s]\n",
+        String::Handle(Class::Handle(type.type_class()).Name()).ToCString());
+    OS::Print("  type-args %s\n", instantiator_type_arguments.ToCString());
+  }
   return Bool::Get(negate.value() ? !is_instance_of : is_instance_of);
 }
 
 
 DEFINE_NATIVE_ENTRY(Object_as, 4) {
   const Instance& instance = Instance::CheckedHandle(arguments->NativeArgAt(0));
   // Instantiator at position 1 is not used. It is passed along so that the call
   // can be easily converted to an optimized implementation. Instantiator is
   // used to populate the subtype cache.
   const AbstractTypeArguments& instantiator_type_arguments =
@@ skipping 49 matching lines @@
 }
 
 
 DEFINE_NATIVE_ENTRY(AbstractType_toString, 1) {
   const AbstractType& type =
       AbstractType::CheckedHandle(arguments->NativeArgAt(0));
   return type.UserVisibleName();
 }
 
 }  // namespace dart