Cleanup printing of propagated types to make it easier to read.

runtime/vm/il_printer.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/il_printer.h"
 
 #include "vm/flow_graph_range_analysis.h"
 #include "vm/intermediate_language.h"
 #include "vm/os.h"
 #include "vm/parser.h"
@@ skipping 94 matching lines @@
               "type '%s' of '%s'.\n",
                          eliminated ? "Eliminated" : "Generated",
                          compile_type_name,
                          eliminated ? "more" : "not more",
                          String::Handle(dst_type.Name()).ToCString(),
                          dst_name.ToCString());
 }
 
 
 void CompileType::PrintTo(BufferFormatter* f) const {
-  f->Print("T{");
-  f->Print("%s, ", is_nullable_ ? "null" : "not-null");
-  if (cid_ != kIllegalCid) {
+  const char* type_name = "?";
+  if ((cid_ != kIllegalCid) &&

[Florian Schneider, 2014/09/11 13:30:24]

Fits one line?

[Vyacheslav Egorov (Google), 2014/09/11 13:36:42]

Done.

+      (cid_ != kDynamicCid)) {
     const Class& cls =
       Class::Handle(Isolate::Current()->class_table()->At(cid_));
-    f->Print("%s, ", String::Handle(cls.Name()).ToCString());
-  } else {
-    f->Print("?, ");
+    type_name = String::Handle(cls.PrettyName()).ToCString();
+  } else if (type_ != NULL &&

[Florian Schneider, 2014/09/11 13:30:24]

Maybe move indentation until (

[Vyacheslav Egorov (Google), 2014/09/11 13:36:42]

Done.

+      !type_->Equals(Type::Handle(Type::DynamicType()))) {
+    type_name = type_->ToCString();
+  } else if (!is_nullable()) {
+    type_name = "!null";
   }
-  f->Print("%s}", (type_ != NULL) ? type_->ToCString() : "?");
+
+  f->Print("T{%s%s}", type_name, is_nullable_ ? "?" : "");
 }
 
 
 const char* CompileType::ToCString() const {
   char buffer[1024];
   BufferFormatter f(buffer, sizeof(buffer));
   PrintTo(&f);
   return Isolate::Current()->current_zone()->MakeCopyOfString(buffer);
 }
 
@@ skipping 81 matching lines @@
   } else {
     f->Print("%s(", DebugName());
   }
   PrintOperandsTo(f);
   f->Print(")");
   if (range_ != NULL) {
     f->Print(" ");
     range_->PrintTo(f);
   }
 
-  if (type_ != NULL) {
+  if (type_ != NULL &&
+      ((type_->ToNullableCid() != kDynamicCid) ||

[Florian Schneider, 2014/09/11 13:30:24]

Fits one line?

[Vyacheslav Egorov (Google), 2014/09/11 13:36:42]

Done.

+       !type_->is_nullable())) {
     f->Print(" ");
     type_->PrintTo(f);
   }
 }
 
 
 void Definition::PrintOperandsTo(BufferFormatter* f) const {
   for (int i = 0; i < InputCount(); ++i) {
     if (i > 0) f->Print(", ");
     if (InputAt(i) != NULL) {
@@ skipping 929 matching lines @@
 }
 
 const char* Environment::ToCString() const {
   char buffer[1024];
   BufferFormatter bf(buffer, 1024);
   PrintTo(&bf);
   return Isolate::Current()->current_zone()->MakeCopyOfString(buffer);
 }
 
 }  // namespace dart