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

Unified Diff: runtime/vm/flow_graph_compiler.cc

Issue 1107583003: Fix flag —no-propagate-ic-data. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 8 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 | « no previous file | runtime/vm/intermediate_language_arm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler.cc
===================================================================
--- runtime/vm/flow_graph_compiler.cc (revision 45379)
+++ runtime/vm/flow_graph_compiler.cc (working copy)
@@ -981,7 +981,6 @@
LocationSummary* locs,
const ICData& ic_data) {
ASSERT(!ic_data.IsNull());
- ASSERT(FLAG_propagate_ic_data || (ic_data.NumberOfUsedChecks() == 0));
uword label_address = 0;
StubCode* stub_code = isolate()->stub_code();
if (is_optimizing() && (ic_data.NumberOfUsedChecks() == 0)) {
@@ -1537,7 +1536,9 @@
const ICData& ic_data = ICData::ZoneHandle(zone(), ICData::New(
parsed_function().function(), target_name,
arguments_descriptor, deopt_id, num_args_tested));
- (*deopt_id_to_ic_data_)[deopt_id] = &ic_data;
+ if (deopt_id_to_ic_data_ != NULL) {
+ (*deopt_id_to_ic_data_)[deopt_id] = &ic_data;
+ }
return &ic_data;
}
@@ -1559,7 +1560,9 @@
parsed_function().function(), String::Handle(zone(), target.name()),
arguments_descriptor, deopt_id, num_args_tested));
ic_data.AddTarget(target);
- (*deopt_id_to_ic_data_)[deopt_id] = &ic_data;
+ if (deopt_id_to_ic_data_ != NULL) {
+ (*deopt_id_to_ic_data_)[deopt_id] = &ic_data;
+ }
return &ic_data;
}
« no previous file with comments | « no previous file | runtime/vm/intermediate_language_arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698