Index: src/runtime.cc |
diff --git a/src/runtime.cc b/src/runtime.cc |
index 057e268f7ad0e6ec9f830b449b7963a5eda30934..8c77a1f094b13c7023578b5c9ec11056232b6e17 100644 |
--- a/src/runtime.cc |
+++ b/src/runtime.cc |
@@ -8265,7 +8265,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_LazyRecompile) { |
} |
-RUNTIME_FUNCTION(MaybeObject*, Runtime_ParallelRecompile) { |
+RUNTIME_FUNCTION(MaybeObject*, Runtime_ConcurrentRecompile) { |
HandleScope handle_scope(isolate); |
ASSERT(args.length() == 1); |
CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0); |
@@ -8274,8 +8274,8 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_ParallelRecompile) { |
return isolate->heap()->undefined_value(); |
} |
function->shared()->code()->set_profiler_ticks(0); |
- ASSERT(FLAG_parallel_recompilation); |
- Compiler::RecompileParallel(function); |
+ ASSERT(FLAG_concurrent_recompilation); |
+ Compiler::RecompileConcurrent(function); |
return isolate->heap()->undefined_value(); |
} |
@@ -8284,7 +8284,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_InstallRecompiledCode) { |
HandleScope handle_scope(isolate); |
ASSERT(args.length() == 1); |
CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0); |
- ASSERT(V8::UseCrankshaft() && FLAG_parallel_recompilation); |
+ ASSERT(V8::UseCrankshaft() && FLAG_concurrent_recompilation); |
isolate->optimizing_compiler_thread()->InstallOptimizedFunctions(); |
return function->code(); |
} |
@@ -8435,9 +8435,9 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_RunningInSimulator) { |
} |
-RUNTIME_FUNCTION(MaybeObject*, Runtime_IsParallelRecompilationSupported) { |
+RUNTIME_FUNCTION(MaybeObject*, Runtime_IsConcurrentRecompilationSupported) { |
HandleScope scope(isolate); |
- return FLAG_parallel_recompilation |
+ return FLAG_concurrent_recompilation |
? isolate->heap()->true_value() : isolate->heap()->false_value(); |
} |
@@ -8459,8 +8459,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("parallel"))) { |
- function->MarkForParallelRecompilation(); |
+ } else if (type->IsOneByteEqualTo(STATIC_ASCII_VECTOR("concurrent"))) { |
+ function->MarkForConcurrentRecompilation(); |
} |
} |
@@ -8492,7 +8492,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_GetOptimizationStatus) { |
} |
} |
CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0); |
- if (FLAG_parallel_recompilation && sync_with_compiler_thread) { |
+ if (FLAG_concurrent_recompilation && sync_with_compiler_thread) { |
while (function->IsInRecompileQueue() || |
function->IsMarkedForInstallingRecompiledCode()) { |
isolate->optimizing_compiler_thread()->InstallOptimizedFunctions(); |