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

Unified Diff: src/runtime-profiler.cc

Issue 20680002: Rebase of partial ia32 implementation of optimized try/catch (started by Kevin Millikin, continued … (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Fix detection of CATCH frames (fixes debuger exception reporting anf breaks another assertion...). Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/runtime.cc ('k') | test/mjsunit/fuzz-natives-part4.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/runtime-profiler.cc
diff --git a/src/runtime-profiler.cc b/src/runtime-profiler.cc
index 9b7dd34ccd1d61c6fdd6075cdd4de61c24c4ffd1..61a77dcfd1369eaec32e4fb52433de428e28eb35 100644
--- a/src/runtime-profiler.cc
+++ b/src/runtime-profiler.cc
@@ -171,6 +171,10 @@ void RuntimeProfiler::AttemptOnStackReplacement(JSFunction* function) {
// arguments accesses, which is unsound. Don't try OSR.
if (shared->uses_arguments()) return;
+ // We are not prepared to do OSR for a function has catch clauses.
+ // TODO(mmassi): Fix this.
+ if (shared->dont_osr()) return;
+
// We're using on-stack replacement: patch the unoptimized code so that
// any back edge in any unoptimized frame will trigger on-stack
// replacement for that frame.
« no previous file with comments | « src/runtime.cc ('k') | test/mjsunit/fuzz-natives-part4.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698