Make sure declared upper bounds are resolved when finalizing a type containing a

runtime/vm/class_finalizer.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/class_finalizer.h"
 
 #include "vm/code_generator.h"
 #include "vm/flags.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
@@ skipping 492 matching lines @@
       type_argument = arguments.TypeAt(i);
       ResolveType(cls, type_argument);
     }
   }
 }
 
 
 void ClassFinalizer::FinalizeTypeParameters(
     const Class& cls,
     GrowableObjectArray* pending_types) {
+  if (FLAG_trace_type_finalization) {
+    OS::Print("Finalizing type parameters of '%s'\n",
+              String::Handle(cls.Name()).ToCString());
+  }
   if (cls.IsMixinApplication()) {
     // Setup the type parameters of the mixin application and finalize the
     // mixin type.
     ApplyMixinType(cls, pending_types);
   }
   // The type parameter bounds are not finalized here.
   const TypeArguments& type_parameters =
       TypeArguments::Handle(cls.type_parameters());
   if (!type_parameters.IsNull()) {
     TypeParameter& type_parameter = TypeParameter::Handle();
@@ skipping 287 matching lines @@
         // each other via their bounds.
         type_arg = BoundedType::New(type_arg, instantiated_bound, type_param);
         arguments.SetTypeAt(offset + i, type_arg);
         continue;
       }
       // Shortcut the special case where we check a type parameter against its
       // declared upper bound.
       if (error.IsNull() &&
           !(type_arg.Equals(type_param) &&
             instantiated_bound.Equals(declared_bound))) {
+        // If type_arg is a type parameter, its declared bound may not be
+        // resolved yet.
+        if (type_arg.IsTypeParameter()) {
+          const Class& type_arg_cls = Class::Handle(
+              TypeParameter::Cast(type_arg).parameterized_class());
+          const AbstractType& bound = AbstractType::Handle(
+              TypeParameter::Cast(type_arg).bound());
+          ResolveType(type_arg_cls, bound);
+        }
         if (!type_param.CheckBound(type_arg, instantiated_bound, &error) &&
             error.IsNull()) {
           // The bound cannot be checked at compile time; postpone to run time.
           type_arg = BoundedType::New(type_arg, instantiated_bound, type_param);
           arguments.SetTypeAt(offset + i, type_arg);
         }
       }
       if (!error.IsNull() && bound_error->IsNull()) {
         *bound_error = error.raw();
       }
@@ skipping 2329 matching lines @@
   ASSERT(fields_array.Length() == ByteBuffer::NumberOfFields());
   field ^= fields_array.At(0);
   ASSERT(field.Offset() == ByteBuffer::data_offset());
   name ^= field.name();
   expected_name ^= String::New("_data");
   ASSERT(String::EqualsIgnoringPrivateKey(name, expected_name));
 #endif
 }
 
 }  // namespace dart