Only compile concurrently if enabled, in %OptimizeFunctionOnNextCall.
authoryangguo@chromium.org <yangguo@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Mon, 23 Dec 2013 08:42:36 +0000 (08:42 +0000)
committeryangguo@chromium.org <yangguo@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Mon, 23 Dec 2013 08:42:36 +0000 (08:42 +0000)
R=ulan@chromium.org
BUG=326474
LOG=N

Review URL: https://codereview.chromium.org/106403007

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18403 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/runtime.cc

index 81530d5..f2f37f7 100644 (file)
@@ -8541,7 +8541,8 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_OptimizeFunctionOnNextCall) {
         unoptimized->set_allow_osr_at_loop_nesting_level(i);
         isolate->runtime_profiler()->AttemptOnStackReplacement(*function);
       }
-    } else if (type->IsOneByteEqualTo(STATIC_ASCII_VECTOR("concurrent"))) {
+    } else if (type->IsOneByteEqualTo(STATIC_ASCII_VECTOR("concurrent")) &&
+               isolate->concurrent_recompilation_enabled()) {
       function->MarkForConcurrentRecompilation();
     }
   }