[llvm] 40c0d07 - [Bitcode] Convert test to opaque pointers (NFC)

Nikita Popov via llvm-commits llvm-commits at lists.llvm.org
Tue Dec 13 03:24:12 PST 2022


Author: Nikita Popov
Date: 2022-12-13T12:24:05+01:00
New Revision: 40c0d076c074ade7cd29b60678c1af933d9f0d21

URL: https://github.com/llvm/llvm-project/commit/40c0d076c074ade7cd29b60678c1af933d9f0d21
DIFF: https://github.com/llvm/llvm-project/commit/40c0d076c074ade7cd29b60678c1af933d9f0d21.diff

LOG: [Bitcode] Convert test to opaque pointers (NFC)

Added: 
    

Modified: 
    llvm/test/Bitcode/blockaddress-addrspace.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/Bitcode/blockaddress-addrspace.ll b/llvm/test/Bitcode/blockaddress-addrspace.ll
index 4d7a474bca3f..8567417098ea 100644
--- a/llvm/test/Bitcode/blockaddress-addrspace.ll
+++ b/llvm/test/Bitcode/blockaddress-addrspace.ll
@@ -36,9 +36,9 @@ define void @fn_in_other_as() addrspace(1) {
 bb:
   ret void
 }
- at global1 = constant i8 addrspace(2)* blockaddress(@fn_in_prog_as_implicit, %bb)
- at global2 = constant i8 addrspace(2)* blockaddress(@fn_in_prog_as_explicit, %bb)
- at global3 = constant i8 addrspace(1)* blockaddress(@fn_in_other_as, %bb)
+ at global1 = constant ptr addrspace(2) blockaddress(@fn_in_prog_as_implicit, %bb)
+ at global2 = constant ptr addrspace(2) blockaddress(@fn_in_prog_as_explicit, %bb)
+ at global3 = constant ptr addrspace(1) blockaddress(@fn_in_other_as, %bb)
 
 ;--- global-use-bad.ll
 define void @fn() addrspace(1) {
@@ -46,13 +46,13 @@ define void @fn() addrspace(1) {
 bb:
   ret void
 }
- at global1 = constant i8 addrspace(2)* blockaddress(@fn, %bb)
-; CHECK: [[#@LINE-1]]:38: error: constant expression type mismatch: got type 'i8 addrspace(1)*' but expected 'i8 addrspace(2)*'
+ at global1 = constant ptr addrspace(2) blockaddress(@fn, %bb)
+; CHECK: [[#@LINE-1]]:38: error: constant expression type mismatch: got type 'ptr addrspace(1)' but expected 'ptr addrspace(2)'
 
 ; Check that a global blockaddress of a forward-declared function
 ; uses the type of the global variable address space for the forward declaration
 ;--- global-fwddecl-good.ll
- at global = constant i8 addrspace(2)* blockaddress(@fwddecl_in_prog_as, %bb)
+ at global = constant ptr addrspace(2) blockaddress(@fwddecl_in_prog_as, %bb)
 define void @fwddecl_in_prog_as() addrspace(2) {
   unreachable
 bb:
@@ -61,8 +61,8 @@ bb:
 
 ;--- global-fwddecl-bad.ll
 ; This forward declaration does not match the actual function type so we should get an error:
- at global = constant i8 addrspace(2)* blockaddress(@fwddecl_in_unexpected_as, %bb)
-; CHECK: [[#@LINE-1]]:77: error: 'bb' defined with type 'i8 addrspace(1)*' but expected 'i8 addrspace(2)*'
+ at global = constant ptr addrspace(2) blockaddress(@fwddecl_in_unexpected_as, %bb)
+; CHECK: [[#@LINE-1]]:77: error: 'bb' defined with type 'ptr addrspace(1)' but expected 'ptr addrspace(2)'
 define void @fwddecl_in_unexpected_as() addrspace(1) {
   unreachable
 bb:
@@ -73,11 +73,11 @@ bb:
 ; When returning blockaddresses of forward-declared functions we
 ; can also use the type of the variable.
 ;--- return-fwddecl-good.ll
-define i8 addrspace(2)* @take_as2() {
-  ret i8 addrspace(2)* blockaddress(@fwddecl_as2, %bb)
+define ptr addrspace(2) @take_as2() {
+  ret ptr addrspace(2) blockaddress(@fwddecl_as2, %bb)
 }
-define i8 addrspace(1)* @take_as1() {
-  ret i8 addrspace(1)* blockaddress(@fwddecl_as1, %bb)
+define ptr addrspace(1) @take_as1() {
+  ret ptr addrspace(1) blockaddress(@fwddecl_as1, %bb)
 }
 define void @fwddecl_as1() addrspace(1) {
   unreachable
@@ -91,9 +91,9 @@ bb:
 }
 
 ;--- return-fwddecl-bad.ll
-define i8 addrspace(2)* @take_bad() {
-  ret i8 addrspace(2)* blockaddress(@fwddecl_as1, %bb)
-  ; CHECK: [[#@LINE-1]]:51: error: 'bb' defined with type 'i8 addrspace(1)*' but expected 'i8 addrspace(2)*'
+define ptr addrspace(2) @take_bad() {
+  ret ptr addrspace(2) blockaddress(@fwddecl_as1, %bb)
+  ; CHECK: [[#@LINE-1]]:51: error: 'bb' defined with type 'ptr addrspace(1)' but expected 'ptr addrspace(2)'
 }
 define void @fwddecl_as1() addrspace(1) {
   unreachable
@@ -103,66 +103,66 @@ bb:
 
 ;--- return-self-good.ll
 target datalayout = "P2"
-define i8 addrspace(0)* @take_self_as0() addrspace(0) {
+define ptr addrspace(0) @take_self_as0() addrspace(0) {
 L1:
   br label %L2
 L2:
-  ret i8 addrspace(0)* blockaddress(@take_self_as0, %L3)
+  ret ptr addrspace(0) blockaddress(@take_self_as0, %L3)
 L3:
   unreachable
 }
-define i8 addrspace(2)* @take_self_prog_as() {
+define ptr addrspace(2) @take_self_prog_as() {
 L1:
   br label %L2
 L2:
-  ret i8 addrspace(2)* blockaddress(@take_self_prog_as, %L3)
+  ret ptr addrspace(2) blockaddress(@take_self_prog_as, %L3)
 L3:
   unreachable
 }
-define i8 addrspace(1)* @take_self_as1() addrspace(1) {
+define ptr addrspace(1) @take_self_as1() addrspace(1) {
 L1:
   br label %L2
 L2:
-  ret i8 addrspace(1)* blockaddress(@take_self_as1, %L3)
+  ret ptr addrspace(1) blockaddress(@take_self_as1, %L3)
 L3:
   unreachable
 }
-define i8 addrspace(2)* @take_self_as2() addrspace(2) {
+define ptr addrspace(2) @take_self_as2() addrspace(2) {
 L1:
   br label %L2
 L2:
-  ret i8 addrspace(2)* blockaddress(@take_self_as2, %L3)
+  ret ptr addrspace(2) blockaddress(@take_self_as2, %L3)
 L3:
   unreachable
 }
 
 ;--- return-self-bad.ll
 target datalayout = "P2"
-define i8 addrspace(2)* @take_self_bad() addrspace(1) {
+define ptr addrspace(2) @take_self_bad() addrspace(1) {
 L1:
   br label %L2
 L2:
-  ret i8 addrspace(2)* blockaddress(@take_self_bad, %L3)
-  ; CHECK: [[#@LINE-1]]:24: error: constant expression type mismatch: got type 'i8 addrspace(1)*' but expected 'i8 addrspace(2)*'
+  ret ptr addrspace(2) blockaddress(@take_self_bad, %L3)
+  ; CHECK: [[#@LINE-1]]:24: error: constant expression type mismatch: got type 'ptr addrspace(1)' but expected 'ptr addrspace(2)'
 L3:
   unreachable
 }
 ;--- return-self-bad-2.ll
 target datalayout = "P2"
-define i8* @take_self_bad_prog_as() {
+define ptr @take_self_bad_prog_as() {
 L1:
   br label %L2
 L2:
-  ret i8* blockaddress(@take_self_bad_prog_as, %L3)
-  ; CHECK: [[#@LINE-1]]:11: error: constant expression type mismatch: got type 'i8 addrspace(2)*' but expected 'i8*'
+  ret ptr blockaddress(@take_self_bad_prog_as, %L3)
+  ; CHECK: [[#@LINE-1]]:11: error: constant expression type mismatch: got type 'ptr addrspace(2)' but expected 'ptr'
 L3:
   unreachable
 }
 
 ;--- return-unknown-fn-bad.ll
 target datalayout = "P2"
-define i8 addrspace(1)* @return_unknown_fn() addrspace(1) {
-  ret i8 addrspace(1)* blockaddress(@undefined, %bb)
+define ptr addrspace(1) @return_unknown_fn() addrspace(1) {
+  ret ptr addrspace(1) blockaddress(@undefined, %bb)
   ; CHECK: [[#@LINE-1]]:37: error: expected function name in blockaddress
 }
 
@@ -170,11 +170,11 @@ define i8 addrspace(1)* @return_unknown_fn() addrspace(1) {
 ;--- call-fwddecl-good.ll
 target datalayout = "P2"
 define void @call_from_fn_in_as2() addrspace(2) {
-  call addrspace(2) void bitcast (i8 addrspace(2)* blockaddress(@fwddecl_as2, %bb) to void () addrspace(2)*)()
+  call addrspace(2) void blockaddress(@fwddecl_as2, %bb)()
   ret void
 }
 define void @call_from_fn_in_as1() addrspace(1) {
-  call addrspace(1) void bitcast (i8 addrspace(1)* blockaddress(@fwddecl_as1, %bb) to void () addrspace(1)*)()
+  call addrspace(1) void blockaddress(@fwddecl_as1, %bb)()
   ret void
 }
 define void @fwddecl_as2() addrspace(2) {
@@ -191,8 +191,8 @@ bb:
 ;--- call-fwddecl-bad.ll
 target datalayout = "P2"
 define void @call_from_fn_in_as2_explicit() addrspace(2) {
-  call addrspace(2) void bitcast (i8 addrspace(2)* blockaddress(@fwddecl_as1, %bb) to void () addrspace(2)*)()
-  ; CHECK: [[#@LINE-1]]:79: error: 'bb' defined with type 'i8 addrspace(1)*' but expected 'i8 addrspace(2)*'
+  call addrspace(2) void blockaddress(@fwddecl_as1, %bb)()
+  ; CHECK: [[#@LINE-1]]:53: error: 'bb' defined with type 'ptr addrspace(1)' but expected 'ptr addrspace(2)'
   ret void
 }
 define void @fwddecl_as1() addrspace(1) {
@@ -203,53 +203,53 @@ bb:
 
 ;--- phi-good.ll
 target datalayout = "P2"
-define i8 addrspace(1)* @f1() addrspace(1) {
+define ptr addrspace(1) @f1() addrspace(1) {
 L1:
   br label %L3
 L2:
   br label %L3
 L3:
-  %p = phi i8 addrspace(1)* [ blockaddress(@f1, %L4), %L2 ], [ null, %L1 ]
-  ret i8 addrspace(1)* %p
+  %p = phi ptr addrspace(1) [ blockaddress(@f1, %L4), %L2 ], [ null, %L1 ]
+  ret ptr addrspace(1) %p
 L4:
   unreachable
 }
-define i8 addrspace(2)* @f2() {
+define ptr addrspace(2) @f2() {
 L1:
   br label %L3
 L2:
   br label %L3
 L3:
-  %p = phi i8 addrspace(2)* [ blockaddress(@f2, %L4), %L2 ], [ null, %L1 ]
-  ret i8 addrspace(2)* %p
+  %p = phi ptr addrspace(2) [ blockaddress(@f2, %L4), %L2 ], [ null, %L1 ]
+  ret ptr addrspace(2) %p
 L4:
   unreachable
 }
 
 ;--- phi-bad.ll
 target datalayout = "P2"
-define i8* @f() {
+define ptr @f() {
 L1:
   br label %L3
 L2:
   br label %L3
 L3:
-  %p = phi i8* [ blockaddress(@f, %L4), %L2 ], [ null, %L1 ]
-  ; CHECK: [[#@LINE-1]]:18: error: constant expression type mismatch: got type 'i8 addrspace(2)*' but expected 'i8*'
-  ret i8* %p
+  %p = phi ptr [ blockaddress(@f, %L4), %L2 ], [ null, %L1 ]
+  ; CHECK: [[#@LINE-1]]:18: error: constant expression type mismatch: got type 'ptr addrspace(2)' but expected 'ptr'
+  ret ptr %p
 }
 
 ; A blockaddress function forward-declaration used in a phi node should
 ; create the forward declaration in the same address space as the current function
 ;--- fwddecl-phi-good.ll
-define i8 addrspace(1)* @f() addrspace(1) {
+define ptr addrspace(1) @f() addrspace(1) {
 L1:
   br label %L3
 L2:
   br label %L3
 L3:
-  %p = phi i8 addrspace(1)* [ blockaddress(@fwddecl_as1, %bb), %L2 ], [ null, %L1 ]
-  ret i8 addrspace(1)* %p
+  %p = phi ptr addrspace(1) [ blockaddress(@fwddecl_as1, %bb), %L2 ], [ null, %L1 ]
+  ret ptr addrspace(1) %p
 L4:
   unreachable
 }
@@ -260,15 +260,15 @@ bb:
 }
 
 ;--- fwddecl-phi-bad.ll
-define i8 addrspace(2)* @f() addrspace(2) {
+define ptr addrspace(2) @f() addrspace(2) {
 L1:
   br label %L3
 L2:
   br label %L3
 L3:
-  %p = phi i8 addrspace(2)* [ blockaddress(@fwddecl_as1, %bb), %L2 ], [ null, %L1 ]
-  ; CHECK: [[#@LINE-1]]:58: error: 'bb' defined with type 'i8 addrspace(1)*' but expected 'i8 addrspace(2)*'
-  ret i8 addrspace(2)* %p
+  %p = phi ptr addrspace(2) [ blockaddress(@fwddecl_as1, %bb), %L2 ], [ null, %L1 ]
+  ; CHECK: [[#@LINE-1]]:58: error: 'bb' defined with type 'ptr addrspace(1)' but expected 'ptr addrspace(2)'
+  ret ptr addrspace(2) %p
 L4:
   unreachable
 }
@@ -282,5 +282,5 @@ bb:
 @global = constant i8 blockaddress(@unknown_fn, %bb)
 ; CHECK: [[#@LINE-1]]:23: error: type of blockaddress must be a pointer and not 'i8'
 ;--- bad-type-not-i8-ptr.ll
- at global = constant i32* blockaddress(@unknown_fn, %bb)
-; CHECK: [[#@LINE-1]]:25: error: constant expression type mismatch: got type 'i8*' but expected 'i32*'
+ at global = constant ptr blockaddress(@unknown_fn, %bb)
+; CHECK: [[#@LINE-1]]:37: error: expected function name in blockaddress


        


More information about the llvm-commits mailing list