Revision: 11210
Author: [email protected]
Date: Mon Apr 2 07:52:24 2012
Log: 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
Review URL: https://chromiumcodereview.appspot.com/9963055
http://code.google.com/p/v8/source/detail?r=11210
Modified:
/trunk/src/objects.cc
/trunk/src/version.cc
=======================================
--- /trunk/src/objects.cc Fri Mar 30 01:38:13 2012
+++ /trunk/src/objects.cc Mon Apr 2 07:52:24 2012
@@ -7871,14 +7871,17 @@
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);
- }
- set_opt_count(0);
+ 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);
+ }
}
=======================================
--- /trunk/src/version.cc Fri Mar 30 07:03:50 2012
+++ /trunk/src/version.cc Mon Apr 2 07:52:24 2012
@@ -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
