Do not skip unfinalized interfaces while checking type bounds at finalization

runtime/vm/object.cc

 // Copyright (c) 2012, 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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 2827 matching lines @@
     // Check for 'direct super type' specified in the implements clause
     // and check for transitivity at the same time.
     Array& interfaces = Array::Handle(thsi.interfaces());
     AbstractType& interface = AbstractType::Handle();
     Class& interface_class = Class::Handle();
     AbstractTypeArguments& interface_args = AbstractTypeArguments::Handle();
     Error& error = Error::Handle();
     for (intptr_t i = 0; i < interfaces.Length(); i++) {
       interface ^= interfaces.At(i);
       if (!interface.IsFinalized()) {
-        // We may be checking bounds at finalization time. Skipping this
-        // unfinalized interface will postpone bound checking to run time.
-        continue;
+        // We may be checking bounds at finalization time and can encounter
+        // a still unfinalized interface.
+        ClassFinalizer::FinalizeType(
+            thsi, interface, ClassFinalizer::kCanonicalize);

[hausner, 2013/11/13 20:51:46]

This name threw me off, but I see it's not introduced by your change.

[regis, 2013/11/13 20:58:02]

Ivan promised to fix it :-)

+        interfaces.SetAt(i, interface);
       }
       error = Error::null();
       if (interface.IsMalboundedWithError(&error)) {
         // Return the first bound error to the caller if it requests it.
         if ((bound_error != NULL) && bound_error->IsNull()) {
           ASSERT(!error.IsNull());
           *bound_error = error.raw();
         }
         continue;  // Another interface may work better.
       }
@@ skipping 9519 matching lines @@
   const BoundedType& result = BoundedType::Handle(BoundedType::New());
   result.set_type(type);
   result.set_bound(bound);
   result.set_type_parameter(type_parameter);
   result.set_is_being_checked(false);
   return result.raw();
 }
 
 
 const char* BoundedType::ToCString() const {
-  const char* format = "BoundedType: type %s; bound: %s; type param: %s of %s";
+  const char* format = "BoundedType: type %s; bound: %s; type param: %s%s%s";
   const char* type_cstr = String::Handle(AbstractType::Handle(
       type()).Name()).ToCString();
   const char* bound_cstr = String::Handle(AbstractType::Handle(
       bound()).Name()).ToCString();
-  const char* type_param_cstr = String::Handle(TypeParameter::Handle(
-      type_parameter()).name()).ToCString();
-  const Class& cls = Class::Handle(TypeParameter::Handle(
-      type_parameter()).parameterized_class());
-  const char* cls_cstr =
-      cls.IsNull() ? " null" : String::Handle(cls.Name()).ToCString();
-  intptr_t len = OS::SNPrint(
-      NULL, 0, format, type_cstr, bound_cstr, type_param_cstr, cls_cstr) + 1;
+  const TypeParameter& type_param = TypeParameter::Handle(type_parameter());
+  const char* type_param_cstr = "null";
+  const char* of_cstr = "";
+  const char* cls_cstr = "";
+  if (!type_param.IsNull()) {
+    type_param_cstr = String::Handle(type_param.name()).ToCString();
+    const Class& cls = Class::Handle(type_param.parameterized_class());
+    if (!cls.IsNull()) {
+      of_cstr = " of ";
+      cls_cstr = String::Handle(cls.Name()).ToCString();
+    }
+  }
+  intptr_t len = OS::SNPrint(NULL, 0, format, type_cstr, bound_cstr,
+                             type_param_cstr, of_cstr, cls_cstr) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
-  OS::SNPrint(
-      chars, len, format, type_cstr, bound_cstr, type_param_cstr, cls_cstr);
+  OS::SNPrint(chars, len, format, type_cstr, bound_cstr, type_param_cstr,
+              of_cstr, cls_cstr);
   return chars;
 }
 
 
 void BoundedType::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 }
 
 
 intptr_t MixinAppType::token_pos() const {
@@ skipping 3348 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 }
 
 
 }  // namespace dart