aboutsummaryrefslogtreecommitdiff
path: root/deps/v8/src/runtime-profiler.cc
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2013-04-19 10:50:44 -0700
committerisaacs <i@izs.me>2013-04-19 10:50:44 -0700
commit50624a50ee484b8a53cd4f1155e4e53f19c803be (patch)
tree37c4d13efd0b9f615eceaff99ef31dd411da6696 /deps/v8/src/runtime-profiler.cc
parent90266750617adb1ce1ca4ce43fe48f9b0fa11343 (diff)
downloadandroid-node-v8-50624a50ee484b8a53cd4f1155e4e53f19c803be.tar.gz
android-node-v8-50624a50ee484b8a53cd4f1155e4e53f19c803be.tar.bz2
android-node-v8-50624a50ee484b8a53cd4f1155e4e53f19c803be.zip
V8: Upgrade to 3.18.1
Diffstat (limited to 'deps/v8/src/runtime-profiler.cc')
-rw-r--r--deps/v8/src/runtime-profiler.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/deps/v8/src/runtime-profiler.cc b/deps/v8/src/runtime-profiler.cc
index 752d79c982..95e86b119c 100644
--- a/deps/v8/src/runtime-profiler.cc
+++ b/deps/v8/src/runtime-profiler.cc
@@ -30,6 +30,7 @@
#include "runtime-profiler.h"
#include "assembler.h"
+#include "bootstrapper.h"
#include "code-stubs.h"
#include "compilation-cache.h"
#include "deoptimizer.h"
@@ -134,7 +135,7 @@ void RuntimeProfiler::Optimize(JSFunction* function, const char* reason) {
PrintF("]\n");
}
- if (FLAG_parallel_recompilation) {
+ if (FLAG_parallel_recompilation && !isolate_->bootstrapper()->IsActive()) {
ASSERT(!function->IsMarkedForInstallingRecompiledCode());
ASSERT(!function->IsInRecompileQueue());
function->MarkForParallelRecompilation();