Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(366)

Side by Side Diff: src/runtime-profiler.cc

Issue 7187007: Merge arguments branch to bleeding edge (second try). (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Undelete external-array test. Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/runtime.cc ('k') | src/scopeinfo.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
179 SharedFunctionInfo* shared = function->shared(); 179 SharedFunctionInfo* shared = function->shared();
180 // If the code is not optimizable or references context slots, don't try OSR. 180 // If the code is not optimizable or references context slots, don't try OSR.
181 if (!shared->code()->optimizable() || !shared->allows_lazy_compilation()) { 181 if (!shared->code()->optimizable() || !shared->allows_lazy_compilation()) {
182 return; 182 return;
183 } 183 }
184 184
185 // We are not prepared to do OSR for a function that already has an 185 // We are not prepared to do OSR for a function that already has an
186 // allocated arguments object. The optimized code would bypass it for 186 // allocated arguments object. The optimized code would bypass it for
187 // arguments accesses, which is unsound. Don't try OSR. 187 // arguments accesses, which is unsound. Don't try OSR.
188 if (shared->scope_info()->HasArgumentsShadow()) return; 188 if (shared->uses_arguments()) return;
189 189
190 // We're using on-stack replacement: patch the unoptimized code so that 190 // We're using on-stack replacement: patch the unoptimized code so that
191 // any back edge in any unoptimized frame will trigger on-stack 191 // any back edge in any unoptimized frame will trigger on-stack
192 // replacement for that frame. 192 // replacement for that frame.
193 if (FLAG_trace_osr) { 193 if (FLAG_trace_osr) {
194 PrintF("[patching stack checks in "); 194 PrintF("[patching stack checks in ");
195 function->PrintName(); 195 function->PrintName();
196 PrintF(" for on-stack replacement]\n"); 196 PrintF(" for on-stack replacement]\n");
197 } 197 }
198 198
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 } else { 480 } else {
481 return RuntimeProfiler::WaitForSomeIsolateToEnterJS(); 481 return RuntimeProfiler::WaitForSomeIsolateToEnterJS();
482 } 482 }
483 } 483 }
484 #endif 484 #endif
485 return false; 485 return false;
486 } 486 }
487 487
488 488
489 } } // namespace v8::internal 489 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/runtime.cc ('k') | src/scopeinfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698