Skip to content

Commit 1f141c4

Browse files
UsmanNadeemUsmanNadeem
committed
Fix typos, remove some uses of undef/poison
Change-Id: I7d0ddd8e6d2bab90de72d2c3f691cfbea9c3e257
1 parent f4ebdf0 commit 1f141c4

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

‎llvm/lib/Analysis/Loads.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ static const DataLayout &getDLFromVal(const Value *V) {
740740

741741
// Returns true if `To` is a null pointer, constant dereferenceable pointer or
742742
// both pointers have the same underlying objects.
743-
static bool isPointerAlwaysReplacable(const Value *From, const Value *To) {
743+
static bool isPointerAlwaysReplaceable(const Value *From, const Value *To) {
744744
if (isa<ConstantPointerNull>(To))
745745
return true;
746746
if (isa<Constant>(To) &&
@@ -758,7 +758,7 @@ bool llvm::canReplacePointersInUseIfEqual(const Use &U, const Value *To) {
758758
if (!To->getType()->isPointerTy())
759759
return true;
760760

761-
if (isPointerAlwaysReplacable(&*U, To))
761+
if (isPointerAlwaysReplaceable(&*U, To))
762762
return true;
763763
return isPointerUseReplacable(U);
764764
}
@@ -769,5 +769,5 @@ bool llvm::canReplacePointersIfEqual(const Value *From, const Value *To) {
769769
if (!From->getType()->isPointerTy())
770770
return true;
771771

772-
return isPointerAlwaysReplacable(From, To);
772+
return isPointerAlwaysReplaceable(From, To);
773773
}

‎llvm/test/Transforms/GVN/condprop.ll

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,11 @@ define void @test4(i1 %b, i32 %x) {
214214
; CHECK-NEXT: br i1 [[B:%.*]], label [[SW:%.*]], label [[CASE3:%.*]]
215215
; CHECK: sw:
216216
; CHECK-NEXT: switch i32 [[X:%.*]], label [[DEFAULT:%.*]] [
217-
; CHECK-NEXT: i32 0, label [[CASE0:%.*]]
218-
; CHECK-NEXT: i32 1, label [[CASE1:%.*]]
219-
; CHECK-NEXT: i32 2, label [[CASE0]]
220-
; CHECK-NEXT: i32 3, label [[CASE3]]
221-
; CHECK-NEXT: i32 4, label [[DEFAULT]]
217+
; CHECK-NEXT: i32 0, label [[CASE0:%.*]]
218+
; CHECK-NEXT: i32 1, label [[CASE1:%.*]]
219+
; CHECK-NEXT: i32 2, label [[CASE0]]
220+
; CHECK-NEXT: i32 3, label [[CASE3]]
221+
; CHECK-NEXT: i32 4, label [[DEFAULT]]
222222
; CHECK-NEXT: ]
223223
; CHECK: default:
224224
; CHECK-NEXT: call void @bar(i32 [[X]])
@@ -553,14 +553,14 @@ end:
553553
ret i32 %ret
554554
}
555555

556-
define void @test14(ptr %ptr1, ptr noalias %ptr2) {
556+
define void @test14(ptr %ptr1, ptr noalias %ptr2, i1 %b1, i1 %b2) {
557557
; CHECK-LABEL: @test14(
558558
; CHECK-NEXT: entry:
559559
; CHECK-NEXT: [[GEP1:%.*]] = getelementptr inbounds i32, ptr [[PTR1:%.*]], i32 1
560560
; CHECK-NEXT: [[GEP2:%.*]] = getelementptr inbounds i32, ptr [[PTR1]], i32 2
561561
; CHECK-NEXT: br label [[LOOP:%.*]]
562562
; CHECK: loop:
563-
; CHECK-NEXT: br i1 undef, label [[LOOP_IF1_CRIT_EDGE:%.*]], label [[THEN:%.*]]
563+
; CHECK-NEXT: br i1 [[B1:%.*]], label [[LOOP_IF1_CRIT_EDGE:%.*]], label [[THEN:%.*]]
564564
; CHECK: loop.if1_crit_edge:
565565
; CHECK-NEXT: [[VAL2_PRE:%.*]] = load i32, ptr [[GEP2]], align 4
566566
; CHECK-NEXT: br label [[IF1:%.*]]
@@ -578,7 +578,7 @@ define void @test14(ptr %ptr1, ptr noalias %ptr2) {
578578
; CHECK-NEXT: [[PHI3:%.*]] = phi ptr [ [[GEP2]], [[THEN]] ], [ [[PTR1]], [[IF2]] ]
579579
; CHECK-NEXT: [[VAL3]] = load i32, ptr [[GEP2]], align 4
580580
; CHECK-NEXT: store i32 [[VAL3]], ptr [[PHI3]], align 4
581-
; CHECK-NEXT: br i1 undef, label [[LOOP]], label [[IF1]]
581+
; CHECK-NEXT: br i1 [[B2:%.*]], label [[LOOP]], label [[IF1]]
582582
;
583583
entry:
584584
%gep1 = getelementptr inbounds i32, ptr %ptr1, i32 1
@@ -587,7 +587,7 @@ entry:
587587

588588
loop:
589589
%phi1 = phi ptr [ %gep3, %loop.end ], [ %gep1, %entry ]
590-
br i1 undef, label %if1, label %then
590+
br i1 %b1, label %if1, label %then
591591

592592

593593
if1:
@@ -608,20 +608,20 @@ loop.end:
608608
%val3 = load i32, ptr %gep2, align 4
609609
store i32 %val3, ptr %phi3, align 4
610610
%gep3 = getelementptr inbounds i32, ptr %ptr1, i32 1
611-
br i1 undef, label %loop, label %if1
611+
br i1 %b2, label %loop, label %if1
612612
}
613613

614614
; Make sure that the call to use_ptr does not have %p1
615-
define void @single_phi1(ptr %p1) {
615+
define void @single_phi1(ptr %p0, ptr %p1, i8 %s) {
616616
; CHECK-LABEL: @single_phi1(
617617
; CHECK-NEXT: entry:
618-
; CHECK-NEXT: [[P2:%.*]] = load ptr, ptr poison, align 8
618+
; CHECK-NEXT: [[P2:%.*]] = load ptr, ptr [[P0:%.*]], align 8
619619
; CHECK-NEXT: [[CMP1:%.*]] = icmp eq ptr [[P2]], [[P1:%.*]]
620620
; CHECK-NEXT: br i1 [[CMP1]], label [[BB4:%.*]], label [[BB1:%.*]]
621621
; CHECK: bb1:
622-
; CHECK-NEXT: switch i8 poison, label [[BB2:%.*]] [
623-
; CHECK-NEXT: i8 0, label [[BB1]]
624-
; CHECK-NEXT: i8 1, label [[BB3:%.*]]
622+
; CHECK-NEXT: switch i8 [[S:%.*]], label [[BB2:%.*]] [
623+
; CHECK-NEXT: i8 0, label [[BB1]]
624+
; CHECK-NEXT: i8 1, label [[BB3:%.*]]
625625
; CHECK-NEXT: ]
626626
; CHECK: bb2:
627627
; CHECK-NEXT: unreachable
@@ -633,12 +633,12 @@ define void @single_phi1(ptr %p1) {
633633
; CHECK-NEXT: ret void
634634
;
635635
entry:
636-
%p2 = load ptr, ptr poison, align 8
636+
%p2 = load ptr, ptr %p0, align 8
637637
%cmp1 = icmp eq ptr %p2, %p1
638638
br i1 %cmp1, label %bb4, label %bb1
639639

640640
bb1:
641-
switch i8 poison, label %bb2 [
641+
switch i8 %s, label %bb2 [
642642
i8 0, label %bb1
643643
i8 1, label %bb3
644644
]
@@ -650,23 +650,23 @@ bb3:
650650
br label %bb4
651651

652652
bb4:
653-
%phi1 = phi ptr [ %p2, %entry ], [ poison, %bb3 ]
653+
%phi1 = phi ptr [ %p2, %entry ], [ %p2, %bb3 ]
654654
%cmp2 = icmp eq ptr %phi1, %p1
655655
call void @use_bool(i1 %cmp2)
656656
call void @use_ptr(ptr %phi1)
657657
ret void
658658
}
659659

660-
define void @single_phi2(ptr %p1) {
660+
define void @single_phi2(ptr %p0, ptr %p1, i8 %s) {
661661
; CHECK-LABEL: @single_phi2(
662662
; CHECK-NEXT: entry:
663-
; CHECK-NEXT: [[P2:%.*]] = load ptr, ptr poison, align 8
663+
; CHECK-NEXT: [[P2:%.*]] = load ptr, ptr [[P0:%.*]], align 8
664664
; CHECK-NEXT: [[CMP1:%.*]] = icmp eq ptr [[P2]], [[P1:%.*]]
665665
; CHECK-NEXT: br i1 [[CMP1]], label [[BB4:%.*]], label [[BB1:%.*]]
666666
; CHECK: bb1:
667-
; CHECK-NEXT: switch i8 poison, label [[BB2:%.*]] [
668-
; CHECK-NEXT: i8 0, label [[BB1]]
669-
; CHECK-NEXT: i8 1, label [[BB3:%.*]]
667+
; CHECK-NEXT: switch i8 [[S:%.*]], label [[BB2:%.*]] [
668+
; CHECK-NEXT: i8 0, label [[BB1]]
669+
; CHECK-NEXT: i8 1, label [[BB3:%.*]]
670670
; CHECK-NEXT: ]
671671
; CHECK: bb2:
672672
; CHECK-NEXT: br label [[BB4]]
@@ -678,12 +678,12 @@ define void @single_phi2(ptr %p1) {
678678
; CHECK-NEXT: ret void
679679
;
680680
entry:
681-
%p2 = load ptr, ptr poison, align 8
681+
%p2 = load ptr, ptr %p0, align 8
682682
%cmp1 = icmp eq ptr %p2, %p1
683683
br i1 %cmp1, label %bb4, label %bb1
684684

685685
bb1:
686-
switch i8 poison, label %bb2 [
686+
switch i8 %s, label %bb2 [
687687
i8 0, label %bb1
688688
i8 1, label %bb3
689689
]
@@ -695,23 +695,23 @@ bb3:
695695
br label %bb4
696696

697697
bb4:
698-
%phi1 = phi ptr [ %p2, %entry ], [ %p2, %bb2 ], [ poison, %bb3 ]
698+
%phi1 = phi ptr [ %p2, %entry ], [ %p2, %bb2 ], [ %p2, %bb3 ]
699699
%cmp2 = icmp eq ptr %phi1, %p1
700700
call void @use_bool(i1 %cmp2)
701701
call void @use_ptr(ptr %phi1)
702702
ret void
703703
}
704704

705-
define void @multiple_phi1(ptr %p1) {
705+
define void @multiple_phi1(ptr %p0, ptr %p1, i8 %s) {
706706
; CHECK-LABEL: @multiple_phi1(
707707
; CHECK-NEXT: entry:
708-
; CHECK-NEXT: [[P2:%.*]] = load ptr, ptr poison, align 8
708+
; CHECK-NEXT: [[P2:%.*]] = load ptr, ptr [[P0:%.*]], align 8
709709
; CHECK-NEXT: [[CMP1:%.*]] = icmp eq ptr [[P2]], [[P1:%.*]]
710710
; CHECK-NEXT: br i1 [[CMP1]], label [[BB4:%.*]], label [[BB1:%.*]]
711711
; CHECK: bb1:
712-
; CHECK-NEXT: switch i8 poison, label [[BB2:%.*]] [
713-
; CHECK-NEXT: i8 0, label [[BB1]]
714-
; CHECK-NEXT: i8 1, label [[BB3:%.*]]
712+
; CHECK-NEXT: switch i8 [[S:%.*]], label [[BB2:%.*]] [
713+
; CHECK-NEXT: i8 0, label [[BB1]]
714+
; CHECK-NEXT: i8 1, label [[BB3:%.*]]
715715
; CHECK-NEXT: ]
716716
; CHECK: bb2:
717717
; CHECK-NEXT: unreachable
@@ -725,12 +725,12 @@ define void @multiple_phi1(ptr %p1) {
725725
; CHECK-NEXT: br label [[BB5]]
726726
;
727727
entry:
728-
%p2 = load ptr, ptr poison, align 8
728+
%p2 = load ptr, ptr %p0, align 8
729729
%cmp1 = icmp eq ptr %p2, %p1
730730
br i1 %cmp1, label %bb4, label %bb1
731731

732732
bb1:
733-
switch i8 poison, label %bb2 [
733+
switch i8 %s, label %bb2 [
734734
i8 0, label %bb1
735735
i8 1, label %bb3
736736
]
@@ -753,16 +753,16 @@ bb5:
753753
br label %bb5
754754
}
755755

756-
define void @multiple_phi2(ptr %p1) {
756+
define void @multiple_phi2(ptr %p0, ptr %p1, i8 %s) {
757757
; CHECK-LABEL: @multiple_phi2(
758758
; CHECK-NEXT: entry:
759-
; CHECK-NEXT: [[P2:%.*]] = load ptr, ptr poison, align 8
759+
; CHECK-NEXT: [[P2:%.*]] = load ptr, ptr [[P0:%.*]], align 8
760760
; CHECK-NEXT: [[CMP1:%.*]] = icmp eq ptr [[P2]], [[P1:%.*]]
761761
; CHECK-NEXT: br i1 [[CMP1]], label [[BB4:%.*]], label [[BB1:%.*]]
762762
; CHECK: bb1:
763-
; CHECK-NEXT: switch i8 poison, label [[BB2:%.*]] [
764-
; CHECK-NEXT: i8 0, label [[BB1]]
765-
; CHECK-NEXT: i8 1, label [[BB3:%.*]]
763+
; CHECK-NEXT: switch i8 [[S:%.*]], label [[BB2:%.*]] [
764+
; CHECK-NEXT: i8 0, label [[BB1]]
765+
; CHECK-NEXT: i8 1, label [[BB3:%.*]]
766766
; CHECK-NEXT: ]
767767
; CHECK: bb2:
768768
; CHECK-NEXT: br label [[BB4]]
@@ -776,12 +776,12 @@ define void @multiple_phi2(ptr %p1) {
776776
; CHECK-NEXT: br label [[BB5]]
777777
;
778778
entry:
779-
%p2 = load ptr, ptr poison, align 8
779+
%p2 = load ptr, ptr %p0, align 8
780780
%cmp1 = icmp eq ptr %p2, %p1
781781
br i1 %cmp1, label %bb4, label %bb1
782782

783783
bb1:
784-
switch i8 poison, label %bb2 [
784+
switch i8 %s, label %bb2 [
785785
i8 0, label %bb1
786786
i8 1, label %bb3
787787
]

0 commit comments

Comments
 (0)