Retrying r10475 (now with null check):

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/intermediate_language.h"
 #include "vm/os.h"
 #include "vm/parser.h"
 
@@ skipping 73 matching lines @@
 
 
 void FlowGraphPrinter::PrintTypeCheck(const ParsedFunction& parsed_function,
                                       intptr_t token_pos,
                                       Value* value,
                                       const AbstractType& dst_type,
                                       const String& dst_name,
                                       bool eliminated) {
     const Class& cls = Class::Handle(parsed_function.function().owner());
     const Script& script = Script::Handle(cls.script());
-    const char* static_type_name = "unknown";
+    const char* compile_type_name = "unknown";
     if (value != NULL) {
-      const AbstractType& type = AbstractType::Handle(value->StaticType());
-      static_type_name = String::Handle(type.UserVisibleName()).ToCString();
+      const AbstractType& type = AbstractType::Handle(value->CompileType());
+      if (!type.IsNull()) {
+        compile_type_name = String::Handle(type.UserVisibleName()).ToCString();
+      }
     }
     Parser::PrintMessage(script, token_pos, "",
-                         "%s type check: static type '%s' is %s specific than "
+                         "%s type check: compile type '%s' is %s specific than "
                          "type '%s' of '%s'.",
                          eliminated ? "Eliminated" : "Generated",
-                         static_type_name,
+                         compile_type_name,
                          eliminated ? "more" : "not more",
                          String::Handle(dst_type.UserVisibleName()).ToCString(),
                          dst_name.ToCString());
 }
 
 
 static void PrintICData(BufferFormatter* f, const ICData& ic_data) {
   f->Print(" IC[%d: ", ic_data.NumberOfChecks());
   Function& target = Function::Handle();
   for (intptr_t i = 0; i < ic_data.NumberOfChecks(); i++) {
@@ skipping 42 matching lines @@
 }
 
 
 void ConstantVal::PrintTo(BufferFormatter* f) const {
   f->Print("#%s", value().ToCString());
 }
 
 
 void AssertAssignableComp::PrintOperandsTo(BufferFormatter* f) const {
   value()->PrintTo(f);
-  f->Print(", %s, '%s'",
-            String::Handle(dst_type().Name()).ToCString(),
-            dst_name().ToCString());
+  f->Print(", %s, '%s'%s",
+           String::Handle(dst_type().Name()).ToCString(),
+           dst_name().ToCString(),
+           IsEliminated() ? " eliminated" : "");
   f->Print(" instantiator(");
   instantiator()->PrintTo(f);
   f->Print(")");
   f->Print(" instantiator_type_arguments(");
   instantiator_type_arguments()->PrintTo(f);
   f->Print(")");
 }
 
 
 void ClosureCallComp::PrintOperandsTo(BufferFormatter* f) const {
@@ skipping 601 matching lines @@
         !locations_[i].IsInvalid()) {
       f->Print(" [");
       locations_[i].PrintTo(f);
       f->Print("]");
     }
   }
   f->Print(" }");
 }
 
 }  // namespace dart