Reviewers: ulan,
Description:
Merged r10858 into 3.7 branch.
Add code kind check before preparing for OSR.
[email protected]
BUG=
TEST=
Please review this at https://chromiumcodereview.appspot.com/9586003/
SVN Base: https://v8.googlecode.com/svn/branches/3.7
Affected files:
M src/runtime-profiler.cc
M src/version.cc
Index: src/runtime-profiler.cc
diff --git a/src/runtime-profiler.cc b/src/runtime-profiler.cc
index
eaa6e15603a7e94f5a021d46ae468c64efdbab78..9837ce766bae1ce75d5c317eb7f4fc55bd5a7706
100644
--- a/src/runtime-profiler.cc
+++ b/src/runtime-profiler.cc
@@ -207,7 +207,8 @@ void RuntimeProfiler::OptimizeNow() {
}
}
- 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);
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
416f9048b99724269392925cf017b9d9f845d71a..3b85fb403554f90cc7ad4b2ed062d7325ae9a743
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -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
