AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Check code kind when resetting profiler ticks.

Browse Source 
BUG=121147
TEST=chromium gpu_tests/WebGLConformanceTests

Review URL: https://chromiumcodereview.appspot.com/9956060

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11208 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
ulan@chromium.org 2012-04-02 13:27:41 +00:00
parent 6c8a6c2640
commit e352114fb8
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/objects.cc
View File

@ -7869,14 +7869,17 @@ void SharedFunctionInfo::AttachInitialMap(Map* map) {
void SharedFunctionInfo::ResetForNewContext(int new_ic_age) { void SharedFunctionInfo::ResetForNewContext(int new_ic_age) {
code()->ClearInlineCaches(); code()->ClearInlineCaches();
code()->set_profiler_ticks(0);
set_ic_age(new_ic_age); set_ic_age(new_ic_age);
if (optimization_disabled() && opt_count() >= Compiler::kDefaultMaxOptCount) { if (code()->kind() == Code::FUNCTION) {
// Re-enable optimizations if they were disabled due to opt_count limit. code()->set_profiler_ticks(0);
set_optimization_disabled(false); if (optimization_disabled() &&
code()->set_optimizable(true); 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);
} }