Revision: 10897 Author: [email protected] Date: Fri Mar 2 00:49:59 2012 Log: Merged r10858 into 3.7 branch.
Add code kind check before preparing for OSR. [email protected] BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/9586003 http://code.google.com/p/v8/source/detail?r=10897 Modified: /branches/3.7/src/runtime-profiler.cc /branches/3.7/src/version.cc ======================================= --- /branches/3.7/src/runtime-profiler.cc Thu Nov 10 03:38:15 2011 +++ /branches/3.7/src/runtime-profiler.cc Fri Mar 2 00:49:59 2012 @@ -207,7 +207,8 @@ } } - if (function->IsMarkedForLazyRecompilation()) { + if (function->IsMarkedForLazyRecompilation() && + function->shared()->code()->kind() == Code::FUNCTION) { Code* unoptimized = function->shared()->code(); int nesting = unoptimized->allow_osr_at_loop_nesting_level(); if (nesting == 0) AttemptOnStackReplacement(function); ======================================= --- /branches/3.7/src/version.cc Thu Mar 1 04:13:18 2012 +++ /branches/3.7/src/version.cc Fri Mar 2 00:49:59 2012 @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 7 #define BUILD_NUMBER 12 -#define PATCH_LEVEL 27 +#define PATCH_LEVEL 28 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
