Better fix for printing (after discussing it with Ivan and Regis)

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 2191 matching lines @@
 void ParameterizedType::set_type_state(int8_t state) const {
   ASSERT(state == RawParameterizedType::kAllocated ||
          state == RawParameterizedType::kBeingFinalized ||
          state == RawParameterizedType::kFinalized);
   raw_ptr()->type_state_ = state;
 }
 
 
 const char* ParameterizedType::ToCString() const {
   if (IsResolved()) {
-    const char* format = "ParameterizedType: class '%s', args:[%s]";
-    const char* class_name =
-        String::Handle(Class::Handle(type_class()).Name()).ToCString();
-    const char* args_cstr = TypeArguments::Handle(arguments()).ToCString();
-    intptr_t len = OS::SNPrint(NULL, 0, format, class_name, args_cstr) + 1;
-    char* chars = reinterpret_cast<char*>(
-        Isolate::Current()->current_zone()->Allocate(len));
-    OS::SNPrint(chars, len, format, class_name, args_cstr);
-    return chars;
+    const TypeArguments& type_arguments = TypeArguments::Handle(arguments());
+    if (type_arguments.IsNull()) {
+      const char* format = "ParameterizedType: class '%s'";
+      const char* class_name =
+          String::Handle(Class::Handle(type_class()).Name()).ToCString();
+      intptr_t len = OS::SNPrint(NULL, 0, format, class_name) + 1;
+      char* chars = reinterpret_cast<char*>(
+          Isolate::Current()->current_zone()->Allocate(len));
+      OS::SNPrint(chars, len, format, class_name);
+      return chars;
+    } else {
+      const char* format = "ParameterizedType: class '%s', args:[%s]";
+      const char* class_name =
+          String::Handle(Class::Handle(type_class()).Name()).ToCString();
+      const char* args_cstr = TypeArguments::Handle(arguments()).ToCString();
+      intptr_t len = OS::SNPrint(NULL, 0, format, class_name, args_cstr) + 1;
+      char* chars = reinterpret_cast<char*>(
+          Isolate::Current()->current_zone()->Allocate(len));
+      OS::SNPrint(chars, len, format, class_name, args_cstr);
+      return chars;
+    }
   } else {
     return "Unresolved ParameterizedType";
   }
 }
 
 
 bool TypeParameter::Equals(const Type& other) const {
   if (raw() == other.raw()) {
     return true;
   }
@@ skipping 225 matching lines @@
 
 RawTypeArguments* TypeArguments::NewInstantiatedTypeArguments(
     const TypeArguments& uninstantiated_type_arguments,
     const TypeArguments& instantiator_type_arguments) {
   return InstantiatedTypeArguments::New(uninstantiated_type_arguments,
                                         instantiator_type_arguments);
 }
 
 
 const char* TypeArguments::ToCString() const {
   // TypeArguments is an abstract class, however it may wrap a null.

[regis, 2011/11/30 22:53:29]

You can remove ", however it may wrap a null".

[srdjan, 2011/11/30 22:55:55]

Done.

-  if (IsNull()) {
-    return "NULL TypeArguments";
-  }
   UNREACHABLE();
   return "TypeArguments";
 }
 
 
 intptr_t TypeArray::Length() const {
   ASSERT(!IsNull());
   return Smi::Value(raw_ptr()->length_);
 }
 
@@ skipping 4780 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