src/ia32/lithium-codegen-ia32.cc - Issue 17463005: Merged r15196, r15203, r15204, r15207, r15214 into trunk branch.

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/ia32/lithium-codegen-ia32.cc

Issue 17463005: Merged r15196, r15203, r15204, r15207, r15214 into trunk branch. (Closed) Base URL: https://v8.googlecode.com/svn/trunk

Patch Set: Created 7 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/ia32/lithium-codegen-ia32.cc

diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc

index ec87a9c72ed88b442efa294297e25d551426a076..2240d1072445d7a7d71ef1c27274691be8adacfc 100644

--- a/src/ia32/lithium-codegen-ia32.cc

+++ b/src/ia32/lithium-codegen-ia32.cc

@@ -901,7 +901,7 @@ void LCodeGen::DeoptimizeIf(Condition cc,

__ popfd();

}

- if (FLAG_trap_on_deopt) {

+ if (FLAG_trap_on_deopt && info()->IsOptimizing()) {

Label done;

if (cc != no_condition) {

__ j(NegateCondition(cc), &done, Label::kNear);

« no previous file with comments | « src/hydrogen.cc ('k') | src/mips/lithium-codegen-mips.cc » ('j') | no next file with comments »