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

Unified Diff: runtime/vm/code_generator.cc

Issue 141733009: Fix crash in VM when patching static calls. When the target code is optimized, it is possible that … (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 10 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: runtime/vm/code_generator.cc
===================================================================
--- runtime/vm/code_generator.cc (revision 32335)
+++ runtime/vm/code_generator.cc (working copy)
@@ -1437,8 +1437,16 @@
const Code& target_code = Code::Handle(
caller_code.GetStaticCallTargetCodeAt(frame->pc()));
ASSERT(!target_code.IsNull());
- // Since there was a reference to the target_code in the caller_code, it is
- // not possible for the target_function's code to be disconnected.
+ if (!target_function.HasCode()) {
+ // If target code was unoptimized than the code must have been kept
+ // connected to the function.
+ ASSERT(target_code.is_optimized());
+ const Error& error =
+ Error::Handle(Compiler::CompileFunction(target_function));
+ if (!error.IsNull()) {
+ Exceptions::PropagateError(error);
+ }
+ }
ASSERT(target_function.HasCode());
ASSERT(target_function.raw() == target_code.function());
« 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