Second attempt at finalizing all classes in the VM (fix issue 364).

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 181 matching lines @@
   ASSERT(arguments.Count() == kTypeCheckRuntimeEntry.argument_count());
   intptr_t location = Smi::CheckedHandle(arguments.At(0)).Value();
   const Instance& src_instance = Instance::CheckedHandle(arguments.At(1));
   const Type& dst_type = Type::CheckedHandle(arguments.At(2));
   const TypeArguments& dst_type_instantiator =
       TypeArguments::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.
 
-  if (!src_instance.IsAssignableTo(dst_type, dst_type_instantiator)) {
+  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());
+    Type& instantiated_dst_type = Type::Handle(dst_type.raw());
+    if (!dst_type.IsInstantiated()) {
+      // Instantiate dst_type before printing.
+      instantiated_dst_type =
+          dst_type.InstantiateFrom(dst_type_instantiator, 0);
+    }
+    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 Type& instantiated_dst_type = Type::Handle(
           dst_type.InstantiateFrom(dst_type_instantiator, 0));
       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();
   }
-
-  if (FLAG_trace_type_checks) {
-    Class& cls = Class::Handle(src_instance.clazz());
-    // TODO(regis): Remove once all classes finalized.
-    if (cls.is_finalized())  {
-      OS::Print("TypeCheck '%s' vs '%s'\n",
-          String::Handle(Type::Handle(src_instance.GetType()).Name()).
-              ToCString(),
-          String::Handle(dst_type.Name()).ToCString());
-    }
-  }
   arguments.SetReturn(src_instance);
 }
 
 
 // Report that the type of the given object is not bool in conditional context.
 // Arg0: index of the token of the assignment (source location).
 // Arg1: bad object.
 // Return value: none, throws a TypeError.
 DEFINE_RUNTIME_ENTRY(ConditionTypeError, 2) {
   ASSERT(arguments.Count() ==
@@ skipping 53 matching lines @@
         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