[ARC] Convert tests to opaque pointers (NFC)

Author: MaskRay

llvm/test/CodeGen/ARC/addrmode.ll

@@ -2,17 +2,17 @@
 
 ; CHECK-LABEL: copy
 ; CHECK-NOT: add
-define void @copy(i8* inreg nocapture %p, i8* inreg nocapture readonly %q) {
+define void @copy(ptr inreg nocapture %p, ptr inreg nocapture readonly %q) {
 entry:
   br label %while.cond
 
 while.cond:                                       ; preds = %while.cond, %entry
-  %p.addr.0 = phi i8* [ %p, %entry ], [ %incdec.ptr1, %while.cond ]
-  %q.addr.0 = phi i8* [ %q, %entry ], [ %incdec.ptr, %while.cond ]
-  %incdec.ptr = getelementptr inbounds i8, i8* %q.addr.0, i32 1
-  %0 = load i8, i8* %q.addr.0, align 1
-  %incdec.ptr1 = getelementptr inbounds i8, i8* %p.addr.0, i32 1
-  store i8 %0, i8* %p.addr.0, align 1
+  %p.addr.0 = phi ptr [ %p, %entry ], [ %incdec.ptr1, %while.cond ]
+  %q.addr.0 = phi ptr [ %q, %entry ], [ %incdec.ptr, %while.cond ]
+  %incdec.ptr = getelementptr inbounds i8, ptr %q.addr.0, i32 1
+  %0 = load i8, ptr %q.addr.0, align 1
+  %incdec.ptr1 = getelementptr inbounds i8, ptr %p.addr.0, i32 1
+  store i8 %0, ptr %p.addr.0, align 1
   %tobool = icmp eq i8 %0, 0
   br i1 %tobool, label %while.end, label %while.cond
 
@@ -21,11 +21,11 @@ while.end:                                        ; preds = %while.cond
 }
 
 
-%struct._llist = type { %struct._llist*, %struct._llist*, i32 }
+%struct._llist = type { ptr, ptr, i32 }
 
 ; CHECK-LABEL: neg1
 ; CHECK-NOT:   std.ab
-define void @neg1(i8* inreg nocapture %a, i8* inreg nocapture readonly %b, i32 inreg %n) {
+define void @neg1(ptr inreg nocapture %a, ptr inreg nocapture readonly %b, i32 inreg %n) {
 entry:
   %cmp6 = icmp sgt i32 %n, 0
   br i1 %cmp6, label %for.body, label %for.cond.cleanup
@@ -35,19 +35,19 @@ for.cond.cleanup:
 
 for.body:
   %i.07 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
-  %arrayidx = getelementptr inbounds i8, i8* %b, i32 %i.07
-  %0 = load i8, i8* %arrayidx, align 1
+  %arrayidx = getelementptr inbounds i8, ptr %b, i32 %i.07
+  %0 = load i8, ptr %arrayidx, align 1
   %mul = mul nuw nsw i32 %i.07, 257
-  %arrayidx1 = getelementptr inbounds i8, i8* %a, i32 %mul
-  store i8 %0, i8* %arrayidx1, align 1
+  %arrayidx1 = getelementptr inbounds i8, ptr %a, i32 %mul
+  store i8 %0, ptr %arrayidx1, align 1
   %inc = add nuw nsw i32 %i.07, 1
   %exitcond = icmp eq i32 %inc, %n
   br i1 %exitcond, label %for.cond.cleanup, label %for.body
 }
 
 ; CHECK-LABEL: neg2
 ; CHECK-NOT:   st.ab
-define void @neg2(%struct._llist* inreg %a, i32 inreg %n) {
+define void @neg2(ptr inreg %a, i32 inreg %n) {
 entry:
   %cmp13 = icmp sgt i32 %n, 0
   br i1 %cmp13, label %for.body, label %for.cond.cleanup
@@ -57,11 +57,11 @@ for.cond.cleanup:
 
 for.body:
   %i.014 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
-  %arrayidx = getelementptr inbounds %struct._llist, %struct._llist* %a, i32 %i.014
-  %next = getelementptr inbounds %struct._llist, %struct._llist* %arrayidx, i32 0, i32 0
-  store %struct._llist* %arrayidx, %struct._llist** %next, align 4
-  %prev = getelementptr inbounds %struct._llist, %struct._llist* %a, i32 %i.014, i32 1
-  store %struct._llist* %arrayidx, %struct._llist** %prev, align 4
+  %arrayidx = getelementptr inbounds %struct._llist, ptr %a, i32 %i.014
+  %next = getelementptr inbounds %struct._llist, ptr %arrayidx, i32 0, i32 0
+  store ptr %arrayidx, ptr %next, align 4
+  %prev = getelementptr inbounds %struct._llist, ptr %a, i32 %i.014, i32 1
+  store ptr %arrayidx, ptr %prev, align 4
   %inc = add nuw nsw i32 %i.014, 1
   %exitcond = icmp eq i32 %inc, %n
   br i1 %exitcond, label %for.cond.cleanup, label %for.body

llvm/test/CodeGen/ARC/call.ll

@@ -73,14 +73,14 @@ define i64 @ret1() nounwind {
   ret i64 281470698455295
 }
 
-@funcptr = external global i32 (i32)*, align 4
+@funcptr = external global ptr, align 4
 ; Indirect calls use JL
 ; CHECK-LABEL: call_indirect
 ; CHECK-DAG: ld %r[[REG:[0-9]+]], [@funcptr]
 ; CHECK-DAG: mov %r0, 12
 ; CHECK:     jl [%r[[REG]]]
 define i32 @call_indirect(i32 %x) nounwind {
-  %f = load i32 (i32)*, i32 (i32)** @funcptr, align 4
+  %f = load ptr, ptr @funcptr, align 4
   %call = call i32 %f(i32 12)
   %add = add nsw i32 %call, %x
   ret i32 %add