llvm/tools: Convert tests to opaque pointers

llvm · Nov 28, 2022 · a273c40 · a273c40
1 parent 270f63b
commit a273c40
Show file tree

Hide file tree

Showing 79 changed files with 514 additions and 545 deletions.
diff --git a/llvm/test/tools/dsymutil/Inputs/frame-dw2.ll b/llvm/test/tools/dsymutil/Inputs/frame-dw2.ll
@@ -8,28 +8,28 @@ define i32 @bar(i32 %b) #0 !dbg !4 {
 entry:
   %b.addr = alloca i32, align 4
   %var = alloca i32, align 4
-  store i32 %b, i32* %b.addr, align 4
-  call void @llvm.dbg.declare(metadata i32* %b.addr, metadata !13, metadata !14), !dbg !15
-  call void @llvm.dbg.declare(metadata i32* %var, metadata !16, metadata !14), !dbg !17
-  %0 = load i32, i32* %b.addr, align 4, !dbg !18
+  store i32 %b, ptr %b.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %b.addr, metadata !13, metadata !14), !dbg !15
+  call void @llvm.dbg.declare(metadata ptr %var, metadata !16, metadata !14), !dbg !17
+  %0 = load i32, ptr %b.addr, align 4, !dbg !18
   %add = add nsw i32 %0, 1, !dbg !19
-  store i32 %add, i32* %var, align 4, !dbg !17
-  %call = call i32 @foo(i32* %var), !dbg !20
+  store i32 %add, ptr %var, align 4, !dbg !17
+  %call = call i32 @foo(ptr %var), !dbg !20
   ret i32 %call, !dbg !21
 }
 
 ; Function Attrs: nounwind readnone
 declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
 
-declare i32 @foo(i32*) #2
+declare i32 @foo(ptr) #2
 
 ; Function Attrs: nounwind ssp
 define i32 @baz(i32 %b) #0 !dbg !8 {
 entry:
   %b.addr = alloca i32, align 4
-  store i32 %b, i32* %b.addr, align 4
-  call void @llvm.dbg.declare(metadata i32* %b.addr, metadata !22, metadata !14), !dbg !23
-  %0 = load i32, i32* %b.addr, align 4, !dbg !24
+  store i32 %b, ptr %b.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %b.addr, metadata !22, metadata !14), !dbg !23
+  %0 = load i32, ptr %b.addr, align 4, !dbg !24
   %call = call i32 @bar(i32 %0), !dbg !25
   ret i32 %call, !dbg !26
 }

diff --git a/llvm/test/tools/dsymutil/Inputs/frame-dw4.ll b/llvm/test/tools/dsymutil/Inputs/frame-dw4.ll
@@ -8,28 +8,28 @@ define i32 @bar(i32 %b) #0 !dbg !4 {
 entry:
   %b.addr = alloca i32, align 4
   %var = alloca i32, align 4
-  store i32 %b, i32* %b.addr, align 4
-  call void @llvm.dbg.declare(metadata i32* %b.addr, metadata !13, metadata !14), !dbg !15
-  call void @llvm.dbg.declare(metadata i32* %var, metadata !16, metadata !14), !dbg !17
-  %0 = load i32, i32* %b.addr, align 4, !dbg !18
+  store i32 %b, ptr %b.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %b.addr, metadata !13, metadata !14), !dbg !15
+  call void @llvm.dbg.declare(metadata ptr %var, metadata !16, metadata !14), !dbg !17
+  %0 = load i32, ptr %b.addr, align 4, !dbg !18
   %add = add nsw i32 %0, 1, !dbg !19
-  store i32 %add, i32* %var, align 4, !dbg !17
-  %call = call i32 @foo(i32* %var), !dbg !20
+  store i32 %add, ptr %var, align 4, !dbg !17
+  %call = call i32 @foo(ptr %var), !dbg !20
   ret i32 %call, !dbg !21
 }
 
 ; Function Attrs: nounwind readnone
 declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
 
-declare i32 @foo(i32*) #2
+declare i32 @foo(ptr) #2
 
 ; Function Attrs: nounwind ssp
 define i32 @baz(i32 %b) #0 !dbg !8 {
 entry:
   %b.addr = alloca i32, align 4
-  store i32 %b, i32* %b.addr, align 4
-  call void @llvm.dbg.declare(metadata i32* %b.addr, metadata !22, metadata !14), !dbg !23
-  %0 = load i32, i32* %b.addr, align 4, !dbg !24
+  store i32 %b, ptr %b.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %b.addr, metadata !22, metadata !14), !dbg !23
+  %0 = load i32, ptr %b.addr, align 4, !dbg !24
   %call = call i32 @bar(i32 %0), !dbg !25
   ret i32 %call, !dbg !26
 }

diff --git a/llvm/test/tools/gold/X86/Inputs/comdat.ll b/llvm/test/tools/gold/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
 }
 
-@r21 = global i32* @v1
-@r22 = global i32(i8*)* @f1
+@r21 = global ptr @v1
+@r22 = global ptr @f1
 
-@a21 = alias i32, i32* @v1
-@a22 = alias i16, bitcast (i32* @v1 to i16*)
+@a21 = alias i32, ptr @v1
+@a22 = alias i16, ptr @v1
 
-@a23 = alias i32(i8*), i32(i8*)* @f1
-@a24 = alias i16, bitcast (i32(i8*)* @f1 to i16*)
-@a25 = alias i16, i16* @a24
+@a23 = alias i32(ptr), ptr @f1
+@a24 = alias i16, ptr @f1
+@a25 = alias i16, ptr @a24
diff --git a/llvm/test/tools/gold/X86/Inputs/common_thinlto.ll b/llvm/test/tools/gold/X86/Inputs/common_thinlto.ll
@@ -2,12 +2,12 @@ source_filename = "common2.c"
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-@P = external global i8* (...)*, align 8
+@P = external global ptr, align 8
 
 ; Function Attrs: nounwind uwtable
 define void @foo() #0 {
 entry:
-  %0 = load i8* (...)*, i8* (...)** @P, align 8
-  %call = call i8* (...) %0()
+  %0 = load ptr, ptr @P, align 8
+  %call = call ptr (...) %0()
   ret void
 }
diff --git a/llvm/test/tools/gold/X86/Inputs/ctors2.ll b/llvm/test/tools/gold/X86/Inputs/ctors2.ll
@@ -1,6 +1,6 @@
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
-@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @bar, i8* null }]
+@llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr @bar, ptr null }]
 
 define void @bar() {
   ret void

diff --git a/llvm/test/tools/gold/X86/Inputs/devirt_vcall_vis_shared_def.ll b/llvm/test/tools/gold/X86/Inputs/devirt_vcall_vis_shared_def.ll
@@ -1,15 +1,15 @@
 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-grtev4-linux-gnu"
 
-%struct.A = type { i32 (...)** }
+%struct.A = type { ptr }
 
-@_ZTV1A = unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* undef, i8* bitcast (i32 (%struct.A*, i32)* @_ZN1A1fEi to i8*), i8* bitcast (i32 (%struct.A*, i32)* @_ZN1A1nEi to i8*)] }, !type !0, !vcall_visibility !1
+@_ZTV1A = unnamed_addr constant { [4 x ptr] } { [4 x ptr] [ptr null, ptr undef, ptr @_ZN1A1fEi, ptr @_ZN1A1nEi] }, !type !0, !vcall_visibility !1
 
-define i32 @_ZN1A1fEi(%struct.A* %this, i32 %a) #0 {
+define i32 @_ZN1A1fEi(ptr %this, i32 %a) #0 {
    ret i32 0;
 }
 
-define i32 @_ZN1A1nEi(%struct.A* %this, i32 %a) #0 {
+define i32 @_ZN1A1nEi(ptr %this, i32 %a) #0 {
    ret i32 0;
 }
 

diff --git a/llvm/test/tools/gold/X86/Inputs/resolve-to-alias.ll b/llvm/test/tools/gold/X86/Inputs/resolve-to-alias.ll
@@ -1,6 +1,6 @@
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
-@bar = alias void (), void ()* @zed
+@bar = alias void (), ptr @zed
 define void @zed() {
   ret void
 }
diff --git a/llvm/test/tools/gold/X86/Inputs/thinlto_cspgo_bar.ll b/llvm/test/tools/gold/X86/Inputs/thinlto_cspgo_bar.ll
@@ -13,15 +13,15 @@ entry:
   br i1 %tobool, label %if.else, label %if.then, !prof !30
 
 if.then:
-  %0 = load i32, i32* @odd, align 4
+  %0 = load i32, ptr @odd, align 4
   %inc = add i32 %0, 1
-  store i32 %inc, i32* @odd, align 4
+  store i32 %inc, ptr @odd, align 4
   br label %for.inc
 
 if.else:
-  %1 = load i32, i32* @even, align 4
+  %1 = load i32, ptr @even, align 4
   %inc1 = add i32 %1, 1
-  store i32 %inc1, i32* @even, align 4
+  store i32 %inc1, ptr @even, align 4
   br label %for.inc
 
 for.inc:
@@ -30,9 +30,9 @@ for.inc:
   br i1 %tobool2.1, label %for.inc.1, label %if.then3.1, !prof !35
 
 if.then3.1:
-  %2 = load i32, i32* @not_six, align 4
+  %2 = load i32, ptr @not_six, align 4
   %inc4.1 = add i32 %2, 1
-  store i32 %inc4.1, i32* @not_six, align 4
+  store i32 %inc4.1, ptr @not_six, align 4
   br label %for.inc.1
 
 for.inc.1:
@@ -42,9 +42,9 @@ for.inc.1:
   br i1 %tobool2.2, label %for.inc.2, label %if.then3.2, !prof !35
 
 if.then3.2:
-  %3 = load i32, i32* @not_six, align 4
+  %3 = load i32, ptr @not_six, align 4
   %inc4.2 = add i32 %3, 1
-  store i32 %inc4.2, i32* @not_six, align 4
+  store i32 %inc4.2, ptr @not_six, align 4
   br label %for.inc.2
 
 for.inc.2:
@@ -54,9 +54,9 @@ for.inc.2:
   br i1 %tobool2.3, label %for.inc.3, label %if.then3.3, !prof !35
 
 if.then3.3:
-  %4 = load i32, i32* @not_six, align 4
+  %4 = load i32, ptr @not_six, align 4
   %inc4.3 = add i32 %4, 1
-  store i32 %inc4.3, i32* @not_six, align 4
+  store i32 %inc4.3, ptr @not_six, align 4
   br label %for.inc.3
 
 for.inc.3:

diff --git a/llvm/test/tools/gold/X86/Inputs/thinlto_weak_resolution.ll b/llvm/test/tools/gold/X86/Inputs/thinlto_weak_resolution.ll
@@ -2,10 +2,10 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 ; Alias are not optimized
-@linkonceodralias = linkonce_odr alias void (), void ()* @linkonceodrfuncwithalias
+@linkonceodralias = linkonce_odr alias void (), ptr @linkonceodrfuncwithalias
 
 ; Alias are not optimized
-@linkoncealias = linkonce alias void (), void ()* @linkoncefuncwithalias
+@linkoncealias = linkonce alias void (), ptr @linkoncefuncwithalias
 
 ; Function with an alias are not optimized
 define linkonce_odr void @linkonceodrfuncwithalias() #0 {

diff --git a/llvm/test/tools/gold/X86/Inputs/type-merge2.ll b/llvm/test/tools/gold/X86/Inputs/type-merge2.ll
@@ -2,7 +2,7 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 %zed = type { i16 }
-define void @bar(%zed* %this)  {
-  store %zed* %this, %zed** null
+define void @bar(ptr %this)  {
+  store ptr %this, ptr null
   ret void
 }
diff --git a/llvm/test/tools/gold/X86/Inputs/weak.ll b/llvm/test/tools/gold/X86/Inputs/weak.ll
@@ -2,4 +2,4 @@ target triple = "x86_64-unknown-linux-gnu"
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
 @a = weak global i32 41
-@c = global i32* @a
+@c = global ptr @a
diff --git a/llvm/test/tools/gold/X86/alias.ll b/llvm/test/tools/gold/X86/alias.ll
@@ -11,5 +11,5 @@
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
-@a = weak alias i32, i32* @b
+@a = weak alias i32, ptr @b
 @b = global i32 1
diff --git a/llvm/test/tools/gold/X86/bad-alias.ll b/llvm/test/tools/gold/X86/bad-alias.ll
@@ -11,5 +11,5 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 @g1 = global i32 1
 @g2 = global i32 2
 
-@a = alias i32, inttoptr(i32 sub (i32 ptrtoint (i32* @g1 to i32),
-                                  i32 ptrtoint (i32* @g2 to i32)) to i32*)
+@a = alias i32, inttoptr(i32 sub (i32 ptrtoint (ptr @g1 to i32),
+                                  i32 ptrtoint (ptr @g2 to i32)) to ptr)
diff --git a/llvm/test/tools/gold/X86/comdat-nodeduplicate.ll b/llvm/test/tools/gold/X86/comdat-nodeduplicate.ll
@@ -46,14 +46,14 @@ target triple = "x86_64-unknown-linux-gnu"
 
 $__profc_foo = comdat nodeduplicate
 @__profc_foo = private global i64 1, comdat, align 8
-@__profd_foo = private global i64* @__profc_foo, comdat($__profc_foo), align 8
+@__profd_foo = private global ptr @__profc_foo, comdat($__profc_foo), align 8
 
 declare void @b()
 
 define i64 @foo() {
-  %v = load i64, i64* @__profc_foo
+  %v = load i64, ptr @__profc_foo
   %inc = add i64 1, %v
-  store i64 %inc, i64* @__profc_foo
+  store i64 %inc, ptr @__profc_foo
   ret i64 %inc
 }
 
@@ -68,12 +68,12 @@ target triple = "x86_64-unknown-linux-gnu"
 
 $__profc_foo = comdat nodeduplicate
 @__profc_foo = weak hidden global i64 2, comdat, align 8
-@__profd_foo = private global i64* @__profc_foo, comdat($__profc_foo)
+@__profd_foo = private global ptr @__profc_foo, comdat($__profc_foo)
 
 define weak i64 @foo() {
-  %v = load i64, i64* @__profc_foo
+  %v = load i64, ptr @__profc_foo
   %inc = add i64 1, %v
-  store i64 %inc, i64* @__profc_foo
+  store i64 %inc, ptr @__profc_foo
   ret i64 %inc
 }
 
@@ -87,12 +87,12 @@ target triple = "x86_64-unknown-linux-gnu"
 
 $__profc_foo = comdat nodeduplicate
 @__profc_foo = weak hidden global i64 3, comdat, align 8
-@__profd_foo = private global i64* @__profc_foo, comdat($__profc_foo)
+@__profd_foo = private global ptr @__profc_foo, comdat($__profc_foo)
 
 define weak i64 @foo() {
-  %v = load i64, i64* @__profc_foo
+  %v = load i64, ptr @__profc_foo
   %inc = add i64 1, %v
-  store i64 %inc, i64* @__profc_foo
+  store i64 %inc, ptr @__profc_foo
   ret i64 %inc
 }
 

diff --git a/llvm/test/tools/gold/X86/comdat.ll b/llvm/test/tools/gold/X86/comdat.ll
@@ -12,22 +12,22 @@ target triple = "x86_64-unknown-linux-gnu"
 $c1 = comdat any
 
 @v1 = weak_odr global i32 42, comdat($c1)
-define weak_odr i32 @f1(i8*) comdat($c1) {
+define weak_odr i32 @f1(ptr) comdat($c1) {
 bb10:
   br label %bb11
 bb11:
   ret i32 42
 }
 
-@r11 = global i32* @v1
-@r12 = global i32 (i8*)* @f1
+@r11 = global ptr @v1
+@r12 = global ptr @f1
 
-@a11 = alias i32, i32* @v1
-@a12 = alias i16, bitcast (i32* @v1 to i16*)
+@a11 = alias i32, ptr @v1
+@a12 = alias i16, ptr @v1
 
-@a13 = alias i32 (i8*), i32 (i8*)* @f1
-@a14 = alias i16, bitcast (i32 (i8*)* @f1 to i16*)
-@a15 = alias i16, i16* @a14
+@a13 = alias i32 (ptr), ptr @f1
+@a14 = alias i16, ptr @f1
+@a15 = alias i16, ptr @a14
 
 ; gold's resolutions should tell us that our $c1 wins, and the other input's $c2
 ; wins. f1 is also local due to having protected visibility in the other object.

diff --git a/llvm/test/tools/gold/X86/common_thinlto.ll b/llvm/test/tools/gold/X86/common_thinlto.ll
@@ -22,18 +22,18 @@ source_filename = "common1.c"
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-@P = common global i8* (...)* null, align 8
+@P = common global ptr null, align 8
 
 define i32 @main() {
 entry:
-  store i8* (...)* bitcast (i8* ()* @bar to i8* (...)*), i8* (...)** @P, align 8
+  store ptr @bar, ptr @P, align 8
   %call = call i32 (...) @foo()
   ret i32 0
 }
 
 declare i32 @foo(...)
 
-define internal i8* @bar() {
+define internal ptr @bar() {
 entry:
-  ret i8* null
+  ret ptr null
 }