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

Unified Diff: vm/compiler.cc

Issue 10636004: Correctly reset global isolate state after bailout from the flow-graph compiler. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/runtime/
Patch Set: Created 8 years, 6 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: vm/compiler.cc
===================================================================
--- vm/compiler.cc (revision 8993)
+++ vm/compiler.cc (working copy)
@@ -149,6 +149,7 @@
const ParsedFunction& parsed_function, bool optimized) {
bool is_compiled = false;
Isolate* isolate = Isolate::Current();
+ ASSERT(isolate->ic_data_array() == Array::null()); // Must be reset to null.
const intptr_t prev_cid = isolate->computation_id();
isolate->set_computation_id(0);
LongJump* old_base = isolate->long_jump_base();
@@ -203,7 +204,6 @@
&CompilerStats::graphcompiler_timer,
isolate);
graph_compiler.CompileGraph();
- isolate->set_ic_data_array(Array::null());
}
{
TimerScope timer(FLAG_compiler_stats,
@@ -241,6 +241,8 @@
}
is_compiled = false;
}
+ // Reset global isolate state.
+ isolate->set_ic_data_array(Array::null());
isolate->set_long_jump_base(old_base);
isolate->set_computation_id(prev_cid);
return is_compiled;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698