src/runtime-profiler.cc - Issue 7172030: Revert "Merge arguments branch to bleeding merge."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/runtime-profiler.cc

Issue 7172030: Revert "Merge arguments branch to bleeding merge." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: 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:

Index: src/runtime-profiler.cc

diff --git a/src/runtime-profiler.cc b/src/runtime-profiler.cc

index 816569a027c163a8901793d120c213b2a893c445..ce9a3082363d1966fd7a934b6cece51c44224059 100644

--- a/src/runtime-profiler.cc

+++ b/src/runtime-profiler.cc

@@ -185,7 +185,7 @@ void RuntimeProfiler::AttemptOnStackReplacement(JSFunction* function) {

// We are not prepared to do OSR for a function that already has an

// allocated arguments object. The optimized code would bypass it for

// arguments accesses, which is unsound. Don't try OSR.

- if (shared->uses_arguments()) return;

+ if (shared->scope_info()->HasArgumentsShadow()) return;

// We're using on-stack replacement: patch the unoptimized code so that

// any back edge in any unoptimized frame will trigger on-stack

« no previous file with comments | « src/runtime.cc ('k') | src/scopeinfo.h » ('j') | no next file with comments »