[llvm] 7e5e4d6 - [LCSSA] Convert tests to opaque pointers (NFC)
Nikita Popov via llvm-commits
llvm-commits at lists.llvm.org
Tue Dec 27 01:57:05 PST 2022
Author: Nikita Popov
Date: 2022-12-27T10:56:49+01:00
New Revision: 7e5e4d66b361ea498a465270649178a0289db1ac
URL: https://github.com/llvm/llvm-project/commit/7e5e4d66b361ea498a465270649178a0289db1ac
DIFF: https://github.com/llvm/llvm-project/commit/7e5e4d66b361ea498a465270649178a0289db1ac.diff
LOG: [LCSSA] Convert tests to opaque pointers (NFC)
Added:
Modified:
llvm/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
llvm/test/Transforms/LCSSA/2006-07-09-NoDominator.ll
llvm/test/Transforms/LCSSA/2007-07-12-LICM-2.ll
llvm/test/Transforms/LCSSA/2007-07-12-LICM-3.ll
llvm/test/Transforms/LCSSA/2007-07-12-LICM.ll
llvm/test/Transforms/LCSSA/avoid-intrinsics-in-catchswitch.ll
llvm/test/Transforms/LCSSA/indirectbr.ll
llvm/test/Transforms/LCSSA/invoke-dest.ll
llvm/test/Transforms/LCSSA/mixed-catch.ll
llvm/test/Transforms/LCSSA/pr44058.ll
llvm/test/Transforms/LCSSA/pr44320.ll
Removed:
################################################################################
diff --git a/llvm/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll b/llvm/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
index 1daa4e1dc59bc..6dd40956794a6 100644
--- a/llvm/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
+++ b/llvm/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
@@ -1,20 +1,20 @@
; RUN: opt < %s -passes=loop-simplify,lcssa -S | FileCheck %s
- %struct.SetJmpMapEntry = type { i8*, i32, %struct.SetJmpMapEntry* }
+ %struct.SetJmpMapEntry = type { ptr, i32, ptr }
define void @__llvm_sjljeh_try_catching_longjmp_exception() {
; CHECK-LABEL: @__llvm_sjljeh_try_catching_longjmp_exception
entry:
br i1 false, label %UnifiedReturnBlock, label %no_exit
no_exit: ; preds = %endif, %entry
- %SJE.0.0 = phi %struct.SetJmpMapEntry* [ %tmp.24, %endif ], [ null, %entry ] ; <%struct.SetJmpMapEntry*> [#uses=1]
+ %SJE.0.0 = phi ptr [ %tmp.24, %endif ], [ null, %entry ] ; <ptr> [#uses=1]
br i1 false, label %then, label %endif
then: ; preds = %no_exit
-; CHECK: %SJE.0.0.lcssa = phi %struct.SetJmpMapEntry
- %tmp.20 = getelementptr %struct.SetJmpMapEntry, %struct.SetJmpMapEntry* %SJE.0.0, i32 0, i32 1 ; <i32*> [#uses=0]
+; CHECK: %SJE.0.0.lcssa = phi ptr
+ %tmp.20 = getelementptr %struct.SetJmpMapEntry, ptr %SJE.0.0, i32 0, i32 1 ; <ptr> [#uses=0]
ret void
endif: ; preds = %no_exit
- %tmp.24 = load %struct.SetJmpMapEntry*, %struct.SetJmpMapEntry** null ; <%struct.SetJmpMapEntry*> [#uses=1]
+ %tmp.24 = load ptr, ptr null ; <ptr> [#uses=1]
br i1 false, label %UnifiedReturnBlock, label %no_exit
UnifiedReturnBlock: ; preds = %endif, %entry
ret void
diff --git a/llvm/test/Transforms/LCSSA/2006-07-09-NoDominator.ll b/llvm/test/Transforms/LCSSA/2006-07-09-NoDominator.ll
index 0a6bd0d9b564b..a441cef4f1667 100644
--- a/llvm/test/Transforms/LCSSA/2006-07-09-NoDominator.ll
+++ b/llvm/test/Transforms/LCSSA/2006-07-09-NoDominator.ll
@@ -1,20 +1,20 @@
; RUN: opt < %s -passes=lcssa
- %struct.SetJmpMapEntry = type { i8*, i32, %struct.SetJmpMapEntry* }
+ %struct.SetJmpMapEntry = type { ptr, i32, ptr }
define void @__llvm_sjljeh_try_catching_longjmp_exception() {
entry:
br label %loopentry
loopentry: ; preds = %endif, %entry
- %SJE.0 = phi %struct.SetJmpMapEntry* [ null, %entry ], [ %tmp.25, %endif ] ; <%struct.SetJmpMapEntry*> [#uses=1]
+ %SJE.0 = phi ptr [ null, %entry ], [ %tmp.25, %endif ] ; <ptr> [#uses=1]
br i1 false, label %no_exit, label %loopexit
no_exit: ; preds = %loopentry
br i1 false, label %then, label %endif
then: ; preds = %no_exit
- %tmp.21 = getelementptr %struct.SetJmpMapEntry, %struct.SetJmpMapEntry* %SJE.0, i32 0, i32 1 ; <i32*> [#uses=0]
+ %tmp.21 = getelementptr %struct.SetJmpMapEntry, ptr %SJE.0, i32 0, i32 1 ; <ptr> [#uses=0]
br label %return
endif: ; preds = %no_exit
- %tmp.25 = load %struct.SetJmpMapEntry*, %struct.SetJmpMapEntry** null ; <%struct.SetJmpMapEntry*> [#uses=1]
+ %tmp.25 = load ptr, ptr null ; <ptr> [#uses=1]
br label %loopentry
loopexit: ; preds = %loopentry
br label %return
diff --git a/llvm/test/Transforms/LCSSA/2007-07-12-LICM-2.ll b/llvm/test/Transforms/LCSSA/2007-07-12-LICM-2.ll
index 3c746434d87e0..f7619f622acab 100644
--- a/llvm/test/Transforms/LCSSA/2007-07-12-LICM-2.ll
+++ b/llvm/test/Transforms/LCSSA/2007-07-12-LICM-2.ll
@@ -1,15 +1,15 @@
; RUN: opt < %s -passes='loop-mssa(loop-rotate,licm)',simple-loop-unswitch -disable-output
-define i32 @main(i32 %argc, i8** %argv) {
+define i32 @main(i32 %argc, ptr %argv) {
entry:
br label %bb7
bb7: ; preds = %bb7, %entry
- %tmp39 = load <4 x float>, <4 x float>* null ; <<4 x float>> [#uses=1]
+ %tmp39 = load <4 x float>, ptr null ; <<4 x float>> [#uses=1]
%tmp40 = fadd <4 x float> %tmp39, < float 2.000000e+00, float 3.000000e+00, float 1.000000e+00, float 0.000000e+00 > ; <<4 x float>> [#uses=1]
%tmp43 = fadd <4 x float> %tmp40, < float 1.000000e+00, float 1.000000e+00, float 0.000000e+00, float 2.000000e+00 > ; <<4 x float>> [#uses=1]
%tmp46 = fadd <4 x float> %tmp43, < float 3.000000e+00, float 0.000000e+00, float 2.000000e+00, float 4.000000e+00 > ; <<4 x float>> [#uses=1]
%tmp49 = fadd <4 x float> %tmp46, < float 0.000000e+00, float 4.000000e+00, float 6.000000e+00, float 1.000000e+00 > ; <<4 x float>> [#uses=1]
- store <4 x float> %tmp49, <4 x float>* null
+ store <4 x float> %tmp49, ptr null
br i1 false, label %bb7, label %bb56
bb56: ; preds = %bb7
diff --git a/llvm/test/Transforms/LCSSA/2007-07-12-LICM-3.ll b/llvm/test/Transforms/LCSSA/2007-07-12-LICM-3.ll
index 6e5c0e900c1f7..56fb8584e06ee 100644
--- a/llvm/test/Transforms/LCSSA/2007-07-12-LICM-3.ll
+++ b/llvm/test/Transforms/LCSSA/2007-07-12-LICM-3.ll
@@ -1,6 +1,6 @@
; RUN: opt < %s -passes='loop-mssa(loop-rotate,licm)',simple-loop-unswitch -disable-output
-define i32 @main(i32 %argc, i8** %argv) {
+define i32 @main(i32 %argc, ptr %argv) {
entry:
br label %bb
@@ -8,12 +8,12 @@ bb: ; preds = %bb56, %entry
br label %bb7
bb7: ; preds = %bb7, %bb
- %tmp39 = load <4 x float>, <4 x float>* null ; <<4 x float>> [#uses=1]
+ %tmp39 = load <4 x float>, ptr null ; <<4 x float>> [#uses=1]
%tmp40 = fadd <4 x float> %tmp39, < float 2.000000e+00, float 3.000000e+00, float 1.000000e+00, float 0.000000e+00 > ; <<4 x float>> [#uses=1]
%tmp43 = fadd <4 x float> %tmp40, < float 1.000000e+00, float 1.000000e+00, float 0.000000e+00, float 2.000000e+00 > ; <<4 x float>> [#uses=1]
%tmp46 = fadd <4 x float> %tmp43, < float 3.000000e+00, float 0.000000e+00, float 2.000000e+00, float 4.000000e+00 > ; <<4 x float>> [#uses=1]
%tmp49 = fadd <4 x float> %tmp46, < float 0.000000e+00, float 4.000000e+00, float 6.000000e+00, float 1.000000e+00 > ; <<4 x float>> [#uses=1]
- store <4 x float> %tmp49, <4 x float>* null
+ store <4 x float> %tmp49, ptr null
br i1 false, label %bb7, label %bb56
bb56: ; preds = %bb7
diff --git a/llvm/test/Transforms/LCSSA/2007-07-12-LICM.ll b/llvm/test/Transforms/LCSSA/2007-07-12-LICM.ll
index b8cb12fb195f4..437dd62d30c39 100644
--- a/llvm/test/Transforms/LCSSA/2007-07-12-LICM.ll
+++ b/llvm/test/Transforms/LCSSA/2007-07-12-LICM.ll
@@ -1,12 +1,12 @@
; RUN: opt < %s -passes='loop-mssa(loop-rotate,licm)',simple-loop-unswitch -disable-output
-define i32 @main(i32 %argc, i8** %argv) {
+define i32 @main(i32 %argc, ptr %argv) {
entry:
br label %bb7
bb7: ; preds = %bb7, %entry
- %tmp39 = load <4 x float>, <4 x float>* null ; <<4 x float>> [#uses=1]
+ %tmp39 = load <4 x float>, ptr null ; <<4 x float>> [#uses=1]
%tmp40 = fadd <4 x float> %tmp39, < float 2.000000e+00, float 3.000000e+00, float 1.000000e+00, float 0.000000e+00 > ; <<4 x float>> [#uses=0]
- store <4 x float> zeroinitializer, <4 x float>* null
+ store <4 x float> zeroinitializer, ptr null
br i1 false, label %bb7, label %bb56
bb56: ; preds = %bb7
diff --git a/llvm/test/Transforms/LCSSA/avoid-intrinsics-in-catchswitch.ll b/llvm/test/Transforms/LCSSA/avoid-intrinsics-in-catchswitch.ll
index 968da50e523ff..fc0b59d182a0c 100644
--- a/llvm/test/Transforms/LCSSA/avoid-intrinsics-in-catchswitch.ll
+++ b/llvm/test/Transforms/LCSSA/avoid-intrinsics-in-catchswitch.ll
@@ -16,46 +16,34 @@ target triple = "x86_64-pc-windows-msvc19.11.0"
@"\01?l@@3HA" = local_unnamed_addr global i32 0, align 4
-define i32 @"\01?m@@YAJXZ"() personality i8* bitcast (i32 (...)* @__C_specific_handler to i8*) {
+define i32 @"\01?m@@YAJXZ"() personality ptr @__C_specific_handler {
entry:
%n = alloca %struct.e, align 4
%db = alloca i32, align 4
%o = alloca %struct.d, align 1
- %q = alloca i8*, align 8
+ %q = alloca ptr, align 8
%r = alloca i32, align 4
%u = alloca i64, align 8
%s = alloca %class.f, align 1
%offset = alloca i64, align 8
%t = alloca i64, align 8
%status = alloca i32, align 4
- call void (...) @llvm.localescape(%class.f* nonnull %s, i32* nonnull %status)
- %0 = bitcast %struct.e* %n to i8*
- %1 = bitcast i32* %db to i8*
- %2 = getelementptr inbounds %struct.d, %struct.d* %o, i64 0, i32 0
- %3 = bitcast i8** %q to i8*
- %4 = bitcast i32* %r to i8*
- %5 = bitcast i64* %u to i8*
- %6 = getelementptr inbounds %class.f, %class.f* %s, i64 0, i32 0, i32 0
- %7 = load i32, i32* @"\01?l@@3HA", align 4, !tbaa !3
- %call = call %class.f* @"\01??0f@@QEAA at H@Z"(%class.f* nonnull %s, i32 %7)
- %8 = bitcast i64* %offset to i8*
- %9 = bitcast i64* %t to i8*
- %10 = bitcast i32* %status to i8*
- %11 = bitcast %class.f* %s to %struct.d*
- %c = getelementptr inbounds %struct.e, %struct.e* %n, i64 0, i32 0
+ call void (...) @llvm.localescape(ptr nonnull %s, ptr nonnull %status)
+ %0 = load i32, ptr @"\01?l@@3HA", align 4, !tbaa !3
+ %call = call ptr @"\01??0f@@QEAA at H@Z"(ptr nonnull %s, i32 %0)
br label %for.cond
for.cond: ; preds = %cleanup.cont, %entry
%p.0 = phi i32 [ undef, %entry ], [ %call2, %cleanup.cont ]
- invoke void @"\01?h@@YAXPEAH0HPEAIPEAPEAEPEA_K33PEAUd@@4 at Z"(i32* nonnull %db, i32* nonnull %c, i32 undef, i32* nonnull %r, i8** nonnull %q, i64* nonnull %u, i64* nonnull %offset, i64* nonnull %t, %struct.d* nonnull %11, %struct.d* nonnull %o)
+ invoke void @"\01?h@@YAXPEAH0HPEAIPEAPEAEPEA_K33PEAUd@@4 at Z"(ptr nonnull %db, ptr nonnull %n, i32 undef, ptr nonnull %r, ptr nonnull %q, ptr nonnull %u, ptr nonnull %offset, ptr nonnull %t, ptr nonnull %s, ptr nonnull %o)
to label %__try.cont unwind label %catch.dispatch
catch.dispatch: ; preds = %for.cond
- %12 = catchswitch within none [label %__except.ret] unwind label %ehcleanup
+ %1 = catchswitch within none [label %__except.ret] unwind label %ehcleanup
__except.ret: ; preds = %catch.dispatch
- %13 = catchpad within %12 [i8* bitcast (i32 (i8*, i8*)* @"\01?filt$0 at 0@m@@" to i8*)]
- catchret from %13 to label %cleanup7
+ %2 = catchpad within %1 [ptr @"\01?filt$0 at 0@m@@"]
+ catchret from %2 to label %cleanup7
__try.cont: ; preds = %for.cond
%tobool = icmp eq i32 %p.0, 0
@@ -69,57 +57,49 @@ cleanup.cont: ; preds = %if.end
br label %for.cond
ehcleanup: ; preds = %if.end, %catch.dispatch
- %14 = cleanuppad within none []
- %g.i = getelementptr inbounds %class.f, %class.f* %s, i64 0, i32 0
- call void @"\01??1b@@QEAA at XZ"(%class.b* nonnull %g.i) [ "funclet"(token %14) ]
- cleanupret from %14 unwind to caller
+ %3 = cleanuppad within none []
+ call void @"\01??1b@@QEAA at XZ"(ptr nonnull %s) [ "funclet"(token %3) ]
+ cleanupret from %3 unwind to caller
cleanup7: ; preds = %__try.cont, %__except.ret
%p.2.ph = phi i32 [ 7, %__except.ret ], [ %p.0, %__try.cont ]
- %g.i32 = getelementptr inbounds %class.f, %class.f* %s, i64 0, i32 0
- call void @"\01??1b@@QEAA at XZ"(%class.b* nonnull %g.i32)
+ call void @"\01??1b@@QEAA at XZ"(ptr nonnull %s)
ret i32 %p.2.ph
}
-declare %class.f* @"\01??0f@@QEAA at H@Z"(%class.f* returned, i32) unnamed_addr
+declare ptr @"\01??0f@@QEAA at H@Z"(ptr returned, i32) unnamed_addr
-define internal i32 @"\01?filt$0 at 0@m@@"(i8* %exception_pointers, i8* %frame_pointer) personality i8* bitcast (i32 (...)* @__C_specific_handler to i8*) {
+define internal i32 @"\01?filt$0 at 0@m@@"(ptr %exception_pointers, ptr %frame_pointer) personality ptr @__C_specific_handler {
entry:
- %0 = tail call i8* @llvm.eh.recoverfp(i8* bitcast (i32 ()* @"\01?m@@YAJXZ" to i8*), i8* %frame_pointer)
- %1 = tail call i8* @llvm.localrecover(i8* bitcast (i32 ()* @"\01?m@@YAJXZ" to i8*), i8* %0, i32 0)
- %2 = tail call i8* @llvm.localrecover(i8* bitcast (i32 ()* @"\01?m@@YAJXZ" to i8*), i8* %0, i32 1)
- %status = bitcast i8* %2 to i32*
+ %0 = tail call ptr @llvm.eh.recoverfp(ptr @"\01?m@@YAJXZ", ptr %frame_pointer)
+ %1 = tail call ptr @llvm.localrecover(ptr @"\01?m@@YAJXZ", ptr %0, i32 0)
+ %2 = tail call ptr @llvm.localrecover(ptr @"\01?m@@YAJXZ", ptr %0, i32 1)
%agg.tmp = alloca %class.f, align 1
- %3 = bitcast i8* %exception_pointers to i32**
- %4 = load i32*, i32** %3, align 8
- %5 = load i32, i32* %4, align 4
- %6 = bitcast i8* %exception_pointers to %struct.k*
- %7 = getelementptr inbounds %class.f, %class.f* %agg.tmp, i64 0, i32 0, i32 0
- %8 = load i8, i8* %1, align 1
- store i8 %8, i8* %7, align 1
- %call = invoke i32 @"\01?j@@YAJVf@@JPEAUk@@PEAH at Z"(i8 %8, i32 %5, %struct.k* %6, i32* %status)
+ %3 = load ptr, ptr %exception_pointers, align 8
+ %4 = load i32, ptr %3, align 4
+ %5 = load i8, ptr %1, align 1
+ store i8 %5, ptr %agg.tmp, align 1
+ %call = invoke i32 @"\01?j@@YAJVf@@JPEAUk@@PEAH at Z"(i8 %5, i32 %4, ptr %exception_pointers, ptr %2)
to label %invoke.cont unwind label %ehcleanup
invoke.cont: ; preds = %entry
- %g.i = getelementptr inbounds %class.f, %class.f* %agg.tmp, i64 0, i32 0
- call void @"\01??1b@@QEAA at XZ"(%class.b* nonnull %g.i)
+ call void @"\01??1b@@QEAA at XZ"(ptr nonnull %agg.tmp)
ret i32 %call
ehcleanup: ; preds = %entry
- %9 = cleanuppad within none []
- %g.i2 = getelementptr inbounds %class.f, %class.f* %agg.tmp, i64 0, i32 0
- call void @"\01??1b@@QEAA at XZ"(%class.b* nonnull %g.i2) [ "funclet"(token %9) ]
- cleanupret from %9 unwind to caller
+ %6 = cleanuppad within none []
+ call void @"\01??1b@@QEAA at XZ"(ptr nonnull %agg.tmp) [ "funclet"(token %6) ]
+ cleanupret from %6 unwind to caller
}
-declare i8* @llvm.eh.recoverfp(i8*, i8*)
-declare i8* @llvm.localrecover(i8*, i8*, i32)
-declare i32 @"\01?j@@YAJVf@@JPEAUk@@PEAH at Z"(i8, i32, %struct.k*, i32*) local_unnamed_addr
+declare ptr @llvm.eh.recoverfp(ptr, ptr)
+declare ptr @llvm.localrecover(ptr, ptr, i32)
+declare i32 @"\01?j@@YAJVf@@JPEAUk@@PEAH at Z"(i8, i32, ptr, ptr) local_unnamed_addr
declare i32 @__C_specific_handler(...)
-declare void @"\01?h@@YAXPEAH0HPEAIPEAPEAEPEA_K33PEAUd@@4 at Z"(i32*, i32*, i32, i32*, i8**, i64*, i64*, i64*, %struct.d*, %struct.d*) local_unnamed_addr
+declare void @"\01?h@@YAXPEAH0HPEAIPEAPEAEPEA_K33PEAUd@@4 at Z"(ptr, ptr, i32, ptr, ptr, ptr, ptr, ptr, ptr, ptr) local_unnamed_addr
declare i32 @"\01?a@@YAJXZ"() local_unnamed_addr
declare void @llvm.localescape(...)
-declare void @"\01??1b@@QEAA at XZ"(%class.b*) unnamed_addr
+declare void @"\01??1b@@QEAA at XZ"(ptr) unnamed_addr
!llvm.module.flags = !{!0, !1}
!llvm.ident = !{!2}
diff --git a/llvm/test/Transforms/LCSSA/indirectbr.ll b/llvm/test/Transforms/LCSSA/indirectbr.ll
index 0e815bcff9257..7ddfb6bfb223d 100644
--- a/llvm/test/Transforms/LCSSA/indirectbr.ll
+++ b/llvm/test/Transforms/LCSSA/indirectbr.ll
@@ -35,7 +35,7 @@ entry:
"23": ; preds = %"1375", %"22"
%0 = phi i32 [ undef, %"22" ], [ %1, %"1375" ] ; <i32> [#uses=1]
- indirectbr i8* undef, [label %"15", label %"24", label %"25", label %"26", label %"27", label %"28", label %"29", label %"30", label %"32", label %"32", label %"33", label %"167", label %"173", label %"173", label %"173", label %"173", label %"173", label %"192", label %"193", label %"194", label %"196", label %"206", label %"231", label %"241", label %"251", label %"261", label %"307", label %"353", label %"354", label %"355", label %"361", label %"367", label %"400", label %"433", label %"466", label %"499", label %"509", label %"519", label %"529", label %"571", label %"589", label %"607", label %"635", label %"655", label %"664", label %"671", label %"680", label %"687", label %"692", label %"698", label %"704", label %"715", label %"715", label %"716", label %"725", label %"725", label %"725", label %"725", label %"724", label %"724", label %"724", label %"724", label %"737", label %"737", label %"737", label %"737", label %"761", label %"758", label %"759", label %"760", label %"766", label %"763", label %"764", label %"765", label %"771", label %"768", label %"769", label %"770", label %"780", label %"777", label %"778", label %"779", label %"821", label %"826", label %"831", label %"832", label %"833", label %"836", label %"836", label %"886", label %"905", label %"978", label %"978", label %"1136", label %"1166", label %"1179", label %"1201", label %"1212", label %"1212", label %"1274", label %"1284", label %"1284", label %"1346", label %"1347", label %"1348", label %"1349", label %"1350", label %"1353", label %"1353", label %"1353", label %"1355", label %"1355", label %"1357", label %"1357", label %"1358", label %"1359", label %"1374", label %"1375", label %"1376", label %"1377", label %"1378", label %"1379", label %"1386", label %"1395", label %"1394", label %"1425", label %"1426", label %"1440", label %"1449", label %"1455", label %"1461", label %"1471", label %"1482", label %"1484", label %"1486", label %"1489", label %"1489", label %"1492", label %"1494", label %"1494", label %"1497", label %"1499", label %"1499", label %"1515", label %"1546", label %"1546", label %"1566", label %"1584", label %"1587", label %"1591", label %"1605", label %"1609", label %"1609", label %"1640", label %"1648", label %"1651", label %"1703", label %"1710", label %"1718", label %"1724", label %"1725", label %"1726", label %"1727", label %"1728", label %"1731", label %"1732", label %"1733", label %"1734", label %"1735", label %"1741", label %"1750", label %"1752", label %"1754", label %"1755", label %"1757", label %"1759", label %"1761", label %"1764", label %"1764", label %"1766", label %"1768", label %"1775", label %"1775", label %"1781", label %"1781", label %"1790", label %"1827", label %"1836", label %"1836", label %"1845", label %"1845", label %"1848", label %"1849", label %"1851", label %"1853", label %"1856", label %"1861", label %"1861"]
+ indirectbr ptr undef, [label %"15", label %"24", label %"25", label %"26", label %"27", label %"28", label %"29", label %"30", label %"32", label %"32", label %"33", label %"167", label %"173", label %"173", label %"173", label %"173", label %"173", label %"192", label %"193", label %"194", label %"196", label %"206", label %"231", label %"241", label %"251", label %"261", label %"307", label %"353", label %"354", label %"355", label %"361", label %"367", label %"400", label %"433", label %"466", label %"499", label %"509", label %"519", label %"529", label %"571", label %"589", label %"607", label %"635", label %"655", label %"664", label %"671", label %"680", label %"687", label %"692", label %"698", label %"704", label %"715", label %"715", label %"716", label %"725", label %"725", label %"725", label %"725", label %"724", label %"724", label %"724", label %"724", label %"737", label %"737", label %"737", label %"737", label %"761", label %"758", label %"759", label %"760", label %"766", label %"763", label %"764", label %"765", label %"771", label %"768", label %"769", label %"770", label %"780", label %"777", label %"778", label %"779", label %"821", label %"826", label %"831", label %"832", label %"833", label %"836", label %"836", label %"886", label %"905", label %"978", label %"978", label %"1136", label %"1166", label %"1179", label %"1201", label %"1212", label %"1212", label %"1274", label %"1284", label %"1284", label %"1346", label %"1347", label %"1348", label %"1349", label %"1350", label %"1353", label %"1353", label %"1353", label %"1355", label %"1355", label %"1357", label %"1357", label %"1358", label %"1359", label %"1374", label %"1375", label %"1376", label %"1377", label %"1378", label %"1379", label %"1386", label %"1395", label %"1394", label %"1425", label %"1426", label %"1440", label %"1449", label %"1455", label %"1461", label %"1471", label %"1482", label %"1484", label %"1486", label %"1489", label %"1489", label %"1492", label %"1494", label %"1494", label %"1497", label %"1499", label %"1499", label %"1515", label %"1546", label %"1546", label %"1566", label %"1584", label %"1587", label %"1591", label %"1605", label %"1609", label %"1609", label %"1640", label %"1648", label %"1651", label %"1703", label %"1710", label %"1718", label %"1724", label %"1725", label %"1726", label %"1727", label %"1728", label %"1731", label %"1732", label %"1733", label %"1734", label %"1735", label %"1741", label %"1750", label %"1752", label %"1754", label %"1755", label %"1757", label %"1759", label %"1761", label %"1764", label %"1764", label %"1766", label %"1768", label %"1775", label %"1775", label %"1781", label %"1781", label %"1790", label %"1827", label %"1836", label %"1836", label %"1845", label %"1845", label %"1848", label %"1849", label %"1851", label %"1853", label %"1856", label %"1861", label %"1861"]
"24": ; preds = %"23"
unreachable
@@ -554,7 +554,7 @@ lab1:
br i1 undef, label %lab2, label %exit
lab2:
- indirectbr i8* undef, [label %lab1, label %lab3]
+ indirectbr ptr undef, [label %lab1, label %lab3]
lab3:
; CHECK: %tmp21.lcssa1 = phi i32 [ %tmp21.lcssa1, %lab4 ], [ %tmp21, %lab2 ]
diff --git a/llvm/test/Transforms/LCSSA/invoke-dest.ll b/llvm/test/Transforms/LCSSA/invoke-dest.ll
index 453db58c6a133..88f5688e14af1 100644
--- a/llvm/test/Transforms/LCSSA/invoke-dest.ll
+++ b/llvm/test/Transforms/LCSSA/invoke-dest.ll
@@ -2,14 +2,14 @@
target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
- at .str12 = external constant [3 x i8], align 1 ; <[3 x i8]*> [#uses=1]
- at .str17175 = external constant [4 x i8], align 1 ; <[4 x i8]*> [#uses=1]
- at .str21179 = external constant [12 x i8], align 1 ; <[12 x i8]*> [#uses=1]
- at .str25183 = external constant [10 x i8], align 1 ; <[10 x i8]*> [#uses=1]
- at .str32190 = external constant [92 x i8], align 1 ; <[92 x i8]*> [#uses=1]
- at .str41 = external constant [25 x i8], align 1 ; <[25 x i8]*> [#uses=1]
-
-define void @_ZN8EtherBus10initializeEv() personality i32 (...)* @__gxx_personality_v0 {
+ at .str12 = external constant [3 x i8], align 1 ; <ptr> [#uses=1]
+ at .str17175 = external constant [4 x i8], align 1 ; <ptr> [#uses=1]
+ at .str21179 = external constant [12 x i8], align 1 ; <ptr> [#uses=1]
+ at .str25183 = external constant [10 x i8], align 1 ; <ptr> [#uses=1]
+ at .str32190 = external constant [92 x i8], align 1 ; <ptr> [#uses=1]
+ at .str41 = external constant [25 x i8], align 1 ; <ptr> [#uses=1]
+
+define void @_ZN8EtherBus10initializeEv() personality ptr @__gxx_personality_v0 {
entry:
br i1 undef, label %_ZN7cObjectnwEj.exit, label %bb.i
@@ -17,7 +17,7 @@ bb.i: ; preds = %entry
br label %_ZN7cObjectnwEj.exit
_ZN7cObjectnwEj.exit: ; preds = %bb.i, %entry
- invoke void @_ZN7cObjectC2EPKc(i8* undef, i8* getelementptr ([12 x i8], [12 x i8]* @.str21179, i32 0, i32 0))
+ invoke void @_ZN7cObjectC2EPKc(ptr undef, ptr @.str21179)
to label %bb1 unwind label %lpad
bb1: ; preds = %_ZN7cObjectnwEj.exit
@@ -39,22 +39,22 @@ bb2: ; preds = %_ZNK5cGate4sizeEv.exit122
unreachable
bb8: ; preds = %_ZNK5cGate4sizeEv.exit122
- %tmp = invoke i8* @_ZN7cModule3parEPKc(i8* undef, i8* getelementptr ([10 x i8], [10 x i8]* @.str25183, i32 0, i32 0))
- to label %invcont9 unwind label %lpad119 ; <i8*> [#uses=1]
+ %tmp = invoke ptr @_ZN7cModule3parEPKc(ptr undef, ptr @.str25183)
+ to label %invcont9 unwind label %lpad119 ; <ptr> [#uses=1]
invcont9: ; preds = %bb8
- %tmp1 = invoke i8* @_ZN4cPar11stringValueEv(i8* %tmp)
- to label %invcont10 unwind label %lpad119 ; <i8*> [#uses=1]
+ %tmp1 = invoke ptr @_ZN4cPar11stringValueEv(ptr %tmp)
+ to label %invcont10 unwind label %lpad119 ; <ptr> [#uses=1]
invcont10: ; preds = %invcont9
- invoke void @_ZN8EtherBus8tokenizeEPKcRSt6vectorIdSaIdEE(i8* null, i8* %tmp1, i8* undef)
+ invoke void @_ZN8EtherBus8tokenizeEPKcRSt6vectorIdSaIdEE(ptr null, ptr %tmp1, ptr undef)
to label %invcont11 unwind label %lpad119
invcont11: ; preds = %invcont10
br i1 undef, label %bb12, label %bb18
bb12: ; preds = %invcont11
- invoke void (i8*, i8*, ...) @_ZN6cEnvir6printfEPKcz(i8* null, i8* getelementptr ([3 x i8], [3 x i8]* @.str12, i32 0, i32 0), i32 undef)
+ invoke void (ptr, ptr, ...) @_ZN6cEnvir6printfEPKcz(ptr null, ptr @.str12, i32 undef)
to label %bb.i.i159 unwind label %lpad119
bb.i.i159: ; preds = %bb12
@@ -70,14 +70,14 @@ bb.i.i123: ; preds = %bb32
br label %bb34
bb34: ; preds = %bb.i.i123, %bb32, %bb18
- %tmp2 = invoke i8* @_Znaj(i32 undef)
- to label %invcont35 unwind label %lpad119 ; <i8*> [#uses=0]
+ %tmp2 = invoke ptr @_Znaj(i32 undef)
+ to label %invcont35 unwind label %lpad119 ; <ptr> [#uses=0]
invcont35: ; preds = %bb34
br i1 undef, label %bb49, label %bb61
bb49: ; preds = %invcont35
- invoke void (i8*, i8*, ...) @_ZNK13cSimpleModule5errorEPKcz(i8* undef, i8* getelementptr ([92 x i8], [92 x i8]* @.str32190, i32 0, i32 0))
+ invoke void (ptr, ptr, ...) @_ZNK13cSimpleModule5errorEPKcz(ptr undef, ptr @.str32190)
to label %bb51 unwind label %lpad119
bb51: ; preds = %bb49
@@ -87,42 +87,42 @@ bb61: ; preds = %invcont35
br label %bb106
.noexc: ; preds = %bb106
- invoke void @_ZN7cObjectC2EPKc(i8* undef, i8* getelementptr ([25 x i8], [25 x i8]* @.str41, i32 0, i32 0))
+ invoke void @_ZN7cObjectC2EPKc(ptr undef, ptr @.str41)
to label %bb102 unwind label %lpad123
bb102: ; preds = %.noexc
- invoke void undef(i8* undef, i8 zeroext 1)
+ invoke void undef(ptr undef, i8 zeroext 1)
to label %invcont103 unwind label %lpad119
invcont103: ; preds = %bb102
- invoke void undef(i8* undef, double 1.000000e+07)
+ invoke void undef(ptr undef, double 1.000000e+07)
to label %invcont104 unwind label %lpad119
invcont104: ; preds = %invcont103
- %tmp3 = invoke i32 @_ZN13cSimpleModule11sendDelayedEP8cMessagedPKci(i8* undef, i8* undef, double 0.000000e+00, i8* getelementptr ([4 x i8], [4 x i8]* @.str17175, i32 0, i32 0), i32 undef)
+ %tmp3 = invoke i32 @_ZN13cSimpleModule11sendDelayedEP8cMessagedPKci(ptr undef, ptr undef, double 0.000000e+00, ptr @.str17175, i32 undef)
to label %invcont105 unwind label %lpad119 ; <i32> [#uses=0]
invcont105: ; preds = %invcont104
br label %bb106
bb106: ; preds = %invcont105, %bb61
- %tmp4 = invoke i8* @_Znaj(i32 124)
- to label %.noexc unwind label %lpad119 ; <i8*> [#uses=1]
+ %tmp4 = invoke ptr @_Znaj(i32 124)
+ to label %.noexc unwind label %lpad119 ; <ptr> [#uses=1]
lpad: ; preds = %_ZN7cObjectnwEj.exit
- %exn = landingpad {i8*, i32}
+ %exn = landingpad {ptr, i32}
cleanup
br label %Unwind
lpad119: ; preds = %bb106, %invcont104, %invcont103, %bb102, %bb49, %bb34, %bb12, %invcont10, %invcont9, %bb8
- %exn119 = landingpad {i8*, i32}
+ %exn119 = landingpad {ptr, i32}
cleanup
unreachable
lpad123: ; preds = %.noexc
- %exn123 = landingpad {i8*, i32}
+ %exn123 = landingpad {ptr, i32}
cleanup
- %tmp5 = icmp eq i8* %tmp4, null ; <i1> [#uses=1]
+ %tmp5 = icmp eq ptr %tmp4, null ; <i1> [#uses=1]
br i1 %tmp5, label %Unwind, label %bb.i2
bb.i2: ; preds = %lpad123
@@ -134,18 +134,18 @@ Unwind: ; preds = %bb.i2, %lpad123, %lpad
declare i32 @__gxx_personality_v0(...)
-declare void @_ZN8EtherBus8tokenizeEPKcRSt6vectorIdSaIdEE(i8* nocapture, i8*, i8*)
+declare void @_ZN8EtherBus8tokenizeEPKcRSt6vectorIdSaIdEE(ptr nocapture, ptr, ptr)
-declare i8* @_Znaj(i32)
+declare ptr @_Znaj(i32)
-declare void @_ZN6cEnvir6printfEPKcz(i8* nocapture, i8* nocapture, ...)
+declare void @_ZN6cEnvir6printfEPKcz(ptr nocapture, ptr nocapture, ...)
-declare void @_ZNK13cSimpleModule5errorEPKcz(i8* nocapture, i8* nocapture, ...) noreturn
+declare void @_ZNK13cSimpleModule5errorEPKcz(ptr nocapture, ptr nocapture, ...) noreturn
-declare i8* @_ZN7cModule3parEPKc(i8*, i8*)
+declare ptr @_ZN7cModule3parEPKc(ptr, ptr)
-declare i32 @_ZN13cSimpleModule11sendDelayedEP8cMessagedPKci(i8*, i8*, double, i8*, i32)
+declare i32 @_ZN13cSimpleModule11sendDelayedEP8cMessagedPKci(ptr, ptr, double, ptr, i32)
-declare void @_ZN7cObjectC2EPKc(i8*, i8*)
+declare void @_ZN7cObjectC2EPKc(ptr, ptr)
-declare i8* @_ZN4cPar11stringValueEv(i8*)
+declare ptr @_ZN4cPar11stringValueEv(ptr)
diff --git a/llvm/test/Transforms/LCSSA/mixed-catch.ll b/llvm/test/Transforms/LCSSA/mixed-catch.ll
index 407d720f1d15f..3e1485f302423 100644
--- a/llvm/test/Transforms/LCSSA/mixed-catch.ll
+++ b/llvm/test/Transforms/LCSSA/mixed-catch.ll
@@ -21,7 +21,7 @@
; analysis, the LCSSA pass wants to create a PHI node in the catchpad block
; for the catchswitch value, but this is a token, so it can't.
-define void @f() personality i8* bitcast (i32 (...)* @__CxxFrameHandler3 to i8*) {
+define void @f() personality ptr @__CxxFrameHandler3 {
entry:
%tmp = alloca i32, align 4
%i7 = alloca i32, align 4
@@ -37,20 +37,19 @@ for.body: ; preds = %for.cond
br i1 %cond, label %if.then, label %for.inc
if.then: ; preds = %for.body
- store i32 %i.0, i32* %tmp, align 4
- %tmp1 = bitcast i32* %tmp to i8*
- invoke void @_CxxThrowException(i8* %tmp1, %eh.ThrowInfo* nonnull @_TI1H) #1
+ store i32 %i.0, ptr %tmp, align 4
+ invoke void @_CxxThrowException(ptr %tmp, ptr nonnull @_TI1H) #1
to label %unreachable unwind label %catch.dispatch
catch.dispatch: ; preds = %if.then
%tmp2 = catchswitch within none [label %catch, label %catch2] unwind to caller
catch: ; preds = %catch.dispatch
- %tmp3 = catchpad within %tmp2 [%rtti.TypeDescriptor2* @"\01??_R0H at 8", i32 0, i32* %i7]
+ %tmp3 = catchpad within %tmp2 [ptr @"\01??_R0H at 8", i32 0, ptr %i7]
catchret from %tmp3 to label %for.inc
catch2: ; preds = %catch.dispatch
- %tmp4 = catchpad within %tmp2 [i8* null, i32 64, i8* null]
+ %tmp4 = catchpad within %tmp2 [ptr null, i32 64, ptr null]
catchret from %tmp4 to label %for.end
for.inc: ; preds = %catch, %for.body
@@ -70,7 +69,7 @@ unreachable: ; preds = %if.then
; CHECK: %tmp4 = catchpad within %tmp2
; CHECK: catchret from %tmp4 to label %for.end
-%rtti.TypeDescriptor2 = type { i8**, i8*, [3 x i8] }
+%rtti.TypeDescriptor2 = type { ptr, ptr, [3 x i8] }
%eh.CatchableType = type { i32, i32, i32, i32, i32, i32, i32 }
%eh.CatchableTypeArray.1 = type { i32, [1 x i32] }
%eh.ThrowInfo = type { i32, i32, i32, i32 }
@@ -83,13 +82,13 @@ $_CTA1H = comdat any
$_TI1H = comdat any
-@"\01??_7type_info@@6B@" = external constant i8*
-@"\01??_R0H at 8" = linkonce_odr global %rtti.TypeDescriptor2 { i8** @"\01??_7type_info@@6B@", i8* null, [3 x i8] c".H\00" }, comdat
+@"\01??_7type_info@@6B@" = external constant ptr
+@"\01??_R0H at 8" = linkonce_odr global %rtti.TypeDescriptor2 { ptr @"\01??_7type_info@@6B@", ptr null, [3 x i8] c".H\00" }, comdat
@__ImageBase = external constant i8
-@"_CT??_R0H at 84" = linkonce_odr unnamed_addr constant %eh.CatchableType { i32 1, i32 trunc (i64 sub nuw nsw (i64 ptrtoint (%rtti.TypeDescriptor2* @"\01??_R0H at 8" to i64), i64 ptrtoint (i8* @__ImageBase to i64)) to i32), i32 0, i32 -1, i32 0, i32 4, i32 0 }, section ".xdata", comdat
- at _CTA1H = linkonce_odr unnamed_addr constant %eh.CatchableTypeArray.1 { i32 1, [1 x i32] [i32 trunc (i64 sub nuw nsw (i64 ptrtoint (%eh.CatchableType* @"_CT??_R0H at 84" to i64), i64 ptrtoint (i8* @__ImageBase to i64)) to i32)] }, section ".xdata", comdat
- at _TI1H = linkonce_odr unnamed_addr constant %eh.ThrowInfo { i32 0, i32 0, i32 0, i32 trunc (i64 sub nuw nsw (i64 ptrtoint (%eh.CatchableTypeArray.1* @_CTA1H to i64), i64 ptrtoint (i8* @__ImageBase to i64)) to i32) }, section ".xdata", comdat
+@"_CT??_R0H at 84" = linkonce_odr unnamed_addr constant %eh.CatchableType { i32 1, i32 trunc (i64 sub nuw nsw (i64 ptrtoint (ptr @"\01??_R0H at 8" to i64), i64 ptrtoint (ptr @__ImageBase to i64)) to i32), i32 0, i32 -1, i32 0, i32 4, i32 0 }, section ".xdata", comdat
+ at _CTA1H = linkonce_odr unnamed_addr constant %eh.CatchableTypeArray.1 { i32 1, [1 x i32] [i32 trunc (i64 sub nuw nsw (i64 ptrtoint (ptr @"_CT??_R0H at 84" to i64), i64 ptrtoint (ptr @__ImageBase to i64)) to i32)] }, section ".xdata", comdat
+ at _TI1H = linkonce_odr unnamed_addr constant %eh.ThrowInfo { i32 0, i32 0, i32 0, i32 trunc (i64 sub nuw nsw (i64 ptrtoint (ptr @_CTA1H to i64), i64 ptrtoint (ptr @__ImageBase to i64)) to i32) }, section ".xdata", comdat
-declare void @_CxxThrowException(i8*, %eh.ThrowInfo*)
+declare void @_CxxThrowException(ptr, ptr)
declare i32 @__CxxFrameHandler3(...)
diff --git a/llvm/test/Transforms/LCSSA/pr44058.ll b/llvm/test/Transforms/LCSSA/pr44058.ll
index b6fa92ab7cb2b..ce0ca16d833bb 100644
--- a/llvm/test/Transforms/LCSSA/pr44058.ll
+++ b/llvm/test/Transforms/LCSSA/pr44058.ll
@@ -4,13 +4,13 @@
; SCEV caches. Second SCEV verification checks if the caches are in valid state.
; Check that the second SCEV verification doesn't fail.
-define void @foo(i32* %arg, i32* %arg1, i1 %arg2) {
+define void @foo(ptr %arg, ptr %arg1, i1 %arg2) {
bb:
br label %bb3
bb3: ; preds = %bb13, %bb
- %tmp = load i32, i32* %arg
- %tmp4 = load i32, i32* %arg1
+ %tmp = load i32, ptr %arg
+ %tmp4 = load i32, ptr %arg1
%tmp5 = add i32 %tmp4, %tmp
%tmp6 = icmp sgt i32 %tmp5, %tmp
br i1 %tmp6, label %bb7, label %bb11
diff --git a/llvm/test/Transforms/LCSSA/pr44320.ll b/llvm/test/Transforms/LCSSA/pr44320.ll
index b6082ac96ed70..1bc831b0c8d9b 100644
--- a/llvm/test/Transforms/LCSSA/pr44320.ll
+++ b/llvm/test/Transforms/LCSSA/pr44320.ll
@@ -4,7 +4,7 @@
; SCEV caches. Second SCEV verification checks if the caches are in valid state.
; Check that the second SCEV verification doesn't fail.
-define void @test(i32* %arg, i32* %arg1, i1 %arg2, i1 %arg3) {
+define void @test(ptr %arg, ptr %arg1, i1 %arg2, i1 %arg3) {
bb:
br label %bb6
@@ -15,8 +15,8 @@ bb6:
br label %bb7
bb7:
- %tmp = load i32, i32* %arg
- %tmp8 = load i32, i32* %arg1
+ %tmp = load i32, ptr %arg
+ %tmp8 = load i32, ptr %arg1
%tmp9 = add i32 %tmp8, %tmp
%tmp10 = icmp sgt i32 %tmp9, %tmp
br i1 %tmp10, label %bb11, label %bb17
More information about the llvm-commits
mailing list