Revision: 12992
Author: [email protected]
Date: Fri Nov 16 06:24:19 2012
Log: Fix test failures.
[email protected]
BUG=
Review URL: https://chromiumcodereview.appspot.com/11414030
http://code.google.com/p/v8/source/detail?r=12992
Modified:
/branches/bleeding_edge/src/compiler.cc
/branches/bleeding_edge/src/runtime.cc
/branches/bleeding_edge/test/mjsunit/manual-parallel-recompile.js
=======================================
--- /branches/bleeding_edge/src/compiler.cc Tue Nov 13 04:27:03 2012
+++ /branches/bleeding_edge/src/compiler.cc Fri Nov 16 06:24:19 2012
@@ -864,7 +864,10 @@
{
CompilationHandleScope handle_scope(*info);
- if (InstallCodeFromOptimizedCodeMap(*info)) return;
+ if (!FLAG_manual_parallel_recompilation &&
+ InstallCodeFromOptimizedCodeMap(*info)) {
+ return;
+ }
if (ParserApi::Parse(*info, kNoParsingFlags)) {
LanguageMode language_mode = info->function()->language_mode();
=======================================
--- /branches/bleeding_edge/src/runtime.cc Fri Nov 16 05:28:34 2012
+++ /branches/bleeding_edge/src/runtime.cc Fri Nov 16 06:24:19 2012
@@ -7882,14 +7882,10 @@
if (!V8::UseCrankshaft()) return isolate->heap()->undefined_value();
HandleScope handle_scope(isolate);
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();
- if (!arg->IsJSFunction()) {
- opt_thread->InstallOptimizedFunctions();
- } else if (!JSFunction::cast(*arg)->IsOptimized()) {
- Handle<SharedFunctionInfo> shared(JSFunction::cast(*arg)->shared());
- while (*opt_thread->InstallNextOptimizedFunction() != *shared) { }
- }
+ Handle<SharedFunctionInfo> shared(fun->shared());
+ while (*opt_thread->InstallNextOptimizedFunction() != *shared) { }
return isolate->heap()->undefined_value();
}
=======================================
--- /branches/bleeding_edge/test/mjsunit/manual-parallel-recompile.js Fri
Nov 16 02:57:50 2012
+++ /branches/bleeding_edge/test/mjsunit/manual-parallel-recompile.js Fri
Nov 16 06:24:19 2012
@@ -75,6 +75,5 @@
assertOptimized(f);
assertUnoptimized(g);
-%InstallRecompiledCode("the rest");
+%InstallRecompiledCode(g);
assertOptimized(g);
-
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
