Fix issue 235.

runtime/vm/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/object.h"
 
 #include "vm/assembler.h"
 #include "vm/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 1627 matching lines @@
 RawType* Type::InstantiateFrom(
     const TypeArguments& instantiator_type_arguments,
     intptr_t offset) const {
   // Type is an abstract class.
   UNREACHABLE();
   return Type::null();
 }
 
 
 RawString* Type::Name() const {
+  // If the type is still being finalized, we may be reporting an error about
+  // an illformed type, so proceed with caution.
   const TypeArguments& args = TypeArguments::Handle(arguments());
   const intptr_t num_args = args.IsNull() ? 0 : args.Length();
   String& class_name = String::Handle();
   intptr_t first_type_param_index;
   intptr_t num_type_params;  // Number of type parameters to print.
   if (HasResolvedTypeClass()) {
     const Class& cls = Class::Handle(type_class());
     class_name = cls.Name();
     num_type_params = cls.NumTypeParameters();  // Do not print the full vector.
     if (num_type_params > num_args) {
-      ASSERT(num_args == 0);  // Type is raw.
-      // We fill up with "var".
       first_type_param_index = 0;
+      if (IsBeingFinalized()) {
+        // Most probably an illformed type. Do not fill up with "var".
+        num_type_params = num_args;
+      } else {
+        ASSERT(num_args == 0);  // Type is raw.
+        // We fill up with "var".
+      }
     } else {
       first_type_param_index = num_args - num_type_params;
     }
     if (cls.IsSignatureClass()) {
-      const Function& signature_function = Function::Handle(
-          cls.signature_function());
       // We may be reporting an error about an illformed function type. In that
       // case, avoid instantiating the signature, since it may lead to cycles.
       if (IsBeingFinalized()) {
         return class_name.raw();
       }
+      const Function& signature_function = Function::Handle(
+          cls.signature_function());
       return signature_function.InstantiatedSignatureFrom(
           args, first_type_param_index);
     }
   } else {
-    const UnresolvedClass& type = UnresolvedClass::Handle(unresolved_class());
-    class_name = type.Name();
+    const UnresolvedClass& cls = UnresolvedClass::Handle(unresolved_class());
+    class_name = cls.Name();
     num_type_params = num_args;
     first_type_param_index = 0;
   }
   String& type_name = String::Handle();
   if (num_type_params == 0) {
     type_name = class_name.raw();
   } else {
     const intptr_t num_strings = 2*num_type_params + 2;  // "C""<""T"", ""T"">".
     const Array& strings = Array::Handle(Array::New(num_strings));
     intptr_t s = 0;
@@ skipping 5103 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart