Skip to content

Commit 99512b1

Browse files
committed
[Object] Convert tests to opaque pointers (NFC)
Link: https://discourse.llvm.org/t/enabling-opaque-pointers-by-default/61322
1 parent fe84764 commit 99512b1

File tree

8 files changed

+25
-25
lines changed

8 files changed

+25
-25
lines changed

llvm/test/Object/Inputs/small.ll

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ target triple = "i386-pc-windows"
44

55
define i32 @main() nounwind {
66
entry:
7-
%call = tail call i32 @puts(i8* getelementptr inbounds ([13 x i8], [13 x i8]* @.str, i32 0, i32 0)) nounwind
8-
tail call void bitcast (void (...)* @SomeOtherFunction to void ()*)() nounwind
7+
%call = tail call i32 @puts(ptr @.str) nounwind
8+
tail call void @SomeOtherFunction() nounwind
99
ret i32 0
1010
}
1111

12-
declare i32 @puts(i8* nocapture) nounwind
12+
declare i32 @puts(ptr nocapture) nounwind
1313

1414
declare void @SomeOtherFunction(...)
1515

1616
@var = global i32 0
17-
@llvm.used = appending global [1 x i8*] [i8* bitcast (i32* @var to i8*)], section "llvm.metadata"
18-
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* null, i8* null }]
17+
@llvm.used = appending global [1 x ptr] [ptr @var], section "llvm.metadata"
18+
@llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr null, ptr null }]

llvm/test/Object/Inputs/trivial.ll

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
define i32 @main() nounwind {
77
entry:
8-
%call = tail call i32 @puts(i8* getelementptr inbounds ([13 x i8], [13 x i8]* @.str, i32 0, i32 0)) nounwind
9-
tail call void bitcast (void (...)* @SomeOtherFunction to void ()*)() nounwind
8+
%call = tail call i32 @puts(ptr @.str) nounwind
9+
tail call void @SomeOtherFunction() nounwind
1010
ret i32 0
1111
}
1212

13-
declare i32 @puts(i8* nocapture) nounwind
13+
declare i32 @puts(ptr nocapture) nounwind
1414

1515
declare void @SomeOtherFunction(...)
1616

1717
@var = global i32 0
18-
@llvm.used = appending global [1 x i8*] [i8* bitcast (i32* @var to i8*)], section "llvm.metadata"
19-
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* null, i8* null }]
18+
@llvm.used = appending global [1 x ptr] [ptr @var], section "llvm.metadata"
19+
@llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr null, ptr null }]

llvm/test/Object/X86/irsymtab-bad-alias.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ target triple = "x86_64-unknown-linux-gnu"
1111
@g1 = global i32 1
1212
@g2 = global i32 2
1313

14-
@a = alias i32, inttoptr(i32 sub (i32 ptrtoint (i32* @g1 to i32),
15-
i32 ptrtoint (i32* @g2 to i32)) to i32*)
14+
@a = alias i32, inttoptr(i32 sub (i32 ptrtoint (ptr @g1 to i32),
15+
i32 ptrtoint (ptr @g2 to i32)) to ptr)

llvm/test/Object/X86/nm-ir.ll

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ module asm ".long undef_asm_sym"
2929
@g3 = common global i32 0
3030
@g4 = private global i32 42
3131

32-
@a1 = alias i32, i32* @g1
33-
@a2 = internal alias i32, i32* @g1
32+
@a1 = alias i32, ptr @g1
33+
@a2 = internal alias i32, ptr @g1
3434

35-
define void ()* @f1() {
35+
define ptr @f1() {
3636
call void @f5()
37-
ret void ()* null
37+
ret ptr null
3838
}
3939

40-
@ifunc_f1 = ifunc void (), void ()* ()* @f1
40+
@ifunc_f1 = ifunc void (), ptr @f1
4141

4242
define internal void @f2() {
4343
ret void

llvm/test/Object/dllimport-globalref.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ target triple = "x86_64-pc-windows-msvc"
1111
; CHECK: U f
1212

1313
declare dllimport void @f()
14-
@fp = constant void ()* @f
14+
@fp = constant ptr @f

llvm/test/Object/dllimport.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ declare dllimport void @f()
1212

1313
define void @g() {
1414
call void @f()
15-
store i32 42, i32* @v
15+
store i32 42, ptr @v
1616
ret void
1717
}

llvm/test/Object/mangle-ir.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ target datalayout = "m:o"
77
; CHECK-NOT: memcpy
88

99
define void @f() {
10-
tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* null, i8* null, i64 0, i1 false)
10+
tail call void @llvm.memcpy.p0.p0.i64(ptr null, ptr null, i64 0, i1 false)
1111
ret void
1212
}
1313

14-
declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture readonly, i64, i1)
14+
declare void @llvm.memcpy.p0.p0.i64(ptr nocapture, ptr nocapture readonly, i64, i1)

llvm/test/Object/objc-swift-mixed-imageinfo-macho.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
target triple = "x86_64-apple-macosx10.15.0"
77

8-
@llvm.used = appending global [1 x i8*] [i8* bitcast (i16* @__swift_reflection_version to i8*)], section "llvm.metadata", align 8
8+
@llvm.used = appending global [1 x ptr] [ptr @__swift_reflection_version], section "llvm.metadata", align 8
99
@__swift_reflection_version = linkonce_odr hidden constant i16 3
1010

11-
define i32 @main(i32 %0, i8** %1) #0 {
12-
%3 = bitcast i8** %1 to i8*
11+
define i32 @main(i32 %0, ptr %1) #0 {
12+
%3 = bitcast ptr %1 to ptr
1313
ret i32 0
1414
}
1515

@@ -25,7 +25,7 @@ attributes #0 = { "frame-pointer"="all" "target-cpu"="penryn" "target-features"=
2525
!1 = !{!"-lswiftSwiftOnoneSupport"}
2626
!2 = !{!"-lswiftCore"}
2727
!3 = !{!"-lobjc"}
28-
!4 = !{[1 x i8*]* @llvm.used, null, null, i1 false, i1 true}
28+
!4 = !{ptr @llvm.used, null, null, i1 false, i1 true}
2929
!5 = !{i32 2, !"SDK Version", [2 x i32] [i32 10, i32 15]}
3030
!6 = !{i32 1, !"Objective-C Version", i32 2}
3131
!7 = !{i32 1, !"Objective-C Image Info Version", i32 0}

0 commit comments

Comments
 (0)