Reviewers: danno,
Description:
Merged r11208 into trunk branch.
Check code kind when resetting profiler ticks.
Original CL: http://codereview.chromium.org/9956060/
[email protected]
BUG=121147
TEST=chromium gpu_tests/WebGLConformanceTests
Please review this at https://chromiumcodereview.appspot.com/9963055/
SVN Base: https://v8.googlecode.com/svn/trunk
Affected files:
M src/objects.cc
M src/version.cc
Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index
29ccacf42138c66421b81bd8c3fa2c489e8fe040..b3e79f2c88e622b3185efffaa6a380c74ed8762a
100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -7871,14 +7871,17 @@ void SharedFunctionInfo::AttachInitialMap(Map* map)
{
void SharedFunctionInfo::ResetForNewContext(int new_ic_age) {
code()->ClearInlineCaches();
- code()->set_profiler_ticks(0);
set_ic_age(new_ic_age);
- if (optimization_disabled() && opt_count() >=
Compiler::kDefaultMaxOptCount) {
- // Re-enable optimizations if they were disabled due to opt_count
limit.
- set_optimization_disabled(false);
- code()->set_optimizable(true);
+ if (code()->kind() == Code::FUNCTION) {
+ code()->set_profiler_ticks(0);
+ if (optimization_disabled() &&
+ opt_count() >= Compiler::kDefaultMaxOptCount) {
+ // Re-enable optimizations if they were disabled due to opt_count
limit.
+ set_optimization_disabled(false);
+ code()->set_optimizable(true);
+ }
+ set_opt_count(0);
}
- set_opt_count(0);
}
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
b9db028d6939f2e9f4c29deb645b2a1cb67ec93e..21c488d1f5d567352c2ee0ade7f52b1b930d2136
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 10
#define BUILD_NUMBER 0
-#define PATCH_LEVEL 1
+#define PATCH_LEVEL 2
// 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
