Index: src/runtime.cc |
diff --git a/src/runtime.cc b/src/runtime.cc |
index 333a2dc4b4346bc479b5e335e14bb1bdb3d96199..372d74b74ad81dc19e15c61b4cb837070cb9b3d4 100644 |
--- a/src/runtime.cc |
+++ b/src/runtime.cc |
@@ -8503,7 +8503,12 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_OptimizeFunctionOnNextCall) { |
RUNTIME_ASSERT(args.length() == 1 || args.length() == 2); |
CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0); |
- if (!function->IsOptimizable()) return isolate->heap()->undefined_value(); |
+ if (!function->IsOptimizable() && |
+ !function->IsMarkedForConcurrentOptimization() && |
+ !function->IsInOptimizationQueue()) { |
+ return isolate->heap()->undefined_value(); |
+ } |
+ |
function->MarkForOptimization(); |
Code* unoptimized = function->shared()->code(); |