[llvm] e87afb9 - BoundsChecking: Convert tests to opaque pointers
Matt Arsenault via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 28 06:33:53 PST 2022
Author: Matt Arsenault
Date: 2022-11-28T09:32:23-05:00
New Revision: e87afb9730d4cf8cd8c6f9c2f45e8e5f040bb8e9
URL: https://github.com/llvm/llvm-project/commit/e87afb9730d4cf8cd8c6f9c2f45e8e5f040bb8e9
DIFF: https://github.com/llvm/llvm-project/commit/e87afb9730d4cf8cd8c6f9c2f45e8e5f040bb8e9.diff
LOG: BoundsChecking: Convert tests to opaque pointers
Added:
Modified:
llvm/test/Instrumentation/BoundsChecking/many-trap.ll
llvm/test/Instrumentation/BoundsChecking/many-traps-2.ll
llvm/test/Instrumentation/BoundsChecking/nosanitize-bounds.ll
llvm/test/Instrumentation/BoundsChecking/opt.ll
llvm/test/Instrumentation/BoundsChecking/phi.ll
llvm/test/Instrumentation/BoundsChecking/simple-32.ll
Removed:
################################################################################
diff --git a/llvm/test/Instrumentation/BoundsChecking/many-trap.ll b/llvm/test/Instrumentation/BoundsChecking/many-trap.ll
index e38b1e370a189..e9cde95cd09e5 100644
--- a/llvm/test/Instrumentation/BoundsChecking/many-trap.ll
+++ b/llvm/test/Instrumentation/BoundsChecking/many-trap.ll
@@ -5,8 +5,8 @@ target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f3
; CHECK: @f1
define void @f1(i64 %x) nounwind {
%1 = alloca i128, i64 %x
- %2 = load i128, i128* %1, align 4
- %3 = load i128, i128* %1, align 4
+ %2 = load i128, ptr %1, align 4
+ %3 = load i128, ptr %1, align 4
ret void
; CHECK: call void @llvm.trap()
; CHECK: call void @llvm.trap()
diff --git a/llvm/test/Instrumentation/BoundsChecking/many-traps-2.ll b/llvm/test/Instrumentation/BoundsChecking/many-traps-2.ll
index b6d147792a294..d146b8a6be91a 100644
--- a/llvm/test/Instrumentation/BoundsChecking/many-traps-2.ll
+++ b/llvm/test/Instrumentation/BoundsChecking/many-traps-2.ll
@@ -8,18 +8,18 @@ bb1:
br label %bb19
bb20:
- %_tmp819 = load i16, i16* null
+ %_tmp819 = load i16, ptr null
; CHECK: br {{.*}} %trap
%_tmp820 = sub nsw i16 9, %_tmp819
%_tmp821 = sext i16 %_tmp820 to i64
- %_tmp822 = getelementptr [10 x i16], [10 x i16]* @offsets, i16 0, i64 %_tmp821
- %_tmp823 = load i16, i16* %_tmp822
+ %_tmp822 = getelementptr [10 x i16], ptr @offsets, i16 0, i64 %_tmp821
+ %_tmp823 = load i16, ptr %_tmp822
br label %bb33
bb34:
%_tmp907 = zext i16 %i__7.107.0 to i64
- %_tmp908 = getelementptr [1819 x i16], [1819 x i16]* @array, i16 0, i64 %_tmp907
- store i16 0, i16* %_tmp908
+ %_tmp908 = getelementptr [1819 x i16], ptr @array, i16 0, i64 %_tmp907
+ store i16 0, ptr %_tmp908
; CHECK: br {{.*}} %trap
%_tmp910 = add i16 %i__7.107.0, 1
br label %bb33
@@ -47,15 +47,15 @@ entry:
while.cond1.preheader:
%0 = phi i16 [ undef, %entry ], [ %inc, %while.end ]
- %1 = load i16, i16* undef, align 1
+ %1 = load i16, ptr undef, align 1
; CHECK: br {{.*}} %trap
br label %while.end
while.end:
%inc = add nsw i16 %0, 1
- %arrayidx = getelementptr inbounds [1 x i16], [1 x i16]* @e, i16 0, i16
+ %arrayidx = getelementptr inbounds [1 x i16], ptr @e, i16 0, i16
%0
- %2 = load i16, i16* %arrayidx, align 1
+ %2 = load i16, ptr %arrayidx, align 1
; CHECK: or i1
; CHECK-NEXT: br {{.*}} %trap
br i1 false, label %while.end6, label %while.cond1.preheader
diff --git a/llvm/test/Instrumentation/BoundsChecking/nosanitize-bounds.ll b/llvm/test/Instrumentation/BoundsChecking/nosanitize-bounds.ll
index 03efb3b1cd67d..5be21e2b5738e 100644
--- a/llvm/test/Instrumentation/BoundsChecking/nosanitize-bounds.ll
+++ b/llvm/test/Instrumentation/BoundsChecking/nosanitize-bounds.ll
@@ -6,11 +6,11 @@ define i32 @foo(i32 %i) nosanitize_bounds {
entry:
%i.addr = alloca i32, align 4
%b = alloca [64 x i32], align 16
- store i32 %i, i32* %i.addr, align 4
- %0 = load i32, i32* %i.addr, align 4
+ store i32 %i, ptr %i.addr, align 4
+ %0 = load i32, ptr %i.addr, align 4
%idxprom = sext i32 %0 to i64
- %arrayidx = getelementptr inbounds [64 x i32], [64 x i32]* %b, i64 0, i64 %idxprom
- %1 = load i32, i32* %arrayidx, align 4
+ %arrayidx = getelementptr inbounds [64 x i32], ptr %b, i64 0, i64 %idxprom
+ %1 = load i32, ptr %arrayidx, align 4
ret i32 %1
; CHECK-NOT: call void @llvm.trap()
}
diff --git a/llvm/test/Instrumentation/BoundsChecking/opt.ll b/llvm/test/Instrumentation/BoundsChecking/opt.ll
index 329c1f98258b2..f19e19944da25 100644
--- a/llvm/test/Instrumentation/BoundsChecking/opt.ll
+++ b/llvm/test/Instrumentation/BoundsChecking/opt.ll
@@ -5,61 +5,57 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
define dso_local i32 @sumSize(i32 %n) {
entry:
%foo = alloca [1000 x i32], align 16
- %0 = bitcast [1000 x i32]* %foo to i8*
- call void @llvm.lifetime.start.p0i8(i64 4000, i8* nonnull %0)
- %arraydecay = getelementptr inbounds [1000 x i32], [1000 x i32]* %foo, i64 0, i64 0
- call void @fill(i32* nonnull %arraydecay, i32 %n)
+ call void @llvm.lifetime.start.p0(i64 4000, ptr nonnull %foo)
+ call void @fill(ptr nonnull %foo, i32 %n)
br label %for.body.i
for.body.i: ; preds = %for.body.i, %entry
%indvars.iv.i = phi i64 [ 0, %entry ], [ %indvars.iv.next.i, %for.body.i ]
%sum.07.i = phi i32 [ 0, %entry ], [ %add.i, %for.body.i ]
- %arrayidx.i = getelementptr inbounds [1000 x i32], [1000 x i32]* %foo, i64 0, i64 %indvars.iv.i
+ %arrayidx.i = getelementptr inbounds [1000 x i32], ptr %foo, i64 0, i64 %indvars.iv.i
; CHECK-NOT: trap
- %1 = load i32, i32* %arrayidx.i, align 4
- %add.i = add nsw i32 %1, %sum.07.i
+ %0 = load i32, ptr %arrayidx.i, align 4
+ %add.i = add nsw i32 %0, %sum.07.i
%indvars.iv.next.i = add nuw nsw i64 %indvars.iv.i, 1
%exitcond.i = icmp eq i64 %indvars.iv.next.i, 1000
br i1 %exitcond.i, label %accumulate.exit, label %for.body.i
accumulate.exit: ; preds = %for.body.i
- call void @llvm.lifetime.end.p0i8(i64 4000, i8* nonnull %0)
+ call void @llvm.lifetime.end.p0(i64 4000, ptr nonnull %foo)
ret i32 %add.i
}
-declare void @llvm.lifetime.start.p0i8(i64, i8* nocapture)
+declare void @llvm.lifetime.start.p0(i64, ptr nocapture)
-declare dso_local void @fill(i32*, i32)
+declare dso_local void @fill(ptr, i32)
-declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture)
+declare void @llvm.lifetime.end.p0(i64, ptr nocapture)
; CHECK-LABEL: @sumSizePlusOne
define dso_local i32 @sumSizePlusOne(i32 %n) {
entry:
%foo = alloca [1000 x i32], align 16
- %0 = bitcast [1000 x i32]* %foo to i8*
- call void @llvm.lifetime.start.p0i8(i64 4000, i8* nonnull %0)
- %arraydecay = getelementptr inbounds [1000 x i32], [1000 x i32]* %foo, i64 0, i64 0
- call void @fill(i32* nonnull %arraydecay, i32 %n)
+ call void @llvm.lifetime.start.p0(i64 4000, ptr nonnull %foo)
+ call void @fill(ptr nonnull %foo, i32 %n)
br label %for.body.i
for.body.i: ; preds = %for.body.i, %entry
%indvars.iv.i = phi i64 [ 0, %entry ], [ %indvars.iv.next.i, %for.body.i ]
%sum.01.i = phi i32 [ 0, %entry ], [ %add.i, %for.body.i ]
- %arrayidx.i = getelementptr inbounds [1000 x i32], [1000 x i32]* %foo, i64 0, i64 %indvars.iv.i
+ %arrayidx.i = getelementptr inbounds [1000 x i32], ptr %foo, i64 0, i64 %indvars.iv.i
; CHECK: mul i64 {{.*}}, 4
; CHECK: sub i64 4000, %
; CHECK-NEXT: icmp ult i64 {{.*}}, 4
; CHECK-NEXT: or i1
; CHECK: trap
- %1 = load i32, i32* %arrayidx.i, align 4
- %add.i = add nsw i32 %1, %sum.01.i
+ %0 = load i32, ptr %arrayidx.i, align 4
+ %add.i = add nsw i32 %0, %sum.01.i
%indvars.iv.next.i = add nuw nsw i64 %indvars.iv.i, 1
%exitcond.i = icmp eq i64 %indvars.iv.next.i, 1001
br i1 %exitcond.i, label %accumulate.exit, label %for.body.i
accumulate.exit: ; preds = %for.body.i
- call void @llvm.lifetime.end.p0i8(i64 4000, i8* nonnull %0)
+ call void @llvm.lifetime.end.p0(i64 4000, ptr nonnull %foo)
ret i32 %add.i
}
@@ -67,30 +63,28 @@ accumulate.exit: ; preds = %for.body.i
define dso_local i32 @sumLarger(i32 %n) {
entry:
%foo = alloca [1000 x i32], align 16
- %0 = bitcast [1000 x i32]* %foo to i8*
- call void @llvm.lifetime.start.p0i8(i64 4000, i8* nonnull %0)
- %arraydecay = getelementptr inbounds [1000 x i32], [1000 x i32]* %foo, i64 0, i64 0
- call void @fill(i32* nonnull %arraydecay, i32 %n)
+ call void @llvm.lifetime.start.p0(i64 4000, ptr nonnull %foo)
+ call void @fill(ptr nonnull %foo, i32 %n)
br label %for.body.i
for.body.i: ; preds = %for.body.i, %entry
%indvars.iv.i = phi i64 [ 0, %entry ], [ %indvars.iv.next.i, %for.body.i ]
%sum.07.i = phi i32 [ 0, %entry ], [ %add.i, %for.body.i ]
- %arrayidx.i = getelementptr inbounds [1000 x i32], [1000 x i32]* %foo, i64 0, i64 %indvars.iv.i
+ %arrayidx.i = getelementptr inbounds [1000 x i32], ptr %foo, i64 0, i64 %indvars.iv.i
; CHECK: mul i64 {{.*}}, 4
; CHECK: sub i64 4000, %
; CHECK-NEXT: icmp ult i64 4000, %
; CHECK-NEXT: icmp ult i64 {{.*}}, 4
; CHECK-NEXT: or i1
; CHECK: trap
- %1 = load i32, i32* %arrayidx.i, align 4
- %add.i = add nsw i32 %1, %sum.07.i
+ %0 = load i32, ptr %arrayidx.i, align 4
+ %add.i = add nsw i32 %0, %sum.07.i
%indvars.iv.next.i = add nuw nsw i64 %indvars.iv.i, 1
%exitcond.i = icmp eq i64 %indvars.iv.next.i, 2000
br i1 %exitcond.i, label %accumulate.exit, label %for.body.i
accumulate.exit: ; preds = %for.body.i
- call void @llvm.lifetime.end.p0i8(i64 4000, i8* nonnull %0)
+ call void @llvm.lifetime.end.p0(i64 4000, ptr nonnull %foo)
ret i32 %add.i
}
@@ -98,10 +92,8 @@ accumulate.exit: ; preds = %for.body.i
define dso_local i32 @sumUnknown(i32 %n) {
entry:
%foo = alloca [1000 x i32], align 16
- %0 = bitcast [1000 x i32]* %foo to i8*
- call void @llvm.lifetime.start.p0i8(i64 4000, i8* nonnull %0)
- %arraydecay = getelementptr inbounds [1000 x i32], [1000 x i32]* %foo, i64 0, i64 0
- call void @fill(i32* nonnull %arraydecay, i32 %n)
+ call void @llvm.lifetime.start.p0(i64 4000, ptr nonnull %foo)
+ call void @fill(ptr nonnull %foo, i32 %n)
%cmp6.i = icmp eq i32 %n, 0
br i1 %cmp6.i, label %accumulate.exit, label %for.body.preheader.i
@@ -112,22 +104,22 @@ for.body.preheader.i: ; preds = %entry
for.body.i: ; preds = %for.body.i, %for.body.preheader.i
%indvars.iv.i = phi i64 [ 0, %for.body.preheader.i ], [ %indvars.iv.next.i, %for.body.i ]
%sum.07.i = phi i32 [ 0, %for.body.preheader.i ], [ %add.i, %for.body.i ]
- %arrayidx.i = getelementptr inbounds [1000 x i32], [1000 x i32]* %foo, i64 0, i64 %indvars.iv.i
+ %arrayidx.i = getelementptr inbounds [1000 x i32], ptr %foo, i64 0, i64 %indvars.iv.i
; CHECK: mul i64 {{.*}}, 4
; CHECK: sub i64 4000, %
; CHECK-NEXT: icmp ult i64 4000, %
; CHECK-NEXT: icmp ult i64 {{.*}}, 4
; CHECK-NEXT: or i1
; CHECK: trap
- %1 = load i32, i32* %arrayidx.i, align 4
- %add.i = add nsw i32 %1, %sum.07.i
+ %0 = load i32, ptr %arrayidx.i, align 4
+ %add.i = add nsw i32 %0, %sum.07.i
%indvars.iv.next.i = add nuw nsw i64 %indvars.iv.i, 1
%exitcond.i = icmp eq i64 %indvars.iv.next.i, %wide.trip.count.i
br i1 %exitcond.i, label %accumulate.exit, label %for.body.i
accumulate.exit: ; preds = %for.body.i, %entry
%sum.0.lcssa.i = phi i32 [ 0, %entry ], [ %add.i, %for.body.i ]
- call void @llvm.lifetime.end.p0i8(i64 4000, i8* nonnull %0)
+ call void @llvm.lifetime.end.p0(i64 4000, ptr nonnull %foo)
ret i32 %sum.0.lcssa.i
}
@@ -135,10 +127,8 @@ accumulate.exit: ; preds = %for.body.i, %entry
define dso_local i32 @twoDimSize(i32 %n) {
entry:
%foo = alloca [2 x [2 x i32]], align 16
- %0 = bitcast [2 x [2 x i32]]* %foo to i8*
- call void @llvm.lifetime.start.p0i8(i64 16, i8* nonnull %0)
- %arraydecay = getelementptr inbounds [2 x [2 x i32]], [2 x [2 x i32]]* %foo, i64 0, i64 0, i64 0
- call void @fill(i32* nonnull %arraydecay, i32 %n)
+ call void @llvm.lifetime.start.p0(i64 16, ptr nonnull %foo)
+ call void @fill(ptr nonnull %foo, i32 %n)
br label %for.cond1.preheader
for.cond1.preheader: ; preds = %for.cond.cleanup3, %entry
@@ -147,7 +137,7 @@ for.cond1.preheader: ; preds = %for.cond.cleanup3,
br label %for.body4
for.cond.cleanup: ; preds = %for.cond.cleanup3
- call void @llvm.lifetime.end.p0i8(i64 16, i8* nonnull %0)
+ call void @llvm.lifetime.end.p0(i64 16, ptr nonnull %foo)
ret i32 %add
for.cond.cleanup3: ; preds = %for.body4
@@ -158,10 +148,10 @@ for.cond.cleanup3: ; preds = %for.body4
for.body4: ; preds = %for.body4, %for.cond1.preheader
%indvars.iv = phi i64 [ 0, %for.cond1.preheader ], [ %indvars.iv.next, %for.body4 ]
%sum.119 = phi i32 [ %sum.021, %for.cond1.preheader ], [ %add, %for.body4 ]
- %arrayidx7 = getelementptr inbounds [2 x [2 x i32]], [2 x [2 x i32]]* %foo, i64 0, i64 %indvars.iv23, i64 %indvars.iv
+ %arrayidx7 = getelementptr inbounds [2 x [2 x i32]], ptr %foo, i64 0, i64 %indvars.iv23, i64 %indvars.iv
; CHECK-NOT: trap
- %1 = load i32, i32* %arrayidx7, align 4
- %add = add nsw i32 %1, %sum.119
+ %0 = load i32, ptr %arrayidx7, align 4
+ %add = add nsw i32 %0, %sum.119
%indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
%exitcond = icmp eq i64 %indvars.iv.next, 2
br i1 %exitcond, label %for.cond.cleanup3, label %for.body4
@@ -171,10 +161,8 @@ for.body4: ; preds = %for.body4, %for.con
define dso_local i32 @twoDimLarger1(i32 %n) {
entry:
%foo = alloca [2 x [2 x i32]], align 16
- %0 = bitcast [2 x [2 x i32]]* %foo to i8*
- call void @llvm.lifetime.start.p0i8(i64 16, i8* nonnull %0)
- %arraydecay = getelementptr inbounds [2 x [2 x i32]], [2 x [2 x i32]]* %foo, i64 0, i64 0, i64 0
- call void @fill(i32* nonnull %arraydecay, i32 %n)
+ call void @llvm.lifetime.start.p0(i64 16, ptr nonnull %foo)
+ call void @fill(ptr nonnull %foo, i32 %n)
br label %for.cond1.preheader
for.cond1.preheader: ; preds = %for.cond.cleanup3, %entry
@@ -183,7 +171,7 @@ for.cond1.preheader: ; preds = %for.cond.cleanup3,
br label %for.body4
for.cond.cleanup: ; preds = %for.cond.cleanup3
- call void @llvm.lifetime.end.p0i8(i64 16, i8* nonnull %0)
+ call void @llvm.lifetime.end.p0(i64 16, ptr nonnull %foo)
ret i32 %add
for.cond.cleanup3: ; preds = %for.body4
@@ -194,7 +182,7 @@ for.cond.cleanup3: ; preds = %for.body4
for.body4: ; preds = %for.body4, %for.cond1.preheader
%indvars.iv = phi i64 [ 0, %for.cond1.preheader ], [ %indvars.iv.next, %for.body4 ]
%sum.119 = phi i32 [ %sum.021, %for.cond1.preheader ], [ %add, %for.body4 ]
- %arrayidx7 = getelementptr inbounds [2 x [2 x i32]], [2 x [2 x i32]]* %foo, i64 0, i64 %indvars.iv23, i64 %indvars.iv
+ %arrayidx7 = getelementptr inbounds [2 x [2 x i32]], ptr %foo, i64 0, i64 %indvars.iv23, i64 %indvars.iv
; CHECK: mul i64 {{.*}}, 8
; CHECK: mul i64 {{.*}}, 4
; CHECK: add i64
@@ -203,8 +191,8 @@ for.body4: ; preds = %for.body4, %for.con
; CHECK-NEXT: icmp ult i64 {{.*}}, 4
; CHECK-NEXT: or i1
; CHECK: trap
- %1 = load i32, i32* %arrayidx7, align 4
- %add = add nsw i32 %1, %sum.119
+ %0 = load i32, ptr %arrayidx7, align 4
+ %add = add nsw i32 %0, %sum.119
%indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
%exitcond = icmp eq i64 %indvars.iv.next, 2
br i1 %exitcond, label %for.cond.cleanup3, label %for.body4
@@ -214,10 +202,8 @@ for.body4: ; preds = %for.body4, %for.con
define dso_local i32 @twoDimLarger2(i32 %n) {
entry:
%foo = alloca [2 x [2 x i32]], align 16
- %0 = bitcast [2 x [2 x i32]]* %foo to i8*
- call void @llvm.lifetime.start.p0i8(i64 16, i8* nonnull %0)
- %arraydecay = getelementptr inbounds [2 x [2 x i32]], [2 x [2 x i32]]* %foo, i64 0, i64 0, i64 0
- call void @fill(i32* nonnull %arraydecay, i32 %n)
+ call void @llvm.lifetime.start.p0(i64 16, ptr nonnull %foo)
+ call void @fill(ptr nonnull %foo, i32 %n)
br label %for.cond1.preheader
for.cond1.preheader: ; preds = %for.cond.cleanup3, %entry
@@ -226,7 +212,7 @@ for.cond1.preheader: ; preds = %for.cond.cleanup3,
br label %for.body4
for.cond.cleanup: ; preds = %for.cond.cleanup3
- call void @llvm.lifetime.end.p0i8(i64 16, i8* nonnull %0)
+ call void @llvm.lifetime.end.p0(i64 16, ptr nonnull %foo)
ret i32 %add
for.cond.cleanup3: ; preds = %for.body4
@@ -237,7 +223,7 @@ for.cond.cleanup3: ; preds = %for.body4
for.body4: ; preds = %for.body4, %for.cond1.preheader
%indvars.iv = phi i64 [ 0, %for.cond1.preheader ], [ %indvars.iv.next, %for.body4 ]
%sum.119 = phi i32 [ %sum.021, %for.cond1.preheader ], [ %add, %for.body4 ]
- %arrayidx7 = getelementptr inbounds [2 x [2 x i32]], [2 x [2 x i32]]* %foo, i64 0, i64 %indvars.iv23, i64 %indvars.iv
+ %arrayidx7 = getelementptr inbounds [2 x [2 x i32]], ptr %foo, i64 0, i64 %indvars.iv23, i64 %indvars.iv
; CHECK: mul i64 {{.*}}, 8
; CHECK: mul i64 {{.*}}, 4
; CHECK: add i64
@@ -245,8 +231,8 @@ for.body4: ; preds = %for.body4, %for.con
; CHECK-NEXT: icmp ult i64 {{.*}}, 4
; CHECK-NEXT: or i1
; CHECK: trap
- %1 = load i32, i32* %arrayidx7, align 4
- %add = add nsw i32 %1, %sum.119
+ %0 = load i32, ptr %arrayidx7, align 4
+ %add = add nsw i32 %0, %sum.119
%indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
%exitcond = icmp eq i64 %indvars.iv.next, 3
br i1 %exitcond, label %for.cond.cleanup3, label %for.body4
@@ -256,10 +242,8 @@ for.body4: ; preds = %for.body4, %for.con
define dso_local i32 @twoDimUnknown(i32 %n) {
entry:
%foo = alloca [2 x [2 x i32]], align 16
- %0 = bitcast [2 x [2 x i32]]* %foo to i8*
- call void @llvm.lifetime.start.p0i8(i64 16, i8* nonnull %0)
- %arraydecay = getelementptr inbounds [2 x [2 x i32]], [2 x [2 x i32]]* %foo, i64 0, i64 0, i64 0
- call void @fill(i32* nonnull %arraydecay, i32 %n)
+ call void @llvm.lifetime.start.p0(i64 16, ptr nonnull %foo)
+ call void @fill(ptr nonnull %foo, i32 %n)
%cmp24 = icmp eq i32 %n, 0
br i1 %cmp24, label %for.cond.cleanup, label %for.cond1.preheader.lr.ph
@@ -275,7 +259,7 @@ for.body4.lr.ph: ; preds = %for.cond1.preheader
for.cond.cleanup: ; preds = %for.cond.cleanup3, %entry
%sum.0.lcssa = phi i32 [ 0, %entry ], [ %add, %for.cond.cleanup3 ]
- call void @llvm.lifetime.end.p0i8(i64 16, i8* nonnull %0)
+ call void @llvm.lifetime.end.p0(i64 16, ptr nonnull %foo)
ret i32 %sum.0.lcssa
for.cond.cleanup3: ; preds = %for.body4
@@ -286,7 +270,7 @@ for.cond.cleanup3: ; preds = %for.body4
for.body4: ; preds = %for.body4, %for.body4.lr.ph
%indvars.iv = phi i64 [ 0, %for.body4.lr.ph ], [ %indvars.iv.next, %for.body4 ]
%sum.122 = phi i32 [ %sum.025, %for.body4.lr.ph ], [ %add, %for.body4 ]
- %arrayidx7 = getelementptr inbounds [2 x [2 x i32]], [2 x [2 x i32]]* %foo, i64 0, i64 %indvars.iv28, i64 %indvars.iv
+ %arrayidx7 = getelementptr inbounds [2 x [2 x i32]], ptr %foo, i64 0, i64 %indvars.iv28, i64 %indvars.iv
; CHECK: mul i64 {{.*}}, 8
; CHECK: mul i64 {{.*}}, 4
; CHECK: add i64
@@ -295,8 +279,8 @@ for.body4: ; preds = %for.body4, %for.bod
; CHECK-NEXT: icmp ult i64 {{.*}}, 4
; CHECK-NEXT: or i1
; CHECK: trap
- %1 = load i32, i32* %arrayidx7, align 4
- %add = add nsw i32 %1, %sum.122
+ %0 = load i32, ptr %arrayidx7, align 4
+ %add = add nsw i32 %0, %sum.122
%indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
%exitcond = icmp eq i64 %indvars.iv.next, %wide.trip.count
br i1 %exitcond, label %for.cond.cleanup3, label %for.body4
@@ -306,23 +290,21 @@ for.body4: ; preds = %for.body4, %for.bod
define dso_local i32 @countDownGood(i32 %n) {
entry:
%foo = alloca [1000 x i32], align 16
- %0 = bitcast [1000 x i32]* %foo to i8*
- call void @llvm.lifetime.start.p0i8(i64 4000, i8* nonnull %0)
- %arraydecay = getelementptr inbounds [1000 x i32], [1000 x i32]* %foo, i64 0, i64 0
- call void @fill(i32* nonnull %arraydecay, i32 %n)
+ call void @llvm.lifetime.start.p0(i64 4000, ptr nonnull %foo)
+ call void @fill(ptr nonnull %foo, i32 %n)
br label %for.body
for.cond.cleanup: ; preds = %for.body
- call void @llvm.lifetime.end.p0i8(i64 4000, i8* nonnull %0)
+ call void @llvm.lifetime.end.p0(i64 4000, ptr nonnull %foo)
ret i32 %add
for.body: ; preds = %for.body, %entry
%indvars.iv = phi i64 [ 999, %entry ], [ %indvars.iv.next, %for.body ]
%sum.06 = phi i32 [ 0, %entry ], [ %add, %for.body ]
- %arrayidx = getelementptr inbounds [1000 x i32], [1000 x i32]* %foo, i64 0, i64 %indvars.iv
+ %arrayidx = getelementptr inbounds [1000 x i32], ptr %foo, i64 0, i64 %indvars.iv
; CHECK-NOT: trap
- %1 = load i32, i32* %arrayidx, align 4
- %add = add nsw i32 %1, %sum.06
+ %0 = load i32, ptr %arrayidx, align 4
+ %add = add nsw i32 %0, %sum.06
%indvars.iv.next = add nsw i64 %indvars.iv, -1
%cmp = icmp eq i64 %indvars.iv, 0
br i1 %cmp, label %for.cond.cleanup, label %for.body
@@ -332,26 +314,24 @@ for.body: ; preds = %for.body, %entry
define dso_local i32 @countDownBad(i32 %n) {
entry:
%foo = alloca [1000 x i32], align 16
- %0 = bitcast [1000 x i32]* %foo to i8*
- call void @llvm.lifetime.start.p0i8(i64 4000, i8* nonnull %0)
- %arraydecay = getelementptr inbounds [1000 x i32], [1000 x i32]* %foo, i64 0, i64 0
- call void @fill(i32* nonnull %arraydecay, i32 %n)
+ call void @llvm.lifetime.start.p0(i64 4000, ptr nonnull %foo)
+ call void @fill(ptr nonnull %foo, i32 %n)
br label %for.body
for.cond.cleanup: ; preds = %for.body
- call void @llvm.lifetime.end.p0i8(i64 4000, i8* nonnull %0)
+ call void @llvm.lifetime.end.p0(i64 4000, ptr nonnull %foo)
ret i32 %add
for.body: ; preds = %entry, %for.body
%indvars.iv = phi i64 [ 999, %entry ], [ %indvars.iv.next, %for.body ]
%sum.06 = phi i32 [ 0, %entry ], [ %add, %for.body ]
- %arrayidx = getelementptr inbounds [1000 x i32], [1000 x i32]* %foo, i64 0, i64 %indvars.iv
+ %arrayidx = getelementptr inbounds [1000 x i32], ptr %foo, i64 0, i64 %indvars.iv
; CHECK: mul i64 {{.*}}, 4
; CHECK: sub i64 4000, %
; CHECK-NEXT: icmp ult i64 4000, %
; CHECK: trap
- %1 = load i32, i32* %arrayidx, align 4
- %add = add nsw i32 %1, %sum.06
+ %0 = load i32, ptr %arrayidx, align 4
+ %add = add nsw i32 %0, %sum.06
%indvars.iv.next = add nsw i64 %indvars.iv, -1
%cmp = icmp sgt i64 %indvars.iv, -1
br i1 %cmp, label %for.body, label %for.cond.cleanup
diff --git a/llvm/test/Instrumentation/BoundsChecking/phi.ll b/llvm/test/Instrumentation/BoundsChecking/phi.ll
index d952f8a992473..f144cc0c362b2 100644
--- a/llvm/test/Instrumentation/BoundsChecking/phi.ll
+++ b/llvm/test/Instrumentation/BoundsChecking/phi.ll
@@ -6,17 +6,17 @@ target datalayout = "e-p:64:64:64-p1:16:16:16-i1:8:8-i8:8:8-i16:16:16-i32:32:32-
; CHECK: f1
; no checks are possible here
; CHECK-NOT: trap
-define void @f1(i8* nocapture %c) {
+define void @f1(ptr nocapture %c) {
entry:
- %0 = load i8, i8* %c, align 1
+ %0 = load i8, ptr %c, align 1
%tobool1 = icmp eq i8 %0, 0
br i1 %tobool1, label %while.end, label %while.body
while.body:
- %c.addr.02 = phi i8* [ %incdec.ptr, %while.body ], [ %c, %entry ]
- %incdec.ptr = getelementptr inbounds i8, i8* %c.addr.02, i64 -1
- store i8 100, i8* %c.addr.02, align 1
- %1 = load i8, i8* %incdec.ptr, align 1
+ %c.addr.02 = phi ptr [ %incdec.ptr, %while.body ], [ %c, %entry ]
+ %incdec.ptr = getelementptr inbounds i8, ptr %c.addr.02, i64 -1
+ store i8 100, ptr %c.addr.02, align 1
+ %1 = load i8, ptr %incdec.ptr, align 1
%tobool = icmp eq i8 %1, 0
br i1 %tobool, label %while.end, label %while.body
@@ -28,22 +28,22 @@ while.end:
; CHECK: f2
define void @f2() {
while.body.i.preheader:
- %addr = getelementptr inbounds [10 x i8], [10 x i8]* @global, i64 0, i64 9
+ %addr = getelementptr inbounds [10 x i8], ptr @global, i64 0, i64 9
br label %while.body.i
while.body.i:
; CHECK: phi
; CHECK-NEXT: phi
; CHECK-NOT: phi
- %c.addr.02.i = phi i8* [ %incdec.ptr.i, %while.body.i ], [ %addr, %while.body.i.preheader ]
- %incdec.ptr.i = getelementptr inbounds i8, i8* %c.addr.02.i, i64 -1
+ %c.addr.02.i = phi ptr [ %incdec.ptr.i, %while.body.i ], [ %addr, %while.body.i.preheader ]
+ %incdec.ptr.i = getelementptr inbounds i8, ptr %c.addr.02.i, i64 -1
; CHECK: sub i64 10, %0
; CHECK-NEXT: icmp ult i64 10, %0
; CHECK-NEXT: icmp ult i64 {{.*}}, 1
; CHECK-NEXT: or i1
; CHECK-NEXT: br {{.*}}, label %trap
- store i8 100, i8* %c.addr.02.i, align 1
- %0 = load i8, i8* %incdec.ptr.i, align 1
+ store i8 100, ptr %c.addr.02.i, align 1
+ %0 = load i8, ptr %incdec.ptr.i, align 1
%tobool.i = icmp eq i8 %0, 0
br i1 %tobool.i, label %fn.exit, label %while.body.i
@@ -54,20 +54,20 @@ fn.exit:
@global_as1 = private unnamed_addr addrspace(1) constant [10 x i8] c"ola\00mundo\00", align 1
-define void @f1_as1(i8 addrspace(1)* nocapture %c) {
+define void @f1_as1(ptr addrspace(1) nocapture %c) {
; CHECK: @f1_as1
; no checks are possible here
; CHECK-NOT: trap
entry:
- %0 = load i8, i8 addrspace(1)* %c, align 1
+ %0 = load i8, ptr addrspace(1) %c, align 1
%tobool1 = icmp eq i8 %0, 0
br i1 %tobool1, label %while.end, label %while.body
while.body:
- %c.addr.02 = phi i8 addrspace(1)* [ %incdec.ptr, %while.body ], [ %c, %entry ]
- %incdec.ptr = getelementptr inbounds i8, i8 addrspace(1)* %c.addr.02, i64 -1
- store i8 100, i8 addrspace(1)* %c.addr.02, align 1
- %1 = load i8, i8 addrspace(1)* %incdec.ptr, align 1
+ %c.addr.02 = phi ptr addrspace(1) [ %incdec.ptr, %while.body ], [ %c, %entry ]
+ %incdec.ptr = getelementptr inbounds i8, ptr addrspace(1) %c.addr.02, i64 -1
+ store i8 100, ptr addrspace(1) %c.addr.02, align 1
+ %1 = load i8, ptr addrspace(1) %incdec.ptr, align 1
%tobool = icmp eq i8 %1, 0
br i1 %tobool, label %while.end, label %while.body
@@ -79,22 +79,22 @@ while.end:
define void @f2_as1() {
; CHECK: @f2_as1
while.body.i.preheader:
- %addr = getelementptr inbounds [10 x i8], [10 x i8] addrspace(1)* @global_as1, i16 0, i16 9
+ %addr = getelementptr inbounds [10 x i8], ptr addrspace(1) @global_as1, i16 0, i16 9
br label %while.body.i
while.body.i:
; CHECK: phi
; CHECK-NEXT: phi
; CHECK-NOT: phi
- %c.addr.02.i = phi i8 addrspace(1)* [ %incdec.ptr.i, %while.body.i ], [ %addr, %while.body.i.preheader ]
- %incdec.ptr.i = getelementptr inbounds i8, i8 addrspace(1)* %c.addr.02.i, i16 -1
+ %c.addr.02.i = phi ptr addrspace(1) [ %incdec.ptr.i, %while.body.i ], [ %addr, %while.body.i.preheader ]
+ %incdec.ptr.i = getelementptr inbounds i8, ptr addrspace(1) %c.addr.02.i, i16 -1
; CHECK: sub i16 10, %0
; CHECK-NEXT: icmp ult i16 10, %0
; CHECK-NEXT: icmp ult i16 {{.*}}, 1
; CHECK-NEXT: or i1
; CHECK-NEXT: br {{.*}}, label %trap
- store i8 100, i8 addrspace(1)* %c.addr.02.i, align 1
- %0 = load i8, i8 addrspace(1)* %incdec.ptr.i, align 1
+ store i8 100, ptr addrspace(1) %c.addr.02.i, align 1
+ %0 = load i8, ptr addrspace(1) %incdec.ptr.i, align 1
%tobool.i = icmp eq i8 %0, 0
br i1 %tobool.i, label %fn.exit, label %while.body.i
diff --git a/llvm/test/Instrumentation/BoundsChecking/simple-32.ll b/llvm/test/Instrumentation/BoundsChecking/simple-32.ll
index bf45c2680ae4d..b707adaca434c 100644
--- a/llvm/test/Instrumentation/BoundsChecking/simple-32.ll
+++ b/llvm/test/Instrumentation/BoundsChecking/simple-32.ll
@@ -9,9 +9,8 @@ target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f3
define i16 @f() {
entry:
%packed1 = alloca %struct.s2_packed, align 8
- %gep = getelementptr inbounds %struct.s2_packed, %struct.s2_packed* %packed1, i32 0, i32 4
- %ptr = bitcast i16* %gep to i32*
- %val = load i32, i32* %ptr, align 4
+ %gep = getelementptr inbounds %struct.s2_packed, ptr %packed1, i32 0, i32 4
+ %val = load i32, ptr %gep, align 4
%valt = trunc i32 %val to i16
ret i16 %valt
}
@@ -21,9 +20,8 @@ entry:
define i16 @f2() {
entry:
%packed1 = alloca %struct.s2_packed, align 8
- %gep = getelementptr inbounds %struct.s2_packed, %struct.s2_packed* %packed1, i32 0, i32 4
- %ptr = bitcast i16* %gep to i48*
- %val = load i48, i48* %ptr, align 4
+ %gep = getelementptr inbounds %struct.s2_packed, ptr %packed1, i32 0, i32 4
+ %val = load i48, ptr %gep, align 4
%valt = trunc i48 %val to i16
ret i16 %valt
}
More information about the llvm-commits
mailing list