[llvm] 1565591 - [LTO] Convert tests to opaque pointers (NFC)

Nikita Popov via llvm-commits llvm-commits at lists.llvm.org
Wed Dec 14 03:42:17 PST 2022


Author: Nikita Popov
Date: 2022-12-14T12:42:10+01:00
New Revision: 15655915b38600c28f58721950ae75e6284763b6

URL: https://github.com/llvm/llvm-project/commit/15655915b38600c28f58721950ae75e6284763b6
DIFF: https://github.com/llvm/llvm-project/commit/15655915b38600c28f58721950ae75e6284763b6.diff

LOG: [LTO] Convert tests to opaque pointers (NFC)

Added: 
    

Modified: 
    llvm/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll
    llvm/test/LTO/Resolution/X86/Inputs/appending-var-2.ll
    llvm/test/LTO/Resolution/X86/Inputs/comdat.ll
    llvm/test/LTO/Resolution/X86/Inputs/common2.ll
    llvm/test/LTO/Resolution/X86/Inputs/dead-strip-fulllto.ll
    llvm/test/LTO/Resolution/X86/Inputs/ifunc2.ll
    llvm/test/LTO/Resolution/X86/Inputs/intrinsic.ll
    llvm/test/LTO/Resolution/X86/Inputs/no-undef-type-md.ll
    llvm/test/LTO/Resolution/X86/alias.ll
    llvm/test/LTO/Resolution/X86/appending-var.ll
    llvm/test/LTO/Resolution/X86/available-externally.ll
    llvm/test/LTO/Resolution/X86/cache-dso-local.ll
    llvm/test/LTO/Resolution/X86/cache-prevailing.ll
    llvm/test/LTO/Resolution/X86/common2.ll
    llvm/test/LTO/Resolution/X86/dead-strip-alias.ll
    llvm/test/LTO/Resolution/X86/export-jumptable-noncanonical.ll
    llvm/test/LTO/Resolution/X86/export-jumptable.ll
    llvm/test/LTO/Resolution/X86/function-alias-non-prevailing.ll
    llvm/test/LTO/Resolution/X86/ifunc.ll
    llvm/test/LTO/Resolution/X86/intrinsic.ll
    llvm/test/LTO/Resolution/X86/load-sample-prof-icp.ll
    llvm/test/LTO/Resolution/X86/lowertypetests.ll
    llvm/test/LTO/Resolution/X86/no-undef-type-md.ll
    llvm/test/LTO/Resolution/X86/not-prevailing-alias.ll
    llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll
    llvm/test/LTO/Resolution/X86/not-prevailing-weak-aliasee.ll
    llvm/test/LTO/Resolution/X86/setting-dso-local.ll
    llvm/test/LTO/Resolution/X86/symtab-elf.ll
    llvm/test/LTO/Resolution/X86/symtab.ll
    llvm/test/LTO/Resolution/X86/type-checked-load.ll
    llvm/test/LTO/X86/Inputs/remangle_intrinsics_tbaa.ll
    llvm/test/LTO/X86/remangle_intrinsics_tbaa.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll b/llvm/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll
index 4ee753e403f40..7c59620e58c32 100644
--- a/llvm/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll
+++ b/llvm/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll
@@ -2,4 +2,4 @@ target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16
 target triple = "x86_64-unknown-linux-gnu"
 
 @a = external global i32
- at d = global i32* @a
+ at d = global ptr @a

diff  --git a/llvm/test/LTO/Resolution/X86/Inputs/appending-var-2.ll b/llvm/test/LTO/Resolution/X86/Inputs/appending-var-2.ll
index 1cd01d789d3ba..ab05da9f9fbb9 100644
--- a/llvm/test/LTO/Resolution/X86/Inputs/appending-var-2.ll
+++ b/llvm/test/LTO/Resolution/X86/Inputs/appending-var-2.ll
@@ -3,10 +3,10 @@ target triple = "x86_64-unknown-linux-gnu"
 
 %"foo" = type { i8 }
 
- at llvm.used = appending global [1 x i8*] [i8* bitcast (i32 (%"foo"*)* @bar to i8*)], section "llvm.metadata"
+ at llvm.used = appending global [1 x ptr] [ptr @bar], section "llvm.metadata"
 
 ; Function Attrs: norecurse nounwind readnone uwtable
-define dso_local i32 @bar(%"foo"* nocapture readnone %this) align 2 !type !0 {
+define dso_local i32 @bar(ptr nocapture readnone %this) align 2 !type !0 {
 entry:
   ret i32 0
 }

diff  --git a/llvm/test/LTO/Resolution/X86/Inputs/comdat.ll b/llvm/test/LTO/Resolution/X86/Inputs/comdat.ll
index 52cadf39a318f..4360fa83e5267 100644
--- a/llvm/test/LTO/Resolution/X86/Inputs/comdat.ll
+++ b/llvm/test/LTO/Resolution/X86/Inputs/comdat.ll
@@ -9,20 +9,20 @@ $c1 = comdat any
 @will_be_undefined = global i32 1, comdat($c1)
 
 @v1 = weak_odr global i32 41, comdat($c2)
-define weak_odr protected i32 @f1(i8* %this) comdat($c2) {
+define weak_odr protected i32 @f1(ptr %this) comdat($c2) {
 bb20:
-  store i8* %this, i8** null
+  store ptr %this, ptr null
   br label %bb21
 bb21:
   ret i32 41
 }
 
- at r21 = global i32* @v1
- at r22 = global i32(i8*)* @f1
+ at r21 = global ptr @v1
+ at r22 = global ptr @f1
 
- at a21 = alias i32, i32* @v1
- at a22 = alias i16, bitcast (i32* @v1 to i16*)
+ at a21 = alias i32, ptr @v1
+ at a22 = alias i16, ptr @v1
 
- at a23 = alias i32(i8*), i32(i8*)* @f1
- at a24 = alias i16, bitcast (i32(i8*)* @f1 to i16*)
- at a25 = alias i16, i16* @a24
+ at a23 = alias i32(ptr), ptr @f1
+ at a24 = alias i16, ptr @f1
+ at a25 = alias i16, ptr @a24

diff  --git a/llvm/test/LTO/Resolution/X86/Inputs/common2.ll b/llvm/test/LTO/Resolution/X86/Inputs/common2.ll
index 3a4c631ad6557..3feaed5d7af7e 100644
--- a/llvm/test/LTO/Resolution/X86/Inputs/common2.ll
+++ b/llvm/test/LTO/Resolution/X86/Inputs/common2.ll
@@ -3,6 +3,6 @@ target triple = "x86_64-unknown-linux-gnu"
 
 @v = common global i16 0, align 4
 
-define i16 *@bar() {
- ret i16 *@v
+define ptr @bar() {
+ ret ptr @v
 }

diff  --git a/llvm/test/LTO/Resolution/X86/Inputs/dead-strip-fulllto.ll b/llvm/test/LTO/Resolution/X86/Inputs/dead-strip-fulllto.ll
index cfe1544a6b9aa..0c2cf1a006df9 100644
--- a/llvm/test/LTO/Resolution/X86/Inputs/dead-strip-fulllto.ll
+++ b/llvm/test/LTO/Resolution/X86/Inputs/dead-strip-fulllto.ll
@@ -15,8 +15,8 @@ define void @dead1() {
 
 declare void @dead2()
 
-define linkonce_odr i8* @odr() {
-  ret i8* bitcast (void ()* @dead3 to i8*)
+define linkonce_odr ptr @odr() {
+  ret ptr @dead3
 }
 
 define internal void @dead3() {

diff  --git a/llvm/test/LTO/Resolution/X86/Inputs/ifunc2.ll b/llvm/test/LTO/Resolution/X86/Inputs/ifunc2.ll
index 09403e47de58a..24ea0e58142c1 100644
--- a/llvm/test/LTO/Resolution/X86/Inputs/ifunc2.ll
+++ b/llvm/test/LTO/Resolution/X86/Inputs/ifunc2.ll
@@ -1,6 +1,6 @@
 target datalayout = "e-p:64:64"
 target triple = "x86_64-unknown-linux-gnu"
 
-define i32 ()* @foo_resolver() {
-  ret i32 ()* inttoptr (i32 2 to i32 ()*)
+define ptr @foo_resolver() {
+  ret ptr inttoptr (i32 2 to ptr)
 }

diff  --git a/llvm/test/LTO/Resolution/X86/Inputs/intrinsic.ll b/llvm/test/LTO/Resolution/X86/Inputs/intrinsic.ll
index 82a7c2e31451b..a3f641f990329 100644
--- a/llvm/test/LTO/Resolution/X86/Inputs/intrinsic.ll
+++ b/llvm/test/LTO/Resolution/X86/Inputs/intrinsic.ll
@@ -1,4 +1,4 @@
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 %foo = type {  }
-declare <4 x %foo*> @llvm.masked.load.v4p0foo.p0v4p0foo(<4 x %foo*>*, i32, <4 x i1>, <4 x %foo*>)
+declare <4 x ptr> @llvm.masked.load.v4p0.p0(ptr, i32, <4 x i1>, <4 x ptr>)

diff  --git a/llvm/test/LTO/Resolution/X86/Inputs/no-undef-type-md.ll b/llvm/test/LTO/Resolution/X86/Inputs/no-undef-type-md.ll
index 94166f39e2ae3..e985429750488 100644
--- a/llvm/test/LTO/Resolution/X86/Inputs/no-undef-type-md.ll
+++ b/llvm/test/LTO/Resolution/X86/Inputs/no-undef-type-md.ll
@@ -10,4 +10,4 @@ declare void @a()
 !9 = !{i32 1, !"EnableSplitLTOUnit", i32 1}
 !39 = !{i32 5, !"CG Profile", !40}
 !40 = !{!41}
-!41 = distinct !{null, i32 ()* bitcast (void ()* @a to i32 ()*), i64 2594092}
+!41 = distinct !{null, ptr @a, i64 2594092}

diff  --git a/llvm/test/LTO/Resolution/X86/alias.ll b/llvm/test/LTO/Resolution/X86/alias.ll
index f565e4d234cd9..5cba4729e227e 100644
--- a/llvm/test/LTO/Resolution/X86/alias.ll
+++ b/llvm/test/LTO/Resolution/X86/alias.ll
@@ -18,5 +18,5 @@
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
- at a = weak alias i32, i32* @b
+ at a = weak alias i32, ptr @b
 @b = global i32 1

diff  --git a/llvm/test/LTO/Resolution/X86/appending-var.ll b/llvm/test/LTO/Resolution/X86/appending-var.ll
index 684e64129d65f..7eca072bc6ef7 100644
--- a/llvm/test/LTO/Resolution/X86/appending-var.ll
+++ b/llvm/test/LTO/Resolution/X86/appending-var.ll
@@ -11,6 +11,6 @@ target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16
 target triple = "x86_64-unknown-linux-gnu"
 
 %"foo.1" = type { i8, i8 }
-declare dso_local i32 @bar(%"foo.1"* nocapture readnone %this) local_unnamed_addr
+declare dso_local i32 @bar(ptr nocapture readnone %this) local_unnamed_addr
 
- at llvm.used = appending global [1 x i8*] [i8* bitcast (i32 (%"foo.1"*)* @bar to i8*)], section "llvm.metadata"
+ at llvm.used = appending global [1 x ptr] [ptr @bar], section "llvm.metadata"

diff  --git a/llvm/test/LTO/Resolution/X86/available-externally.ll b/llvm/test/LTO/Resolution/X86/available-externally.ll
index ac35b15b3710e..79d4667f54c9a 100644
--- a/llvm/test/LTO/Resolution/X86/available-externally.ll
+++ b/llvm/test/LTO/Resolution/X86/available-externally.ll
@@ -7,8 +7,8 @@
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-define void ()* @foo() {
-  ret void ()* @bar
+define ptr @foo() {
+  ret ptr @bar
 }
 
 define available_externally void @bar() {

diff  --git a/llvm/test/LTO/Resolution/X86/cache-dso-local.ll b/llvm/test/LTO/Resolution/X86/cache-dso-local.ll
index 6ed8e056b2ccc..a4b94f28391cc 100644
--- a/llvm/test/LTO/Resolution/X86/cache-dso-local.ll
+++ b/llvm/test/LTO/Resolution/X86/cache-dso-local.ll
@@ -17,6 +17,6 @@ define weak void @foo() {
   ret void
 }
 
-define weak void()* @bar() {
-  ret void()* @foo
+define weak ptr @bar() {
+  ret ptr @foo
 }

diff  --git a/llvm/test/LTO/Resolution/X86/cache-prevailing.ll b/llvm/test/LTO/Resolution/X86/cache-prevailing.ll
index 72a1d4e6f5310..f8c9a6945268f 100644
--- a/llvm/test/LTO/Resolution/X86/cache-prevailing.ll
+++ b/llvm/test/LTO/Resolution/X86/cache-prevailing.ll
@@ -13,6 +13,6 @@ target triple = "x86_64-pc-windows-msvc19.11.0"
 @foo = linkonce constant i32 1, comdat
 $foo = comdat any
 
-define i32* @bar() {
-  ret i32* @foo
+define ptr @bar() {
+  ret ptr @foo
 }

diff  --git a/llvm/test/LTO/Resolution/X86/common2.ll b/llvm/test/LTO/Resolution/X86/common2.ll
index c0447b75b823a..87d94953ab4fd 100644
--- a/llvm/test/LTO/Resolution/X86/common2.ll
+++ b/llvm/test/LTO/Resolution/X86/common2.ll
@@ -65,6 +65,6 @@ target triple = "x86_64-unknown-linux-gnu"
 ; NONE-PREVAILED1: @v = external global i8, align 8
 ; NONE-PREVAILED2: @v = external global i16, align 4
 
-define i8 *@foo() {
- ret i8 *@v
+define ptr @foo() {
+ ret ptr @v
 }

diff  --git a/llvm/test/LTO/Resolution/X86/dead-strip-alias.ll b/llvm/test/LTO/Resolution/X86/dead-strip-alias.ll
index d62621acc8e15..5ac7597144228 100644
--- a/llvm/test/LTO/Resolution/X86/dead-strip-alias.ll
+++ b/llvm/test/LTO/Resolution/X86/dead-strip-alias.ll
@@ -10,11 +10,11 @@
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
- at alias = alias i8*, i8** @internal
+ at alias = alias ptr, ptr @internal
 
- at internal = internal global i8* @external
+ at internal = internal global ptr @external
 @external = external global i8
 
-define i8** @main() {
-  ret i8** @alias
+define ptr @main() {
+  ret ptr @alias
 }

diff  --git a/llvm/test/LTO/Resolution/X86/export-jumptable-noncanonical.ll b/llvm/test/LTO/Resolution/X86/export-jumptable-noncanonical.ll
index 21221751520fc..0a64204f3274a 100644
--- a/llvm/test/LTO/Resolution/X86/export-jumptable-noncanonical.ll
+++ b/llvm/test/LTO/Resolution/X86/export-jumptable-noncanonical.ll
@@ -20,13 +20,12 @@ define void @f2() !type !1 {
 }
 
 define i1 @_start(i1 %i) {
-  %1 = select i1 %i, void ()* @f1, void ()* @f2
-  %2 = bitcast void ()* %1 to i8*
-  %3 = call i1 @llvm.type.test(i8* %2, metadata !"typeid1")
-  ret i1 %3
+  %1 = select i1 %i, ptr @f1, ptr @f2
+  %2 = call i1 @llvm.type.test(ptr %1, metadata !"typeid1")
+  ret i1 %2
 }
 
-declare i1 @llvm.type.test(i8*, metadata)
+declare i1 @llvm.type.test(ptr, metadata)
 
 !llvm.module.flags = !{!2}
 

diff  --git a/llvm/test/LTO/Resolution/X86/export-jumptable.ll b/llvm/test/LTO/Resolution/X86/export-jumptable.ll
index ec23d15591386..e7a583f5d80ea 100644
--- a/llvm/test/LTO/Resolution/X86/export-jumptable.ll
+++ b/llvm/test/LTO/Resolution/X86/export-jumptable.ll
@@ -20,13 +20,12 @@ define void @f2() !type !1 {
 }
 
 define i1 @_start(i1 %i) {
-  %1 = select i1 %i, void ()* @f1, void ()* @f2
-  %2 = bitcast void ()* %1 to i8*
-  %3 = call i1 @llvm.type.test(i8* %2, metadata !"typeid1")
-  ret i1 %3
+  %1 = select i1 %i, ptr @f1, ptr @f2
+  %2 = call i1 @llvm.type.test(ptr %1, metadata !"typeid1")
+  ret i1 %2
 }
 
-declare i1 @llvm.type.test(i8*, metadata)
+declare i1 @llvm.type.test(ptr, metadata)
 
 !0 = !{i64 0, !"typeid1"}
 !1 = !{i64 0, !"typeid2"}

diff  --git a/llvm/test/LTO/Resolution/X86/function-alias-non-prevailing.ll b/llvm/test/LTO/Resolution/X86/function-alias-non-prevailing.ll
index cc793f64d9d6f..d17d0461c6e3e 100644
--- a/llvm/test/LTO/Resolution/X86/function-alias-non-prevailing.ll
+++ b/llvm/test/LTO/Resolution/X86/function-alias-non-prevailing.ll
@@ -6,12 +6,12 @@ target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16
 target triple = "x86_64--fuchsia"
 
 ; CHECK: declare void @foo()
- at foo = weak alias void(), void()* @bar
+ at foo = weak alias void(), ptr @bar
 
 define internal void @bar() {
   ret void
 }
 
-define void()* @baz() {
-  ret void()* @foo
+define ptr @baz() {
+  ret ptr @foo
 }

diff  --git a/llvm/test/LTO/Resolution/X86/ifunc.ll b/llvm/test/LTO/Resolution/X86/ifunc.ll
index d4a2d5bd608fe..81d28d2bc9c73 100644
--- a/llvm/test/LTO/Resolution/X86/ifunc.ll
+++ b/llvm/test/LTO/Resolution/X86/ifunc.ll
@@ -7,9 +7,9 @@
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
- at foo = ifunc i32 (i32), i32 (i32)* ()* @foo_resolver
+ at foo = ifunc i32 (i32), ptr @foo_resolver
 
-define internal i32 (i32)* @foo_resolver() {
+define internal ptr @foo_resolver() {
 entry:
-  ret i32 (i32)* null
+  ret ptr null
 }

diff  --git a/llvm/test/LTO/Resolution/X86/intrinsic.ll b/llvm/test/LTO/Resolution/X86/intrinsic.ll
index 597953155fe5f..15bfbd5f85cb6 100644
--- a/llvm/test/LTO/Resolution/X86/intrinsic.ll
+++ b/llvm/test/LTO/Resolution/X86/intrinsic.ll
@@ -5,4 +5,4 @@
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 %foo = type {  }
-declare void @foo( %foo*  )
+declare void @foo( ptr  )

diff  --git a/llvm/test/LTO/Resolution/X86/load-sample-prof-icp.ll b/llvm/test/LTO/Resolution/X86/load-sample-prof-icp.ll
index 82d3eb18672af..4328240a700d7 100644
--- a/llvm/test/LTO/Resolution/X86/load-sample-prof-icp.ll
+++ b/llvm/test/LTO/Resolution/X86/load-sample-prof-icp.ll
@@ -13,10 +13,10 @@ target triple = "x86_64-unknown-linux-gnu"
 ; CHECK-LABEL: @test
 ; Checks that the call instruction is promoted to direct call and has
 ; profile count annotated on the direct call.
-define void @test(void ()*) #0 !dbg !7 {
-  %2 = alloca void ()*
-  store void ()* %0, void ()** %2
-  %3 = load void ()*, void ()** %2
+define void @test(ptr) #0 !dbg !7 {
+  %2 = alloca ptr
+  store ptr %0, ptr %2
+  %3 = load ptr, ptr %2
   ; CHECK: call void @bar(),{{.*}}!prof
   call void %3(), !dbg !10
   ret void

diff  --git a/llvm/test/LTO/Resolution/X86/lowertypetests.ll b/llvm/test/LTO/Resolution/X86/lowertypetests.ll
index 8016a66fb015d..00f270827296f 100644
--- a/llvm/test/LTO/Resolution/X86/lowertypetests.ll
+++ b/llvm/test/LTO/Resolution/X86/lowertypetests.ll
@@ -14,19 +14,19 @@ target triple = "x86_64-unknown-linux-gnu"
 @foo = global i32 0, !type !0
 @bar = global i32 0, !type !1
 
-define i1 @f(i8* %ptr) {
-  %p = call i1 @llvm.type.test(i8* %ptr, metadata !"foo")
+define i1 @f(ptr %ptr) {
+  %p = call i1 @llvm.type.test(ptr %ptr, metadata !"foo")
   ret i1 %p
 }
 
- at g_alias = alias i1 (i8*), i1 (i8*)* @g
+ at g_alias = alias i1 (ptr), ptr @g
 
-define internal i1 @g(i8* %ptr) {
-  %p = call i1 @llvm.type.test(i8* %ptr, metadata !"bar")
+define internal i1 @g(ptr %ptr) {
+  %p = call i1 @llvm.type.test(ptr %ptr, metadata !"bar")
   ret i1 %p
 }
 
-declare i1 @llvm.type.test(i8* %ptr, metadata %typeid) nounwind readnone
+declare i1 @llvm.type.test(ptr %ptr, metadata %typeid) nounwind readnone
 
 !0 = !{i32 0, !"foo"}
 !1 = !{i32 0, !"bar"}

diff  --git a/llvm/test/LTO/Resolution/X86/no-undef-type-md.ll b/llvm/test/LTO/Resolution/X86/no-undef-type-md.ll
index 8748375c84315..0ea7794941597 100644
--- a/llvm/test/LTO/Resolution/X86/no-undef-type-md.ll
+++ b/llvm/test/LTO/Resolution/X86/no-undef-type-md.ll
@@ -10,7 +10,7 @@
 ; RUN: llvm-nm %t-obj.o.0 %t-obj.o.1 -S | FileCheck %s
 
 ; ERROR-NOT: expected a Function or null
-; ERROR-NOT: i32 (%0*, i32*)* undef
+; ERROR-NOT: ptr undef
 
 ; CHECK: -obj.o.0:
 ; CHECK: -obj.o.1:
@@ -34,4 +34,4 @@ entry:
 
 !39 = !{i32 5, !"CG Profile", !40}
 !40 = !{!41}
-!41 = !{i32 ()* @b, i32 ()* @a, i64 2594092}
+!41 = !{ptr @b, ptr @a, i64 2594092}

diff  --git a/llvm/test/LTO/Resolution/X86/not-prevailing-alias.ll b/llvm/test/LTO/Resolution/X86/not-prevailing-alias.ll
index d08253446250d..e7c135c2edf93 100644
--- a/llvm/test/LTO/Resolution/X86/not-prevailing-alias.ll
+++ b/llvm/test/LTO/Resolution/X86/not-prevailing-alias.ll
@@ -28,16 +28,16 @@
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
- at barAlias = alias void(), void()* @bar
+ at barAlias = alias void(), ptr @bar
 define void @bar() {
   ret void
 }
 
 @var = global i32 99
- at varAlias = alias i32, i32* @var
+ at varAlias = alias i32, ptr @var
 
 define i32 @zed() {
   call void @barAlias()
-  %1 = load i32, i32* @varAlias, align 4
+  %1 = load i32, ptr @varAlias, align 4
   ret i32 %1
 }

diff  --git a/llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll b/llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll
index e6f8e370f2ed5..33c8e435b9ecb 100644
--- a/llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll
+++ b/llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll
@@ -26,12 +26,12 @@ target triple = "x86_64-unknown-linux-gnu"
 
 @var1 = global i32 10, align 4
 define i32 @testVar1() {
-  %1 = load i32, i32* @var1, align 4
+  %1 = load i32, ptr @var1, align 4
   ret i32 %1
 }
 
 @var2 = global i32 11, align 4
 define i32 @testVar2() {
-  %1 = load i32, i32* @var2, align 4
+  %1 = load i32, ptr @var2, align 4
   ret i32 %1
 }

diff  --git a/llvm/test/LTO/Resolution/X86/not-prevailing-weak-aliasee.ll b/llvm/test/LTO/Resolution/X86/not-prevailing-weak-aliasee.ll
index 0112a3871b218..7636ea882067d 100644
--- a/llvm/test/LTO/Resolution/X86/not-prevailing-weak-aliasee.ll
+++ b/llvm/test/LTO/Resolution/X86/not-prevailing-weak-aliasee.ll
@@ -18,14 +18,14 @@
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
- at a = hidden alias void (), void ()* @__a
+ at a = hidden alias void (), ptr @__a
 
 define weak hidden void @__a() {
 entry:
   ret void
 }
 
- at b = hidden alias void (), void ()* @__b
+ at b = hidden alias void (), ptr @__b
 
 define weak hidden void @__b() {
 entry:

diff  --git a/llvm/test/LTO/Resolution/X86/setting-dso-local.ll b/llvm/test/LTO/Resolution/X86/setting-dso-local.ll
index bd9351e915118..7574026b78fa2 100644
--- a/llvm/test/LTO/Resolution/X86/setting-dso-local.ll
+++ b/llvm/test/LTO/Resolution/X86/setting-dso-local.ll
@@ -10,6 +10,6 @@ target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16
 target triple = "x86_64-unknown-linux-gnu"
 
 @foobar = external hidden global i32
-define i32* @_start() {
-  ret i32* @foobar
+define ptr @_start() {
+  ret ptr @foobar
 }

diff  --git a/llvm/test/LTO/Resolution/X86/symtab-elf.ll b/llvm/test/LTO/Resolution/X86/symtab-elf.ll
index 229151179923d..ba93b5a1476e6 100644
--- a/llvm/test/LTO/Resolution/X86/symtab-elf.ll
+++ b/llvm/test/LTO/Resolution/X86/symtab-elf.ll
@@ -18,4 +18,4 @@ target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16
 @g1 = global i32 0
 
 ; CHECK-NOT: fallback g1
- at g2 = weak alias i32, i32* @g1
+ at g2 = weak alias i32, ptr @g1

diff  --git a/llvm/test/LTO/Resolution/X86/symtab.ll b/llvm/test/LTO/Resolution/X86/symtab.ll
index 88d71ca1bcbd7..7779c802d96ea 100644
--- a/llvm/test/LTO/Resolution/X86/symtab.ll
+++ b/llvm/test/LTO/Resolution/X86/symtab.ll
@@ -72,4 +72,4 @@ $g12 = comdat nodeduplicate
 ; CHECK: D--WI--- _a1
 ; CHECK-NEXT: comdat any _g9
 ; CHECK-NEXT: fallback _g9
- at a1 = weak alias i32, i32* @g9
+ at a1 = weak alias i32, ptr @g9

diff  --git a/llvm/test/LTO/Resolution/X86/type-checked-load.ll b/llvm/test/LTO/Resolution/X86/type-checked-load.ll
index 726dc970195f3..68d6898a8b102 100644
--- a/llvm/test/LTO/Resolution/X86/type-checked-load.ll
+++ b/llvm/test/LTO/Resolution/X86/type-checked-load.ll
@@ -8,9 +8,9 @@
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-define {i8*, i1} @foo(i8* %ptr) {
-  %pair = call {i8*, i1} @llvm.type.checked.load(i8* %ptr, i32 16, metadata !"foo")
-  ret {i8*, i1} %pair
+define {ptr, i1} @foo(ptr %ptr) {
+  %pair = call {ptr, i1} @llvm.type.checked.load(ptr %ptr, i32 16, metadata !"foo")
+  ret {ptr, i1} %pair
 }
 
-declare {i8*, i1} @llvm.type.checked.load(i8* %ptr, i32 %offset, metadata %type)
+declare {ptr, i1} @llvm.type.checked.load(ptr %ptr, i32 %offset, metadata %type)

diff  --git a/llvm/test/LTO/X86/Inputs/remangle_intrinsics_tbaa.ll b/llvm/test/LTO/X86/Inputs/remangle_intrinsics_tbaa.ll
index e213c2155c239..11f732e39b33c 100644
--- a/llvm/test/LTO/X86/Inputs/remangle_intrinsics_tbaa.ll
+++ b/llvm/test/LTO/X86/Inputs/remangle_intrinsics_tbaa.ll
@@ -3,6 +3,6 @@ target triple = "x86_64-apple-macosx10.11.0"
 
 %some_named_struct = type { i8, i8 }
 
-define void @bar(%some_named_struct*) {
+define void @bar(ptr) {
   ret void
 }

diff  --git a/llvm/test/LTO/X86/remangle_intrinsics_tbaa.ll b/llvm/test/LTO/X86/remangle_intrinsics_tbaa.ll
index 30c27dfd5ec5a..d39f8693a5042 100644
--- a/llvm/test/LTO/X86/remangle_intrinsics_tbaa.ll
+++ b/llvm/test/LTO/X86/remangle_intrinsics_tbaa.ll
@@ -3,19 +3,19 @@
 ; RUN: llvm-link -disable-lazy-loading %t2.bc %t1.bc -S | FileCheck %s
 
 ; Verify that we correctly rename the intrinsic and don't crash
-; CHECK: @llvm.masked.store.v4p0s_some_named_struct.0s.p0v4p0s_some_named_struct.0s
+; CHECK: @llvm.masked.store.v4p0.p0
 
 target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 %some_named_struct = type { i8 }
 
-define void @foo(%some_named_struct*) {
-  call void @llvm.masked.store.v4p0some_named_struct.p0v4p0some_named_struct(<4 x %some_named_struct*> undef, <4 x %some_named_struct*>* undef, i32 8, <4 x i1> undef), !tbaa !5
+define void @foo(ptr) {
+  call void @llvm.masked.store.v4p0.p0(<4 x ptr> undef, ptr undef, i32 8, <4 x i1> undef), !tbaa !5
   ret void
 }
 
-declare void @llvm.masked.store.v4p0some_named_struct.p0v4p0some_named_struct(<4 x %some_named_struct*>, <4 x %some_named_struct*>*, i32, <4 x i1>) #1
+declare void @llvm.masked.store.v4p0.p0(<4 x ptr>, ptr, i32, <4 x i1>) #1
 
 !5 = !{!6, !6, i64 0}
 !6 = !{!"any pointer", !7, i64 0}


        


More information about the llvm-commits mailing list