[llvm] 4a96dcb - [X86] Convert some tests to opaque pointers (NFC)

Nikita Popov via llvm-commits llvm-commits at lists.llvm.org
Tue Apr 4 05:15:39 PDT 2023


Author: Nikita Popov
Date: 2023-04-04T14:15:15+02:00
New Revision: 4a96dcb77fe80c8c7d8fdb40f2e2f827dc53571c

URL: https://github.com/llvm/llvm-project/commit/4a96dcb77fe80c8c7d8fdb40f2e2f827dc53571c
DIFF: https://github.com/llvm/llvm-project/commit/4a96dcb77fe80c8c7d8fdb40f2e2f827dc53571c.diff

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

Added: 
    

Modified: 
    llvm/test/CodeGen/X86/scheduler-asm-moves.mir
    llvm/test/CodeGen/X86/statepoint-invoke-ra-inline-spiller.mir
    llvm/test/CodeGen/X86/statepoint-invoke-ra.mir

Removed: 
    


################################################################################
diff  --git a/llvm/test/CodeGen/X86/scheduler-asm-moves.mir b/llvm/test/CodeGen/X86/scheduler-asm-moves.mir
index 433d6d03c937..87a56a380214 100644
--- a/llvm/test/CodeGen/X86/scheduler-asm-moves.mir
+++ b/llvm/test/CodeGen/X86/scheduler-asm-moves.mir
@@ -1,5 +1,5 @@
 # NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
-# RUN: llc -opaque-pointers=0 -run-pass=machine-scheduler -mcpu=sandybridge %s -o - | FileCheck %s
+# RUN: llc -run-pass=machine-scheduler -mcpu=sandybridge %s -o - | FileCheck %s
 
 --- |
   ; ModuleID = 'crash.ll'
@@ -16,24 +16,23 @@
   @csum_ipv6_magic_saddr = dso_local local_unnamed_addr global %struct.in6_addr zeroinitializer, align 1
   @csum_ipv6_magic_daddr = dso_local local_unnamed_addr global i32 0, align 4
   @csum_ipv6_magic_proto = dso_local local_unnamed_addr global i32 0, align 4
-  @synproxy_send_tcp_ipv6_nskb = dso_local local_unnamed_addr global %struct.sk_buff* null, align 4
+  @synproxy_send_tcp_ipv6_nskb = dso_local local_unnamed_addr global ptr null, align 4
   @synproxy_send_tcp_ipv6_fl6 = dso_local local_unnamed_addr global %struct.in6_addr zeroinitializer, align 1
 
   ; Function Attrs: nounwind uwtable
-  define dso_local void @synproxy_send_tcp_ipv6(i32 inreg %skb.coerce, %struct.ipv6hdr* inreg nocapture noundef readonly %niph) local_unnamed_addr #0 {
+  define dso_local void @synproxy_send_tcp_ipv6(i32 inreg %skb.coerce, ptr inreg nocapture noundef readonly %niph) local_unnamed_addr #0 {
   entry:
-    %0 = load i8, i8* getelementptr inbounds (%struct.in6_addr, %struct.in6_addr* @csum_ipv6_magic_saddr, i32 0, i32 0, i32 0), align 1
-    %1 = load i32, i32* @csum_ipv6_magic_daddr, align 4, !tbaa !5
-    %2 = load i32, i32* @csum_ipv6_magic_proto, align 4, !tbaa !5
+    %0 = load i8, ptr @csum_ipv6_magic_saddr, align 1
+    %1 = load i32, ptr @csum_ipv6_magic_daddr, align 4, !tbaa !5
+    %2 = load i32, ptr @csum_ipv6_magic_proto, align 4, !tbaa !5
     %3 = tail call i32 asm "", "=&r,r,r,r,r,~{dirflag},~{fpsr},~{flags}"(i8 %0, i32 %1, i32 0, i32 %2) #2, !srcloc !9
-    store i32 %3, i32* @csum_ipv6_magic_sum, align 4, !tbaa !5
-    %4 = load i8*, i8** bitcast (%struct.sk_buff** @synproxy_send_tcp_ipv6_nskb to i8**), align 4, !tbaa !10
-    %bf.load = load i8, i8* %4, align 1
+    store i32 %3, ptr @csum_ipv6_magic_sum, align 4, !tbaa !5
+    %4 = load ptr, ptr @synproxy_send_tcp_ipv6_nskb, align 4, !tbaa !10
+    %bf.load = load i8, ptr %4, align 1
     %bf.set = or i8 %bf.load, 3
-    store i8 %bf.set, i8* %4, align 1
-    %5 = bitcast %struct.ipv6hdr* %niph to i8*
-    %6 = load i8, i8* %5, align 1, !tbaa !12
-    store i8 %6, i8* getelementptr inbounds (%struct.in6_addr, %struct.in6_addr* @synproxy_send_tcp_ipv6_fl6, i32 0, i32 0, i32 0), align 1, !tbaa !12
+    store i8 %bf.set, ptr %4, align 1
+    %5 = load i8, ptr %niph, align 1, !tbaa !12
+    store i8 %5, ptr @synproxy_send_tcp_ipv6_fl6, align 1, !tbaa !12
     %skb.coerce1.sroa.0.0.insert.ext = and i32 %skb.coerce, 255
     tail call void @fl6nthsecurity_skb_classify_flow(i32 inreg %skb.coerce1.sroa.0.0.insert.ext) #3
     ret void
@@ -124,31 +123,31 @@ body:             |
     ; CHECK-NEXT: {{  $}}
     ; CHECK-NEXT: [[COPY:%[0-9]+]]:gr32 = COPY $edx
     ; CHECK-NEXT: [[COPY1:%[0-9]+]]:gr32_abcd = COPY $eax
-    ; CHECK-NEXT: [[MOV8rm:%[0-9]+]]:gr8 = MOV8rm $noreg, 1, $noreg, @csum_ipv6_magic_saddr, $noreg :: (dereferenceable load (s8) from `i8* getelementptr inbounds (%struct.in6_addr, %struct.in6_addr* @csum_ipv6_magic_saddr, i32 0, i32 0, i32 0)`)
+    ; CHECK-NEXT: [[MOV8rm:%[0-9]+]]:gr8 = MOV8rm $noreg, 1, $noreg, @csum_ipv6_magic_saddr, $noreg :: (dereferenceable load (s8) from @csum_ipv6_magic_saddr)
     ; CHECK-NEXT: [[MOV32rm:%[0-9]+]]:gr32 = MOV32rm $noreg, 1, $noreg, @csum_ipv6_magic_daddr, $noreg :: (dereferenceable load (s32) from @csum_ipv6_magic_daddr, !tbaa !4)
     ; CHECK-NEXT: [[MOV32rm1:%[0-9]+]]:gr32 = MOV32rm $noreg, 1, $noreg, @csum_ipv6_magic_proto, $noreg :: (dereferenceable load (s32) from @csum_ipv6_magic_proto, !tbaa !4)
     ; CHECK-NEXT: [[MOV32r0_:%[0-9]+]]:gr32 = MOV32r0 implicit-def dead $eflags
     ; CHECK-NEXT: INLINEASM &"", 0 /* attdialect */, 2359307 /* regdef-ec:GR32 */, def early-clobber %2, 65545 /* reguse:GR8 */, [[MOV8rm]], 2359305 /* reguse:GR32 */, [[MOV32rm]], 2359305 /* reguse:GR32 */, [[MOV32r0_]], 2359305 /* reguse:GR32 */, [[MOV32rm1]], 12 /* clobber */, implicit-def dead early-clobber $df, 12 /* clobber */, implicit-def early-clobber $fpsw, 12 /* clobber */, implicit-def dead early-clobber $eflags, !8
     ; CHECK-NEXT: MOV32mr $noreg, 1, $noreg, @csum_ipv6_magic_sum, $noreg, %2 :: (store (s32) into @csum_ipv6_magic_sum, !tbaa !4)
-    ; CHECK-NEXT: [[MOV32rm2:%[0-9]+]]:gr32 = MOV32rm $noreg, 1, $noreg, @synproxy_send_tcp_ipv6_nskb, $noreg :: (dereferenceable load (s32) from `i8** bitcast (%struct.sk_buff** @synproxy_send_tcp_ipv6_nskb to i8**)`, !tbaa !9)
+    ; CHECK-NEXT: [[MOV32rm2:%[0-9]+]]:gr32 = MOV32rm $noreg, 1, $noreg, @synproxy_send_tcp_ipv6_nskb, $noreg :: (dereferenceable load (s32) from @synproxy_send_tcp_ipv6_nskb, !tbaa !9)
     ; CHECK-NEXT: OR8mi [[MOV32rm2]], 1, $noreg, 0, $noreg, 3, implicit-def dead $eflags :: (store (s8) into %ir.4), (load (s8) from %ir.4)
-    ; CHECK-NEXT: [[MOV8rm1:%[0-9]+]]:gr8 = MOV8rm [[COPY]], 1, $noreg, 0, $noreg :: (load (s8) from %ir.5, !tbaa !11)
-    ; CHECK-NEXT: MOV8mr $noreg, 1, $noreg, @synproxy_send_tcp_ipv6_fl6, $noreg, [[MOV8rm1]] :: (store (s8) into `i8* getelementptr inbounds (%struct.in6_addr, %struct.in6_addr* @synproxy_send_tcp_ipv6_fl6, i32 0, i32 0, i32 0)`, !tbaa !11)
+    ; CHECK-NEXT: [[MOV8rm1:%[0-9]+]]:gr8 = MOV8rm [[COPY]], 1, $noreg, 0, $noreg :: (load (s8) from %ir.niph, !tbaa !11)
+    ; CHECK-NEXT: MOV8mr $noreg, 1, $noreg, @synproxy_send_tcp_ipv6_fl6, $noreg, [[MOV8rm1]] :: (store (s8) into @synproxy_send_tcp_ipv6_fl6, !tbaa !11)
     ; CHECK-NEXT: [[MOVZX32rr8_:%[0-9]+]]:gr32 = MOVZX32rr8 [[COPY1]].sub_8bit
     ; CHECK-NEXT: $eax = COPY [[MOVZX32rr8_]]
     ; CHECK-NEXT: TCRETURNdi @fl6nthsecurity_skb_classify_flow, 0, csr_32, implicit $esp, implicit $ssp, implicit $eax
     %1:gr32 = COPY $edx
     %0:gr32_abcd = COPY $eax
-    %3:gr8 = MOV8rm $noreg, 1, $noreg, @csum_ipv6_magic_saddr, $noreg :: (dereferenceable load (s8) from `i8* getelementptr inbounds (%struct.in6_addr, %struct.in6_addr* @csum_ipv6_magic_saddr, i32 0, i32 0, i32 0)`)
+    %3:gr8 = MOV8rm $noreg, 1, $noreg, @csum_ipv6_magic_saddr, $noreg :: (dereferenceable load (s8) from @csum_ipv6_magic_saddr)
     %4:gr32 = MOV32rm $noreg, 1, $noreg, @csum_ipv6_magic_daddr, $noreg :: (dereferenceable load (s32) from @csum_ipv6_magic_daddr, !tbaa !5)
     %6:gr32 = MOV32rm $noreg, 1, $noreg, @csum_ipv6_magic_proto, $noreg :: (dereferenceable load (s32) from @csum_ipv6_magic_proto, !tbaa !5)
     %5:gr32 = MOV32r0 implicit-def dead $eflags
     INLINEASM &"", 0 /* attdialect */, 2359307 /* regdef-ec:GR32 */, def early-clobber %2, 65545 /* reguse:GR8 */, %3, 2359305 /* reguse:GR32 */, %4, 2359305 /* reguse:GR32 */, %5, 2359305 /* reguse:GR32 */, %6, 12 /* clobber */, implicit-def dead early-clobber $df, 12 /* clobber */, implicit-def early-clobber $fpsw, 12 /* clobber */, implicit-def dead early-clobber $eflags, !9
     MOV32mr $noreg, 1, $noreg, @csum_ipv6_magic_sum, $noreg, %2 :: (store (s32) into @csum_ipv6_magic_sum, !tbaa !5)
-    %7:gr32 = MOV32rm $noreg, 1, $noreg, @synproxy_send_tcp_ipv6_nskb, $noreg :: (dereferenceable load (s32) from `i8** bitcast (%struct.sk_buff** @synproxy_send_tcp_ipv6_nskb to i8**)`, !tbaa !10)
+    %7:gr32 = MOV32rm $noreg, 1, $noreg, @synproxy_send_tcp_ipv6_nskb, $noreg :: (dereferenceable load (s32) from @synproxy_send_tcp_ipv6_nskb, !tbaa !10)
     OR8mi %7, 1, $noreg, 0, $noreg, 3, implicit-def dead $eflags :: (store (s8) into %ir.4), (load (s8) from %ir.4)
-    %8:gr8 = MOV8rm %1, 1, $noreg, 0, $noreg :: (load (s8) from %ir.5, !tbaa !12)
-    MOV8mr $noreg, 1, $noreg, @synproxy_send_tcp_ipv6_fl6, $noreg, %8 :: (store (s8) into `i8* getelementptr inbounds (%struct.in6_addr, %struct.in6_addr* @synproxy_send_tcp_ipv6_fl6, i32 0, i32 0, i32 0)`, !tbaa !12)
+    %8:gr8 = MOV8rm %1, 1, $noreg, 0, $noreg :: (load (s8) from %ir.niph, !tbaa !12)
+    MOV8mr $noreg, 1, $noreg, @synproxy_send_tcp_ipv6_fl6, $noreg, %8 :: (store (s8) into @synproxy_send_tcp_ipv6_fl6, !tbaa !12)
     %10:gr32 = MOVZX32rr8 %0.sub_8bit
     $eax = COPY %10
     TCRETURNdi @fl6nthsecurity_skb_classify_flow, 0, csr_32, implicit $esp, implicit $ssp, implicit $eax

diff  --git a/llvm/test/CodeGen/X86/statepoint-invoke-ra-inline-spiller.mir b/llvm/test/CodeGen/X86/statepoint-invoke-ra-inline-spiller.mir
index a16213a35183..9fef2904eb89 100644
--- a/llvm/test/CodeGen/X86/statepoint-invoke-ra-inline-spiller.mir
+++ b/llvm/test/CodeGen/X86/statepoint-invoke-ra-inline-spiller.mir
@@ -1,5 +1,5 @@
 # NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
-# RUN: llc -opaque-pointers=0 -x mir -run-pass=simple-register-coalescing,greedy -verify-machineinstrs < %s  | FileCheck %s
+# RUN: llc -x mir -run-pass=simple-register-coalescing,greedy -verify-machineinstrs < %s  | FileCheck %s
 
 ## Check that Inline Spiller cannot insert spill after last insertion point.
 
@@ -9,86 +9,79 @@
   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 @hoge() gc "statepoint-example" personality i32* ()* @widget {
+  define void @hoge() gc "statepoint-example" personality ptr @widget {
   bb:
-    %tmp = call token (i64, i32, void (i8 addrspace(1)*, i8 addrspace(1)*)*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidp1i8p1i8f(i64 2, i32 5, void (i8 addrspace(1)*, i8 addrspace(1)*)* nonnull elementtype(void (i8 addrspace(1)*, i8 addrspace(1)*)) @quux, i32 2, i32 0, i8 addrspace(1)* nonnull null, i8 addrspace(1)* undef, i32 0, i32 0) [ "deopt"(i32 0, i32 2, i32 0, i32 43, i32 0, i32 2, i32 0, i32 7, i8* null, i32 7, i8* null, i32 10, i32 1, i32 6, i32 0, i32 4, i32 1, i32 0, i8 addrspace(1)* null, i32 7, i8* null, i32 0, i8 addrspace(1)* null, i32 7, i8* null, i32 0, i8 addrspace(1)* null, i32 2, i32 4, i32 5, i32 0, i32 2, i32 0, i32 7, i8* null, i32 7, i8* null), "gc-live"(i8 addrspace(1)* null, i8 addrspace(1)* undef) ]
+    %tmp = call token (i64, i32, ptr, i32, i32, ...) @llvm.experimental.gc.statepoint.p0(i64 2, i32 5, ptr nonnull elementtype(void (ptr addrspace(1), ptr addrspace(1))) @quux, i32 2, i32 0, ptr addrspace(1) nonnull null, ptr addrspace(1) undef, i32 0, i32 0) [ "deopt"(i32 0, i32 2, i32 0, i32 43, i32 0, i32 2, i32 0, i32 7, ptr null, i32 7, ptr null, i32 10, i32 1, i32 6, i32 0, i32 4, i32 1, i32 0, ptr addrspace(1) null, i32 7, ptr null, i32 0, ptr addrspace(1) null, i32 7, ptr null, i32 0, ptr addrspace(1) null, i32 2, i32 4, i32 5, i32 0, i32 2, i32 0, i32 7, ptr null, i32 7, ptr null), "gc-live"(ptr addrspace(1) null, ptr addrspace(1) undef) ]
     br label %bb1
 
   bb1:                                              ; preds = %bb21, %bb
-    %tmp2 = phi i32 addrspace(1)* [ undef, %bb ], [ %tmp22, %bb21 ]
-    %tmp3 = phi i8 addrspace(1)* [ undef, %bb ], [ %tmp23, %bb21 ]
-    %tmp4 = phi i8 addrspace(1)* [ undef, %bb ], [ %tmp24, %bb21 ]
-    %tmp5 = phi i8 addrspace(1)* [ undef, %bb ], [ %tmp25, %bb21 ]
-    %tmp6 = phi i8 addrspace(1)* [ null, %bb ], [ %tmp26, %bb21 ]
+    %tmp2 = phi ptr addrspace(1) [ undef, %bb ], [ %tmp22, %bb21 ]
+    %tmp3 = phi ptr addrspace(1) [ undef, %bb ], [ %tmp23, %bb21 ]
+    %tmp4 = phi ptr addrspace(1) [ undef, %bb ], [ %tmp24, %bb21 ]
+    %tmp5 = phi ptr addrspace(1) [ undef, %bb ], [ %tmp25, %bb21 ]
+    %tmp6 = phi ptr addrspace(1) [ null, %bb ], [ %tmp26, %bb21 ]
     %tmp7 = phi i32 [ 0, %bb ], [ %tmp13, %bb21 ]
-    %tmp8 = load atomic i32, i32 addrspace(1)* undef unordered, align 8
-    %tmp9 = load atomic i32, i32 addrspace(1)* %tmp2 unordered, align 4
+    %tmp8 = load atomic i32, ptr addrspace(1) undef unordered, align 8
+    %tmp9 = load atomic i32, ptr addrspace(1) %tmp2 unordered, align 4
     %tmp10 = sub i32 %tmp8, %tmp9
     %tmp11 = icmp slt i32 %tmp10, undef
     %tmp12 = select i1 %tmp11, i32 %tmp10, i32 undef
     %tmp13 = add i32 %tmp12, %tmp7
-    %tmp14 = call token (i64, i32, void (i8 addrspace(1)*, i32, i32, i8 addrspace(1)*, i32)*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidp1i8i32i32p1i8i32f(i64 2, i32 5, void (i8 addrspace(1)*, i32, i32, i8 addrspace(1)*, i32)* nonnull elementtype(void (i8 addrspace(1)*, i32, i32, i8 addrspace(1)*, i32)) @hoge.1, i32 5, i32 0, i8 addrspace(1)* %tmp4, i32 %tmp7, i32 %tmp13, i8 addrspace(1)* undef, i32 %tmp9, i32 0, i32 0) [ "deopt"(i32 0, i32 2, i32 0, i32 43, i32 0, i32 2, i32 0, i32 7, i8* null, i32 7, i8* null, i32 10, i32 1, i32 10, i32 0, i32 4, i32 1, i32 7, i8* null, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp6, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp6, i32 10, i32 5, i32 12, i32 0, i32 3, i32 1, i32 0, i8 addrspace(1)* %tmp6, i32 0, i8 addrspace(1)* %tmp6, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp6, i32 2, i32 11, i32 4, i32 0, i32 1, i32 0, i32 7, i8* null, i32 2, i32 15, i32 7, i32 0, i32 2, i32 0, i32 7, i8* null, i32 7, i8* null, i32 10, i32 21, i32 63, i32 0, i32 9, i32 1, i32 0, i8 addrspace(1)* %tmp5, i32 0, i8 addrspace(1)* %tmp4, i32 7, i8* null, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp3, i32 3, i32 %tmp7, i32 3, i32 undef, i32 3, i32 %tmp12, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp3), "gc-live"(i8 addrspace(1)* %tmp6, i8 addrspace(1)* %tmp5, i8 addrspace(1)* %tmp4, i8 addrspace(1)* %tmp3) ]
-    %tmp15 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token %tmp14, i32 0, i32 0) ; (%tmp6, %tmp6)
-    %tmp16 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token %tmp14, i32 1, i32 1) ; (%tmp5, %tmp5)
-    %tmp17 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token %tmp14, i32 2, i32 2) ; (%tmp4, %tmp4)
-    %tmp18 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token %tmp14, i32 3, i32 3) ; (%tmp3, %tmp3)
+    %tmp14 = call token (i64, i32, ptr, i32, i32, ...) @llvm.experimental.gc.statepoint.p0(i64 2, i32 5, ptr nonnull elementtype(void (ptr addrspace(1), i32, i32, ptr addrspace(1), i32)) @hoge.1, i32 5, i32 0, ptr addrspace(1) %tmp4, i32 %tmp7, i32 %tmp13, ptr addrspace(1) undef, i32 %tmp9, i32 0, i32 0) [ "deopt"(i32 0, i32 2, i32 0, i32 43, i32 0, i32 2, i32 0, i32 7, ptr null, i32 7, ptr null, i32 10, i32 1, i32 10, i32 0, i32 4, i32 1, i32 7, ptr null, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp6, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp6, i32 10, i32 5, i32 12, i32 0, i32 3, i32 1, i32 0, ptr addrspace(1) %tmp6, i32 0, ptr addrspace(1) %tmp6, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp6, i32 2, i32 11, i32 4, i32 0, i32 1, i32 0, i32 7, ptr null, i32 2, i32 15, i32 7, i32 0, i32 2, i32 0, i32 7, ptr null, i32 7, ptr null, i32 10, i32 21, i32 63, i32 0, i32 9, i32 1, i32 0, ptr addrspace(1) %tmp5, i32 0, ptr addrspace(1) %tmp4, i32 7, ptr null, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp3, i32 3, i32 %tmp7, i32 3, i32 undef, i32 3, i32 %tmp12, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp3), "gc-live"(ptr addrspace(1) %tmp6, ptr addrspace(1) %tmp5, ptr addrspace(1) %tmp4, ptr addrspace(1) %tmp3) ]
+    %tmp15 = call coldcc ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token %tmp14, i32 0, i32 0) ; (%tmp6, %tmp6)
+    %tmp16 = call coldcc ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token %tmp14, i32 1, i32 1) ; (%tmp5, %tmp5)
+    %tmp17 = call coldcc ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token %tmp14, i32 2, i32 2) ; (%tmp4, %tmp4)
+    %tmp18 = call coldcc ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token %tmp14, i32 3, i32 3) ; (%tmp3, %tmp3)
     %tmp19 = add i32 0, %tmp12
     %tmp20 = icmp slt i32 %tmp19, undef
     br i1 %tmp20, label %bb21, label %bb28
 
   bb21:                                             ; preds = %bb30, %bb1
-    %tmp22 = phi i32 addrspace(1)* [ undef, %bb1 ], [ %tmp34, %bb30 ]
-    %tmp23 = phi i8 addrspace(1)* [ %tmp18, %bb1 ], [ undef, %bb30 ]
-    %tmp24 = phi i8 addrspace(1)* [ %tmp17, %bb1 ], [ undef, %bb30 ]
-    %tmp25 = phi i8 addrspace(1)* [ %tmp16, %bb1 ], [ %tmp32, %bb30 ]
-    %tmp26 = phi i8 addrspace(1)* [ %tmp15, %bb1 ], [ %tmp31, %bb30 ]
+    %tmp22 = phi ptr addrspace(1) [ undef, %bb1 ], [ %tmp33, %bb30 ]
+    %tmp23 = phi ptr addrspace(1) [ %tmp18, %bb1 ], [ undef, %bb30 ]
+    %tmp24 = phi ptr addrspace(1) [ %tmp17, %bb1 ], [ undef, %bb30 ]
+    %tmp25 = phi ptr addrspace(1) [ %tmp16, %bb1 ], [ %tmp32, %bb30 ]
+    %tmp26 = phi ptr addrspace(1) [ %tmp15, %bb1 ], [ %tmp31, %bb30 ]
     br label %bb1
 
   bb28:                                             ; preds = %bb1
-    %tmp29 = invoke token (i64, i32, void (i32, i8 addrspace(1)*, i8 addrspace(1)*, i32, i32)*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidi32p1i8p1i8i32i32f(i64 1, i32 16, void (i32, i8 addrspace(1)*, i8 addrspace(1)*, i32, i32)* nonnull elementtype(void (i32, i8 addrspace(1)*, i8 addrspace(1)*, i32, i32)) @ham, i32 5, i32 0, i32 undef, i8 addrspace(1)* nonnull undef, i8 addrspace(1)* undef, i32 0, i32 undef, i32 0, i32 0) [ "deopt"(i32 0, i32 2, i32 0, i32 43, i32 0, i32 2, i32 0, i32 7, i8* null, i32 7, i8* null, i32 10, i32 1, i32 10, i32 0, i32 4, i32 1, i32 7, i8* null, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp15, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp15, i32 10, i32 5, i32 12, i32 0, i32 3, i32 1, i32 0, i8 addrspace(1)* %tmp15, i32 0, i8 addrspace(1)* %tmp15, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp15, i32 2, i32 11, i32 4, i32 0, i32 1, i32 0, i32 7, i8* null, i32 2, i32 15, i32 7, i32 0, i32 2, i32 0, i32 7, i8* null, i32 7, i8* null, i32 10, i32 21, i32 96, i32 0, i32 9, i32 1, i32 0, i8 addrspace(1)* %tmp16, i32 0, i8 addrspace(1)* %tmp17, i32 7, i8* null, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp18, i32 3, i32 %tmp13, i32 3, i32 undef, i32 7, i8* null, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp18, i32 8, i32 12, i32 34, i32 0, i32 3, i32 1, i32 0, i8 addrspace(1)* %tmp16, i32 0, i8 addrspace(1)* undef, i32 7, i8* null, i32 0, i8 addrspace(1)* undef), "gc-live"(i8 addrspace(1)* %tmp15, i8 addrspace(1)* %tmp16, i8 addrspace(1)* %tmp17, i8 addrspace(1)* %tmp18, i8 addrspace(1)* undef) ]
+    %tmp29 = invoke token (i64, i32, ptr, i32, i32, ...) @llvm.experimental.gc.statepoint.p0(i64 1, i32 16, ptr nonnull elementtype(void (i32, ptr addrspace(1), ptr addrspace(1), i32, i32)) @ham, i32 5, i32 0, i32 undef, ptr addrspace(1) nonnull undef, ptr addrspace(1) undef, i32 0, i32 undef, i32 0, i32 0) [ "deopt"(i32 0, i32 2, i32 0, i32 43, i32 0, i32 2, i32 0, i32 7, ptr null, i32 7, ptr null, i32 10, i32 1, i32 10, i32 0, i32 4, i32 1, i32 7, ptr null, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp15, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp15, i32 10, i32 5, i32 12, i32 0, i32 3, i32 1, i32 0, ptr addrspace(1) %tmp15, i32 0, ptr addrspace(1) %tmp15, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp15, i32 2, i32 11, i32 4, i32 0, i32 1, i32 0, i32 7, ptr null, i32 2, i32 15, i32 7, i32 0, i32 2, i32 0, i32 7, ptr null, i32 7, ptr null, i32 10, i32 21, i32 96, i32 0, i32 9, i32 1, i32 0, ptr addrspace(1) %tmp16, i32 0, ptr addrspace(1) %tmp17, i32 7, ptr null, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp18, i32 3, i32 %tmp13, i32 3, i32 undef, i32 7, ptr null, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp18, i32 8, i32 12, i32 34, i32 0, i32 3, i32 1, i32 0, ptr addrspace(1) %tmp16, i32 0, ptr addrspace(1) undef, i32 7, ptr null, i32 0, ptr addrspace(1) undef), "gc-live"(ptr addrspace(1) %tmp15, ptr addrspace(1) %tmp16, ptr addrspace(1) %tmp17, ptr addrspace(1) %tmp18, ptr addrspace(1) undef) ]
             to label %bb30 unwind label %bb35
 
   bb30:                                             ; preds = %bb28
-    %tmp31 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token %tmp29, i32 0, i32 0) ; (%tmp15, %tmp15)
-    %tmp32 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token %tmp29, i32 1, i32 1) ; (%tmp16, %tmp16)
-    %tmp33 = getelementptr inbounds i8, i8 addrspace(1)* %tmp32, i64 28
-    %tmp34 = bitcast i8 addrspace(1)* %tmp33 to i32 addrspace(1)*
+    %tmp31 = call coldcc ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token %tmp29, i32 0, i32 0) ; (%tmp15, %tmp15)
+    %tmp32 = call coldcc ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token %tmp29, i32 1, i32 1) ; (%tmp16, %tmp16)
+    %tmp33 = getelementptr inbounds i8, ptr addrspace(1) %tmp32, i64 28
     call void @barney() #2
     br label %bb21
 
   bb35:                                             ; preds = %bb28
     %tmp36 = landingpad token
             cleanup
-    %tmp37 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token %tmp36, i32 0, i32 0) ; (%tmp15, %tmp15)
-    %tmp38 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token %tmp36, i32 3, i32 3) ; (%tmp18, %tmp18)
-    %tmp39 = call token (i64, i32, void (i32)*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidi32f(i64 2882400000, i32 0, void (i32)* nonnull elementtype(void (i32)) @wombat, i32 1, i32 2, i32 3, i32 0, i32 0) [ "deopt"(i32 0, i32 2, i32 0, i32 43, i32 0, i32 2, i32 0, i32 7, i8* null, i32 7, i8* null, i32 10, i32 1, i32 10, i32 0, i32 4, i32 1, i32 7, i8* null, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp37, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp37, i32 10, i32 5, i32 12, i32 0, i32 3, i32 1, i32 0, i8 addrspace(1)* %tmp37, i32 0, i8 addrspace(1)* %tmp37, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp37, i32 2, i32 11, i32 4, i32 0, i32 1, i32 0, i32 7, i8* null, i32 2, i32 15, i32 7, i32 0, i32 2, i32 0, i32 7, i8* null, i32 7, i8* null, i32 10, i32 21, i32 96, i32 0, i32 9, i32 1, i32 0, i8 addrspace(1)* undef, i32 0, i8 addrspace(1)* undef, i32 7, i8* null, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp38, i32 3, i32 %tmp13, i32 3, i32 undef, i32 7, i8* null, i32 7, i8* null, i32 0, i8 addrspace(1)* %tmp38, i32 0, i32 12, i32 51, i32 0, i32 3, i32 0, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null), "gc-live"() ]
+    %tmp37 = call coldcc ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token %tmp36, i32 0, i32 0) ; (%tmp15, %tmp15)
+    %tmp38 = call coldcc ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token %tmp36, i32 3, i32 3) ; (%tmp18, %tmp18)
+    %tmp39 = call token (i64, i32, ptr, i32, i32, ...) @llvm.experimental.gc.statepoint.p0(i64 2882400000, i32 0, ptr nonnull elementtype(void (i32)) @wombat, i32 1, i32 2, i32 3, i32 0, i32 0) [ "deopt"(i32 0, i32 2, i32 0, i32 43, i32 0, i32 2, i32 0, i32 7, ptr null, i32 7, ptr null, i32 10, i32 1, i32 10, i32 0, i32 4, i32 1, i32 7, ptr null, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp37, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp37, i32 10, i32 5, i32 12, i32 0, i32 3, i32 1, i32 0, ptr addrspace(1) %tmp37, i32 0, ptr addrspace(1) %tmp37, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp37, i32 2, i32 11, i32 4, i32 0, i32 1, i32 0, i32 7, ptr null, i32 2, i32 15, i32 7, i32 0, i32 2, i32 0, i32 7, ptr null, i32 7, ptr null, i32 10, i32 21, i32 96, i32 0, i32 9, i32 1, i32 0, ptr addrspace(1) undef, i32 0, ptr addrspace(1) undef, i32 7, ptr null, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp38, i32 3, i32 %tmp13, i32 3, i32 undef, i32 7, ptr null, i32 7, ptr null, i32 0, ptr addrspace(1) %tmp38, i32 0, i32 12, i32 51, i32 0, i32 3, i32 0, i32 7, ptr null, i32 7, ptr null, i32 7, ptr null), "gc-live"() ]
     unreachable
   }
 
   ; Function Attrs: willreturn
-  declare i32* @widget() #0
+  declare ptr @widget() #0
 
-  declare void @quux(i8 addrspace(1)*, i8 addrspace(1)*)
+  declare void @quux(ptr addrspace(1), ptr addrspace(1))
 
-  declare void @hoge.1(i8 addrspace(1)*, i32, i32, i8 addrspace(1)*, i32)
+  declare void @hoge.1(ptr addrspace(1), i32, i32, ptr addrspace(1), i32)
 
   ; Function Attrs: willreturn
   declare void @barney() #0
 
-  declare void @ham(i32, i8 addrspace(1)*, i8 addrspace(1)*, i32, i32)
+  declare void @ham(i32, ptr addrspace(1), ptr addrspace(1), i32, i32)
 
   declare void @wombat(i32)
 
-  declare token @llvm.experimental.gc.statepoint.p0f_isVoidi32f(i64 immarg, i32 immarg, void (i32)*, i32 immarg, i32 immarg, ...)
+  declare token @llvm.experimental.gc.statepoint.p0(i64 immarg, i32 immarg, ptr, i32 immarg, i32 immarg, ...)
 
   ; Function Attrs: nounwind readnone
-  declare i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token, i32 immarg, i32 immarg) #1
-
-  declare token @llvm.experimental.gc.statepoint.p0f_isVoidp1i8p1i8f(i64 immarg, i32 immarg, void (i8 addrspace(1)*, i8 addrspace(1)*)*, i32 immarg, i32 immarg, ...)
-
-  declare token @llvm.experimental.gc.statepoint.p0f_isVoidp1i8i32i32p1i8i32f(i64 immarg, i32 immarg, void (i8 addrspace(1)*, i32, i32, i8 addrspace(1)*, i32)*, i32 immarg, i32 immarg, ...)
-
-  declare token @llvm.experimental.gc.statepoint.p0f_isVoidi32p1i8p1i8i32i32f(i64 immarg, i32 immarg, void (i32, i8 addrspace(1)*, i8 addrspace(1)*, i32, i32)*, i32 immarg, i32 immarg, ...)
+  declare ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token, i32 immarg, i32 immarg) #1
 
   attributes #0 = { willreturn }
   attributes #1 = { nounwind readnone }
@@ -226,7 +219,7 @@ body:             |
   ; CHECK-NEXT:   successors: %bb.2(0x40000000), %bb.4(0x40000000)
   ; CHECK-NEXT: {{  $}}
   ; CHECK-NEXT:   undef %66.sub_32bit:gr64_nosp = COPY [[MOV32r0_]]
-  ; CHECK-NEXT:   undef %65.sub_32bit:gr64_with_sub_8bit = MOV32rm undef %31:gr64, 1, $noreg, 0, $noreg :: (load unordered (s32) from `i32 addrspace(1)* undef`, align 8, addrspace 1)
+  ; CHECK-NEXT:   undef %65.sub_32bit:gr64_with_sub_8bit = MOV32rm undef %31:gr64, 1, $noreg, 0, $noreg :: (load unordered (s32) from `ptr addrspace(1) undef`, align 8, addrspace 1)
   ; CHECK-NEXT:   [[MOV32rm:%[0-9]+]]:gr32 = MOV32rm [[DEF]], 1, $noreg, 0, $noreg :: (load unordered (s32) from %ir.tmp2, addrspace 1)
   ; CHECK-NEXT:   %65.sub_32bit:gr64_with_sub_8bit = SUB32rr %65.sub_32bit, [[MOV32rm]], implicit-def dead $eflags
   ; CHECK-NEXT:   [[LEA64_32r:%[0-9]+]]:gr32 = LEA64_32r %65, 1, %66, 0, $noreg
@@ -312,7 +305,7 @@ body:             |
     %2:gr64 = COPY killed %56
     %1:gr64 = COPY killed %55
     %0:gr64 = COPY killed %54
-    %30:gr32 = MOV32rm undef %31:gr64, 1, $noreg, 0, $noreg :: (load unordered (s32) from `i32 addrspace(1)* undef`, align 8, addrspace 1)
+    %30:gr32 = MOV32rm undef %31:gr64, 1, $noreg, 0, $noreg :: (load unordered (s32) from `ptr addrspace(1) undef`, align 8, addrspace 1)
     %32:gr32 = MOV32rm killed %0, 1, $noreg, 0, $noreg :: (load unordered (s32) from %ir.tmp2, addrspace 1)
     %33:gr32 = COPY killed %30
     %33:gr32 = SUB32rr %33, %32, implicit-def dead $eflags

diff  --git a/llvm/test/CodeGen/X86/statepoint-invoke-ra.mir b/llvm/test/CodeGen/X86/statepoint-invoke-ra.mir
index 9cf1fa5d586e..115d4110a471 100644
--- a/llvm/test/CodeGen/X86/statepoint-invoke-ra.mir
+++ b/llvm/test/CodeGen/X86/statepoint-invoke-ra.mir
@@ -1,4 +1,4 @@
-# RUN: llc -opaque-pointers=0 -x mir -o - %s -run-pass=twoaddressinstruction,simple-register-coalescing,greedy -verify-regalloc 2>&1 | FileCheck %s
+# RUN: llc -x mir -o - %s -run-pass=twoaddressinstruction,simple-register-coalescing,greedy -verify-regalloc 2>&1 | FileCheck %s
 
 # The test checks no verification errors happen in the case of
 # statepoint invoke instruction with tied-defs.
@@ -9,14 +9,14 @@
 # CHECK:     %8:gr64 = COPY $rdx
 # CHECK:     %7:gr32 = COPY $esi
 # CHECK:     %6:gr64 = COPY $rdi
-# CHECK:     %13:gr64 = MOV64rm $noreg, 1, $noreg, 0, $noreg :: (load (s64) from `i8 addrspace(1)* addrspace(1)* null`, addrspace 1)
-# CHECK:     undef %33.sub_32bit:gr64_nosp = MOV32rm $noreg, 1, $noreg, 0, $noreg :: (load (s32) from `i32 addrspace(1)* null`, addrspace 1)
+# CHECK:     %13:gr64 = MOV64rm $noreg, 1, $noreg, 0, $noreg :: (load (s64) from `ptr addrspace(1) null`, addrspace 1)
+# CHECK:     undef %33.sub_32bit:gr64_nosp = MOV32rm $noreg, 1, $noreg, 0, $noreg :: (load (s32) from `ptr addrspace(1) null`, addrspace 1)
 # CHECK:     %35:gr32 = MOV32rm %8, 1, $noreg, 96, $noreg :: (load (s32) from %ir.tmp4, addrspace 1)
 # CHECK:     %43:gr32 = MOV32rm %8, 1, $noreg, 160, $noreg :: (load (s32) from %ir.tmp6, addrspace 1)
-# CHECK:     %38:gr64 = MOV64rm undef %15:gr64, 1, $noreg, 0, $noreg :: (load (s64) from `i8 addrspace(1)* addrspace(1)* undef`, addrspace 1)
+# CHECK:     %38:gr64 = MOV64rm undef %15:gr64, 1, $noreg, 0, $noreg :: (load (s64) from `ptr addrspace(1) undef`, addrspace 1)
 # CHECK:     %40:gr32 = MOV32rm %8, 1, $noreg, 352, $noreg :: (load (s32) from %ir.tmp10, addrspace 1)
-# CHECK:     %16:gr64 = MOV64rm %6, 1, $noreg, 96, $noreg :: (load (s64) from %ir.tmp13, addrspace 1)
-# CHECK:     %17:gr64 = MOV64rm %6, 1, $noreg, 104, $noreg :: (load (s64) from %ir.tmp16, addrspace 1)
+# CHECK:     %16:gr64 = MOV64rm %6, 1, $noreg, 96, $noreg :: (load (s64) from %ir.tmp12, addrspace 1)
+# CHECK:     %17:gr64 = MOV64rm %6, 1, $noreg, 104, $noreg :: (load (s64) from %ir.tmp15, addrspace 1)
 # CHECK:     %45:gr32 = LEA64_32r %33, 1, $noreg, -1, $noreg
 # CHECK:     MOV32mr %stack.1, 1, $noreg, 0, $noreg, %7 :: (store (s32) into %stack.1)
 # CHECK:     MOV32mr %stack.9, 1, $noreg, 0, $noreg, %45 :: (store (s32) into %stack.9)
@@ -66,56 +66,52 @@
   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 @wombat(i8 addrspace(1)* %arg, i32 %arg1, i32 addrspace(1)* %arg2) gc "statepoint-example" personality i32* ()* @widget {
+  define void @wombat(ptr addrspace(1) %arg, i32 %arg1, ptr addrspace(1) %arg2) gc "statepoint-example" personality ptr @widget {
   bb:
-    %tmp = load i8 addrspace(1)*, i8 addrspace(1)* addrspace(1)* null, align 8
-    %tmp3 = load i32, i32 addrspace(1)* null, align 4
-    %tmp4 = getelementptr inbounds i32, i32 addrspace(1)* %arg2, i64 24
-    %tmp5 = load i32, i32 addrspace(1)* %tmp4, align 4
-    %tmp6 = getelementptr inbounds i32, i32 addrspace(1)* %arg2, i64 40
-    %tmp7 = load i32, i32 addrspace(1)* %tmp6, align 4
-    %tmp8 = load i32, i32 addrspace(1)* null, align 4
-    %tmp9 = load i8 addrspace(1)*, i8 addrspace(1)* addrspace(1)* undef, align 8
-    %tmp10 = getelementptr inbounds i32, i32 addrspace(1)* %arg2, i64 88
-    %tmp11 = load i32, i32 addrspace(1)* %tmp10, align 4
-    %tmp12 = getelementptr inbounds i8, i8 addrspace(1)* %arg, i64 96
-    %tmp13 = bitcast i8 addrspace(1)* %tmp12 to i8 addrspace(1)* addrspace(1)*
-    %tmp14 = load i8 addrspace(1)*, i8 addrspace(1)* addrspace(1)* %tmp13, align 8
-    %tmp15 = getelementptr inbounds i8, i8 addrspace(1)* %arg, i64 104
-    %tmp16 = bitcast i8 addrspace(1)* %tmp15 to i8 addrspace(1)* addrspace(1)*
-    %tmp17 = load i8 addrspace(1)*, i8 addrspace(1)* addrspace(1)* %tmp16, align 8
+    %tmp = load ptr addrspace(1), ptr addrspace(1) null, align 8
+    %tmp3 = load i32, ptr addrspace(1) null, align 4
+    %tmp4 = getelementptr inbounds i32, ptr addrspace(1) %arg2, i64 24
+    %tmp5 = load i32, ptr addrspace(1) %tmp4, align 4
+    %tmp6 = getelementptr inbounds i32, ptr addrspace(1) %arg2, i64 40
+    %tmp7 = load i32, ptr addrspace(1) %tmp6, align 4
+    %tmp8 = load i32, ptr addrspace(1) null, align 4
+    %tmp9 = load ptr addrspace(1), ptr addrspace(1) undef, align 8
+    %tmp10 = getelementptr inbounds i32, ptr addrspace(1) %arg2, i64 88
+    %tmp11 = load i32, ptr addrspace(1) %tmp10, align 4
+    %tmp12 = getelementptr inbounds i8, ptr addrspace(1) %arg, i64 96
+    %tmp14 = load ptr addrspace(1), ptr addrspace(1) %tmp12, align 8
+    %tmp15 = getelementptr inbounds i8, ptr addrspace(1) %arg, i64 104
+    %tmp17 = load ptr addrspace(1), ptr addrspace(1) %tmp15, align 8
     %tmp18 = add i32 %tmp3, -1
-    %tmp19 = load atomic i64, i64 addrspace(1)* undef unordered, align 8
-    %tmp20 = invoke token (i64, i32, i32 (i32, i8 addrspace(1)*, i32, i32, i32)*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_i32i32p1i8i32i32i32f(i64 1, i32 16, i32 (i32, i8 addrspace(1)*, i32, i32, i32)* nonnull elementtype(i32 (i32, i8 addrspace(1)*, i32, i32, i32)) @wombat.1, i32 5, i32 0, i32 0, i8 addrspace(1)* null, i32 undef, i32 %arg1, i32 0, i32 0, i32 0) [ "deopt"(i32 %tmp18, i8 addrspace(1)* %tmp, i32 %arg1, i32 %tmp3, i32 %tmp5, i32 %tmp7, i32 %tmp8, i8 addrspace(1)* %tmp9, i32 %tmp11, i8 addrspace(1)* %tmp14, i8 addrspace(1)* %tmp17), "gc-live"(i8 addrspace(1)* %tmp, i8 addrspace(1)* %tmp9, i8 addrspace(1)* %tmp14, i8 addrspace(1)* %tmp17) ]
+    %tmp19 = load atomic i64, ptr addrspace(1) undef unordered, align 8
+    %tmp20 = invoke token (i64, i32, ptr, i32, i32, ...) @llvm.experimental.gc.statepoint.p0(i64 1, i32 16, ptr nonnull elementtype(i32 (i32, ptr addrspace(1), i32, i32, i32)) @wombat.1, i32 5, i32 0, i32 0, ptr addrspace(1) null, i32 undef, i32 %arg1, i32 0, i32 0, i32 0) [ "deopt"(i32 %tmp18, ptr addrspace(1) %tmp, i32 %arg1, i32 %tmp3, i32 %tmp5, i32 %tmp7, i32 %tmp8, ptr addrspace(1) %tmp9, i32 %tmp11, ptr addrspace(1) %tmp14, ptr addrspace(1) %tmp17), "gc-live"(ptr addrspace(1) %tmp, ptr addrspace(1) %tmp9, ptr addrspace(1) %tmp14, ptr addrspace(1) %tmp17) ]
             to label %bb21 unwind label %bb26
 
   bb21:                                             ; preds = %bb
-    %tmp22 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token %tmp20, i32 0, i32 0) ; (%tmp, %tmp)
-    %tmp23 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token %tmp20, i32 2, i32 2) ; (%tmp14, %tmp14)
-    %tmp24 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token %tmp20, i32 3, i32 3) ; (%tmp17, %tmp17)
-    %tmp25 = call token (i64, i32, void (i32)*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidi32f(i64 2882400000, i32 0, void (i32)* nonnull elementtype(void (i32)) @quux, i32 1, i32 2, i32 10, i32 0, i32 0) [ "deopt"(i32 %tmp18, i8 addrspace(1)* %tmp22, i32 %arg1, i32 %tmp3, i32 %tmp5, i32 %tmp7, i32 %tmp8, i32 %tmp11, i8 addrspace(1)* %tmp23, i8 addrspace(1)* %tmp24), "gc-live"() ]
+    %tmp22 = call coldcc ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token %tmp20, i32 0, i32 0) ; (%tmp, %tmp)
+    %tmp23 = call coldcc ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token %tmp20, i32 2, i32 2) ; (%tmp14, %tmp14)
+    %tmp24 = call coldcc ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token %tmp20, i32 3, i32 3) ; (%tmp17, %tmp17)
+    %tmp25 = call token (i64, i32, ptr, i32, i32, ...) @llvm.experimental.gc.statepoint.p0(i64 2882400000, i32 0, ptr nonnull elementtype(void (i32)) @quux, i32 1, i32 2, i32 10, i32 0, i32 0) [ "deopt"(i32 %tmp18, ptr addrspace(1) %tmp22, i32 %arg1, i32 %tmp3, i32 %tmp5, i32 %tmp7, i32 %tmp8, i32 %tmp11, ptr addrspace(1) %tmp23, ptr addrspace(1) %tmp24), "gc-live"() ]
     ret void
 
   bb26:                                             ; preds = %bb
     %tmp27 = landingpad token
             cleanup
-    %tmp28 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token %tmp27, i32 1, i32 1) ; (%tmp9, %tmp9)
-    %tmp29 = call token (i64, i32, void (i32)*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidi32f(i64 2882400000, i32 0, void (i32)* nonnull elementtype(void (i32)) @quux, i32 1, i32 0, i32 -271, i32 0, i32 0) [ "deopt"(i32 %arg1, i32 %tmp3, i32 %tmp5, i32 %tmp8, i8 addrspace(1)* %tmp28, i32 %tmp11), "gc-live"() ]
+    %tmp28 = call coldcc ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token %tmp27, i32 1, i32 1) ; (%tmp9, %tmp9)
+    %tmp29 = call token (i64, i32, ptr, i32, i32, ...) @llvm.experimental.gc.statepoint.p0(i64 2882400000, i32 0, ptr nonnull elementtype(void (i32)) @quux, i32 1, i32 0, i32 -271, i32 0, i32 0) [ "deopt"(i32 %arg1, i32 %tmp3, i32 %tmp5, i32 %tmp8, ptr addrspace(1) %tmp28, i32 %tmp11), "gc-live"() ]
     unreachable
   }
 
-  declare i32* @widget()
+  declare ptr @widget()
 
-  declare i32 @wombat.1(i32, i8 addrspace(1)*, i32, i32, i32)
+  declare i32 @wombat.1(i32, ptr addrspace(1), i32, i32, i32)
 
   declare void @quux(i32)
 
-  declare token @llvm.experimental.gc.statepoint.p0f_isVoidi32f(i64 immarg, i32 immarg, void (i32)*, i32 immarg, i32 immarg, ...)
+  declare token @llvm.experimental.gc.statepoint.p0(i64 immarg, i32 immarg, ptr, i32 immarg, i32 immarg, ...)
 
   ; Function Attrs: nounwind readnone
-  declare i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token, i32 immarg, i32 immarg) #0
-
-  declare token @llvm.experimental.gc.statepoint.p0f_i32i32p1i8i32i32i32f(i64 immarg, i32 immarg, i32 (i32, i8 addrspace(1)*, i32, i32, i32)*, i32 immarg, i32 immarg, ...)
+  declare ptr addrspace(1) @llvm.experimental.gc.relocate.p1(token, i32 immarg, i32 immarg) #0
 
   attributes #0 = { nounwind readnone }
 
@@ -220,15 +216,15 @@ body:             |
     %8:gr64 = COPY killed $rdx
     %7:gr32 = COPY killed $esi
     %6:gr64 = COPY killed $rdi
-    %13:gr64 = MOV64rm $noreg, 1, $noreg, 0, $noreg :: (load (s64) from `i8 addrspace(1)* addrspace(1)* null`, addrspace 1)
-    %3:gr32 = MOV32rm $noreg, 1, $noreg, 0, $noreg :: (load (s32) from `i32 addrspace(1)* null`, addrspace 1)
+    %13:gr64 = MOV64rm $noreg, 1, $noreg, 0, $noreg :: (load (s64) from `ptr addrspace(1) null`, addrspace 1)
+    %3:gr32 = MOV32rm $noreg, 1, $noreg, 0, $noreg :: (load (s32) from `ptr addrspace(1) null`, addrspace 1)
     %0:gr32 = COPY %3
     %1:gr32 = MOV32rm %8, 1, $noreg, 96, $noreg :: (load (s32) from %ir.tmp4, addrspace 1)
     %2:gr32 = MOV32rm %8, 1, $noreg, 160, $noreg :: (load (s32) from %ir.tmp6, addrspace 1)
-    %14:gr64 = MOV64rm undef %15:gr64, 1, $noreg, 0, $noreg :: (load (s64) from `i8 addrspace(1)* addrspace(1)* undef`, addrspace 1)
+    %14:gr64 = MOV64rm undef %15:gr64, 1, $noreg, 0, $noreg :: (load (s64) from `ptr addrspace(1) undef`, addrspace 1)
     %4:gr32 = MOV32rm killed %8, 1, $noreg, 352, $noreg :: (load (s32) from %ir.tmp10, addrspace 1)
-    %16:gr64 = MOV64rm %6, 1, $noreg, 96, $noreg :: (load (s64) from %ir.tmp13, addrspace 1)
-    %17:gr64 = MOV64rm killed %6, 1, $noreg, 104, $noreg :: (load (s64) from %ir.tmp16, addrspace 1)
+    %16:gr64 = MOV64rm %6, 1, $noreg, 96, $noreg :: (load (s64) from %ir.tmp12, addrspace 1)
+    %17:gr64 = MOV64rm killed %6, 1, $noreg, 104, $noreg :: (load (s64) from %ir.tmp15, addrspace 1)
     %5:gr32 = DEC32r %3, implicit-def dead $eflags
     MOV32mr %stack.1, 1, $noreg, 0, $noreg, %7 :: (store (s32) into %stack.1)
     MOV32mr %stack.0, 1, $noreg, 0, $noreg, %5 :: (store (s32) into %stack.0)


        


More information about the llvm-commits mailing list