Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1657)

Unified Diff: runtime/vm/il_printer.cc

Issue 10854084: Retrying r10475 (now with null check): (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/flow_graph_optimizer.cc ('k') | runtime/vm/intermediate_language.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/il_printer.cc
===================================================================
--- runtime/vm/il_printer.cc (revision 10477)
+++ runtime/vm/il_printer.cc (working copy)
@@ -91,16 +91,18 @@
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());
@@ -163,9 +165,10 @@
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(")");
« no previous file with comments | « runtime/vm/flow_graph_optimizer.cc ('k') | runtime/vm/intermediate_language.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698