llvm.org GIT mirror llvm / 02e08d5
PR11868. The previous loop in LiveIntervals::join would sometimes fall over if more than two adjacent ranges needed to be merged. The new version should be able to handle an arbitrary sequence of adjancent ranges. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149588 91177308-0d34-0410-b5e6-96231b3b80d8 Lang Hames 8 years ago
2 changed file(s) with 38 addition(s) and 11 deletion(s). Raw diff Collapse all Expand all
388388 // now.
389389 if (MustMapCurValNos) {
390390 // Map the first live range.
391
391392 iterator OutIt = begin();
392393 OutIt->valno = NewVNInfo[LHSValNoAssignments[OutIt->valno->id]];
393 ++OutIt;
394 for (iterator I = OutIt, E = end(); I != E; ++I) {
395 OutIt->valno = NewVNInfo[LHSValNoAssignments[I->valno->id]];
394 for (iterator I = next(OutIt), E = end(); I != E; ++I) {
395 VNInfo* nextValNo = NewVNInfo[LHSValNoAssignments[I->valno->id]];
396 assert(nextValNo != 0 && "Huh?");
396397
397398 // If this live range has the same value # as its immediate predecessor,
398399 // and if they are neighbors, remove one LiveRange. This happens when we
399 // have [0,3:0)[4,7:1) and map 0/1 onto the same value #.
400 if (OutIt->valno == (OutIt-1)->valno && (OutIt-1)->end == OutIt->start) {
401 (OutIt-1)->end = OutIt->end;
400 // have [0,4:0)[4,7:1) and map 0/1 onto the same value #.
401 if (OutIt->valno == nextValNo && OutIt->end == I->start) {
402 OutIt->end = I->end;
402403 } else {
403 if (I != OutIt) {
404 // Didn't merge. Move OutIt to the next interval,
405 ++OutIt;
406 OutIt->valno = nextValNo;
407 if (OutIt != I) {
404408 OutIt->start = I->start;
405409 OutIt->end = I->end;
406410 }
407
408 // Didn't merge, on to the next one.
409 ++OutIt;
410411 }
411412 }
412
413413 // If we merge some live ranges, chop off the end.
414 ++OutIt;
414415 ranges.erase(OutIt, end());
415416 }
416417
0 ; RUN: llc -verify-coalescing < %s
1 ; PR11868
2
3 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32-S64"
4 target triple = "armv7-none-linux-gnueabi"
5
6 %0 = type { <4 x float> }
7 %1 = type { <4 x float> }
8
9 @foo = external global %0, align 16
10
11 define arm_aapcs_vfpcc void @bar(float, i1 zeroext, i1 zeroext) nounwind {
12 %4 = load <4 x float>* getelementptr inbounds (%0* @foo, i32 0, i32 0), align 16
13 %5 = extractelement <4 x float> %4, i32 0
14 %6 = extractelement <4 x float> %4, i32 1
15 %7 = extractelement <4 x float> %4, i32 2
16 %8 = insertelement <4 x float> undef, float %5, i32 0
17 %9 = insertelement <4 x float> %8, float %6, i32 1
18 %10 = insertelement <4 x float> %9, float %7, i32 2
19 %11 = insertelement <4 x float> %10, float 0.000000e+00, i32 3
20 store <4 x float> %11, <4 x float>* undef, align 16
21 call arm_aapcs_vfpcc void @baz(%1* undef, float 0.000000e+00) nounwind
22 ret void
23 }
24
25 declare arm_aapcs_vfpcc void @baz(%1*, float)