src/ia32/lithium-ia32.cc - Issue 22857004: Merged r16128, r16135, r16136 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-ia32.cc

Issue 22857004: Merged r16128, r16135, r16136 into trunk branch. (Closed) Base URL: https://v8.googlecode.com/svn/trunk

Patch Set: Created 7 years, 4 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-ia32.cc

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

index 2fa038baa49736ea188662e1a876d2cc68bb16b3..ea07c5a19915fa369b88f21d871a17d933a74b73 100644

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

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

@@ -868,7 +868,7 @@ void LChunkBuilder::DoBasicBlock(HBasicBlock* block, HBasicBlock* next_block) {

HEnvironment* last_environment = pred->last_environment();

for (int i = 0; i < block->phis()->length(); ++i) {

HPhi* phi = block->phis()->at(i);

- if (phi->merged_index() < last_environment->length()) {

+ if (phi->HasMergedIndex()) {

last_environment->SetValueAt(phi->merged_index(), phi);

}

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