Index: src/runtime.cc |
diff --git a/src/runtime.cc b/src/runtime.cc |
index 2a503e3cebf18c7bc8752bceba57a3ed83961e53..97183587378520eebe8d8c423ff94a8695a98535 100644 |
--- a/src/runtime.cc |
+++ b/src/runtime.cc |
@@ -7017,7 +7017,7 @@ static MaybeObject* Runtime_LazyRecompile(Arguments args) { |
function->ReplaceCode(function->shared()->code()); |
return function->code(); |
} |
- if (CompileOptimized(function, AstNode::kNoNumber)) { |
+ if (CompileOptimized(function, AstNode::kNoNumber, CLEAR_EXCEPTION)) { |
return function->code(); |
} |
if (FLAG_trace_opt) { |
@@ -7026,7 +7026,7 @@ static MaybeObject* Runtime_LazyRecompile(Arguments args) { |
PrintF(": optimized compilation failed]\n"); |
} |
function->ReplaceCode(function->shared()->code()); |
- return Failure::Exception(); |
+ return function->code(); |
} |
@@ -7186,7 +7186,8 @@ static MaybeObject* Runtime_CompileForOnStackReplacement(Arguments args) { |
// Try to compile the optimized code. A true return value from |
// CompileOptimized means that compilation succeeded, not necessarily |
// that optimization succeeded. |
- if (CompileOptimized(function, ast_id) && function->IsOptimized()) { |
+ if (CompileOptimized(function, ast_id, CLEAR_EXCEPTION) && |
+ function->IsOptimized()) { |
DeoptimizationInputData* data = DeoptimizationInputData::cast( |
function->code()->deoptimization_data()); |
if (data->OsrPcOffset()->value() >= 0) { |
@@ -7229,6 +7230,9 @@ static MaybeObject* Runtime_CompileForOnStackReplacement(Arguments args) { |
ASSERT(function->code()->kind() == Code::OPTIMIZED_FUNCTION); |
return Smi::FromInt(ast_id); |
} else { |
+ if (function->IsMarkedForLazyRecompilation()) { |
+ function->ReplaceCode(function->shared()->code()); |
+ } |
return Smi::FromInt(-1); |
} |
} |