Reviewers: ulan,
Description:
Merged r10858 into 3.8 branch.
Add code kind check before preparing for OSR.
[email protected]
BUG=
TEST=
Please review this at https://chromiumcodereview.appspot.com/9581005/
SVN Base: https://v8.googlecode.com/svn/branches/3.8
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
f89d98529b042cb091fc3a156a8f85e034a75f5f..efb252f572685f367b824e9851ab8044b4219d16
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
b0b631baa165214689a05ca07628006da80c8cdb..5336f07811b592b1bb21fb37028856806b1111ab
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 8
#define BUILD_NUMBER 9
-#define PATCH_LEVEL 10
+#define PATCH_LEVEL 11
// 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
