AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix test failures.

Browse Source 
R=jkummerow@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/11414030

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12992 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
yangguo@chromium.org 2012-11-16 14:24:19 +00:00
parent 2f5c768534
commit d2a6e7b40d
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler.cc
View File

@ -864,7 +864,10 @@ void Compiler::RecompileParallel(Handle<JSFunction> closure) {
{ {
CompilationHandleScope handle_scope(*info); CompilationHandleScope handle_scope(*info);
if (InstallCodeFromOptimizedCodeMap(*info)) return; if (!FLAG_manual_parallel_recompilation &&
InstallCodeFromOptimizedCodeMap(*info)) {
return;
}
if (ParserApi::Parse(*info, kNoParsingFlags)) { if (ParserApi::Parse(*info, kNoParsingFlags)) {
LanguageMode language_mode = info->function()->language_mode(); LanguageMode language_mode = info->function()->language_mode();

10
src/runtime.cc
View File

@ -7882,14 +7882,10 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_InstallRecompiledCode) {
if (!V8::UseCrankshaft()) return isolate->heap()->undefined_value(); if (!V8::UseCrankshaft()) return isolate->heap()->undefined_value();
HandleScope handle_scope(isolate); HandleScope handle_scope(isolate);
ASSERT(FLAG_parallel_recompilation && FLAG_manual_parallel_recompilation); ASSERT(FLAG_parallel_recompilation && FLAG_manual_parallel_recompilation);
CONVERT_ARG_HANDLE_CHECKED(HeapObject, arg, 0); CONVERT_ARG_HANDLE_CHECKED(JSFunction, fun, 0);
OptimizingCompilerThread* opt_thread = isolate->optimizing_compiler_thread(); OptimizingCompilerThread* opt_thread = isolate->optimizing_compiler_thread();
if (!arg->IsJSFunction()) { Handle<SharedFunctionInfo> shared(fun->shared());
opt_thread->InstallOptimizedFunctions(); while (*opt_thread->InstallNextOptimizedFunction() != *shared) { }
} else if (!JSFunction::cast(*arg)->IsOptimized()) {
Handle<SharedFunctionInfo> shared(JSFunction::cast(*arg)->shared());
while (*opt_thread->InstallNextOptimizedFunction() != *shared) { }
}
return isolate->heap()->undefined_value(); return isolate->heap()->undefined_value();
} }

3
test/mjsunit/manual-parallel-recompile.js
View File

@ -75,6 +75,5 @@ assertUnoptimized(g);
assertOptimized(f); assertOptimized(f);
assertUnoptimized(g); assertUnoptimized(g);
%InstallRecompiledCode("the rest"); %InstallRecompiledCode(g);
assertOptimized(g); assertOptimized(g);