Index: src/runtime.cc |
diff --git a/src/runtime.cc b/src/runtime.cc |
index 3787e0c77ca88afe9b6199993ffcb70424b87075..209c5b148b3336cfa5e32fdd2fe8cde8b32316e6 100644 |
--- a/src/runtime.cc |
+++ b/src/runtime.cc |
@@ -8608,7 +8608,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_CompileForOnStackReplacement) { |
Handle<Code> result = Handle<Code>::null(); |
BailoutId ast_id = BailoutId::None(); |
- if (FLAG_concurrent_recompilation && FLAG_concurrent_osr) { |
+ if (FLAG_concurrent_osr) { |
if (isolate->optimizing_compiler_thread()-> |
IsQueuedForOSR(function, pc_offset)) { |
// Still waiting for the optimizing compiler thread to finish. Carry on. |
@@ -8630,7 +8630,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_CompileForOnStackReplacement) { |
function->IsMarkedForConcurrentRecompilation()) { |
// Prevent regular recompilation if we queue this for OSR. |
// TODO(yangguo): remove this as soon as OSR becomes one-shot. |
- function->ReplaceCode(function->shared()->code()); |
+ function->ReplaceCode(*unoptimized); |
} |
return NULL; |
} |