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

Unified Diff: runtime/vm/intermediate_language_x64.cc

Issue 17311002: Fix crash in OSR with --optimization-counter-threshold=-1: do not check for OSR if the optimizaiton… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 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
Index: runtime/vm/intermediate_language_x64.cc
===================================================================
--- runtime/vm/intermediate_language_x64.cc (revision 24103)
+++ runtime/vm/intermediate_language_x64.cc (working copy)
@@ -2132,7 +2132,8 @@
__ movq(temp, Immediate(Isolate::Current()->stack_limit_address()));
__ cmpq(RSP, Address(temp, 0));
__ j(BELOW_EQUAL, slow_path->entry_label());
- if (FLAG_use_osr && !compiler->is_optimizing() && in_loop()) {
+ if (FLAG_use_osr && compiler->CanOptimizeFunction() &&
+ !compiler->is_optimizing() && in_loop()) {
// In unoptimized code check the usage counter to trigger OSR at loop
// stack checks.
__ LoadObject(temp, compiler->parsed_function().function());
« runtime/vm/intermediate_language_ia32.cc ('K') | « runtime/vm/intermediate_language_ia32.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698