10 changes: 5 additions & 5 deletions llvm/test/Assembler/metadata-use-uselistorder.ll
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ target triple = "x86_64-unknown-linux-gnu"

define void @foo() local_unnamed_addr !dbg !6 {
entry:
%0 = load i64, i64* getelementptr inbounds ([10 x i64], [10 x i64]* @global_arr, i64 0, i64 4), align 16
call void @llvm.dbg.value(metadata i64* getelementptr inbounds ([10 x i64], [10 x i64]* @global_arr, i64 0, i64 5), metadata !10, metadata !DIExpression()), !dbg !13
%1 = load i64, i64* getelementptr inbounds ([10 x i64], [10 x i64]* @global_arr, i64 0, i64 6), align 16
call void @llvm.dbg.value(metadata i64* getelementptr inbounds ([10 x i64], [10 x i64]* @global_arr, i64 0, i64 6), metadata !10, metadata !DIExpression()), !dbg !14
%0 = load i64, ptr getelementptr inbounds ([10 x i64], ptr @global_arr, i64 0, i64 4), align 16
call void @llvm.dbg.value(metadata ptr getelementptr inbounds ([10 x i64], ptr @global_arr, i64 0, i64 5), metadata !10, metadata !DIExpression()), !dbg !13
%1 = load i64, ptr getelementptr inbounds ([10 x i64], ptr @global_arr, i64 0, i64 6), align 16
call void @llvm.dbg.value(metadata ptr getelementptr inbounds ([10 x i64], ptr @global_arr, i64 0, i64 6), metadata !10, metadata !DIExpression()), !dbg !14
ret void
}

define void @bar() local_unnamed_addr !dbg !15 {
entry:
call void @llvm.dbg.value(metadata i64* getelementptr inbounds ([10 x i64], [10 x i64]* @global_arr, i64 0, i64 7), metadata !17, metadata !DIExpression()), !dbg !18
call void @llvm.dbg.value(metadata ptr getelementptr inbounds ([10 x i64], ptr @global_arr, i64 0, i64 7), metadata !17, metadata !DIExpression()), !dbg !18
ret void
}

Expand Down
2 changes: 1 addition & 1 deletion llvm/test/Assembler/missing-tbaa.ll
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

define void @foo() {
entry:
store i8 undef, i8* undef,
store i8 undef, ptr undef,
; CHECK: :[[@LINE+1]]:10: error: use of undefined metadata '!1'
!tbaa !1
unreachable
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/Assembler/mustprogress-parse-error-2.ll
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; RUN: not llvm-as < %s 2>&1 | FileCheck %s

; CHECK: [[@LINE+1]]:52: error: expected '{' in function body
define i32* @test_mustprogress(i8 %a) mustprogress 8 {
; CHECK: [[@LINE+1]]:51: error: expected '{' in function body
define ptr @test_mustprogress(i8 %a) mustprogress 8 {
ret void
}

8 changes: 4 additions & 4 deletions llvm/test/Assembler/musttail-invalid-1.ll
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

%struct.A = type { i32 }

declare i8* @f(i8*, ...)
declare ptr @f(ptr, ...)

define i8* @f_thunk(i8* %this) {
%rv = musttail call i8* (i8*, ...) @f(i8* %this, ...)
define ptr @f_thunk(ptr %this) {
%rv = musttail call ptr (ptr, ...) @f(ptr %this, ...)
; CHECK: error: unexpected ellipsis in argument list for musttail call in non-varargs function
ret i8* %rv
ret ptr %rv
}
8 changes: 4 additions & 4 deletions llvm/test/Assembler/musttail-invalid-2.ll
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

%struct.A = type { i32 }

declare i8* @f(i8*, ...)
declare ptr @f(ptr, ...)

define i8* @f_thunk(i8* %this, ...) {
%rv = musttail call i8* (i8*, ...) @f(i8* %this)
define ptr @f_thunk(ptr %this, ...) {
%rv = musttail call ptr (ptr, ...) @f(ptr %this)
; CHECK: error: expected '...' at end of argument list for musttail call in varargs function
ret i8* %rv
ret ptr %rv
}
12 changes: 6 additions & 6 deletions llvm/test/Assembler/musttail.ll
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

%struct.A = type { i32 }

declare i8* @f(i8*, ...)
declare ptr @f(ptr, ...)

define i8* @f_thunk(i8* %this, ...) {
%rv = musttail call i8* (i8*, ...) @f(i8* %this, ...)
ret i8* %rv
define ptr @f_thunk(ptr %this, ...) {
%rv = musttail call ptr (ptr, ...) @f(ptr %this, ...)
ret ptr %rv
}
; CHECK-LABEL: define i8* @f_thunk(i8* %this, ...)
; CHECK: %rv = musttail call i8* (i8*, ...) @f(i8* %this, ...)
; CHECK-LABEL: define ptr @f_thunk(ptr %this, ...)
; CHECK: %rv = musttail call ptr (ptr, ...) @f(ptr %this, ...)
12 changes: 6 additions & 6 deletions llvm/test/Assembler/numbered-values.ll
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

define i32 @test(i32 %X) nounwind {
entry:
%X_addr = alloca i32 ; <i32*> [#uses=2]
%retval = alloca i32 ; <i32*> [#uses=2]
%0 = alloca i32 ; <i32*>:0 [#uses=2]
%X_addr = alloca i32 ; <ptr> [#uses=2]
%retval = alloca i32 ; <ptr> [#uses=2]
%0 = alloca i32 ; <ptr>:0 [#uses=2]
%"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
store i32 %X, i32* %X_addr
%1 = load i32, i32* %X_addr, align 4 ; <i32>:1 [#uses=1]
store i32 %X, ptr %X_addr
%1 = load i32, ptr %X_addr, align 4 ; <i32>:1 [#uses=1]
mul i32 %1, 4 ; <i32>:2 [#uses=1]
%3 = add i32 %2, 123 ; <i32>:3 [#uses=1]
store i32 %3, i32* %0, align 4
store i32 %3, ptr %0, align 4
ret i32 %3
}
26 changes: 13 additions & 13 deletions llvm/test/Assembler/opaque-ptr-intrinsic-remangling.ll
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

%int8x16x2_t = type { <16 x i8>, <16 x i8> }

declare i32* @fake_personality_function()
declare ptr @fake_personality_function()
declare void @func()

; Upgrading of invoked intrinsic.
define void @test_invoke(i32 addrspace(1)* %b) gc "statepoint-example" personality i32* ()* @fake_personality_function {
define void @test_invoke(ptr addrspace(1) %b) gc "statepoint-example" personality ptr @fake_personality_function {
; CHECK-LABEL: @test_invoke(
; CHECK-NEXT: entry:
; CHECK-NEXT: [[D:%.*]] = getelementptr i32, ptr addrspace(1) [[B:%.*]], i64 16
Expand All @@ -23,8 +23,8 @@ define void @test_invoke(i32 addrspace(1)* %b) gc "statepoint-example" personali
; CHECK-NEXT: ret void
;
entry:
%d = getelementptr i32, i32 addrspace(1)* %b, i64 16
%safepoint_token = invoke token (i64, i32, void ()*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidf(i64 0, i32 0, void ()* elementtype(void ()) @func, i32 0, i32 0, i32 0, i32 0) ["gc-live" (i32 addrspace(1)* %b, i32 addrspace(1)* %b, i32 addrspace(1)* %d, i32 addrspace(1)* %d)]
%d = getelementptr i32, ptr addrspace(1) %b, i64 16
%safepoint_token = invoke token (i64, i32, ptr, i32, i32, ...) @llvm.experimental.gc.statepoint.p0(i64 0, i32 0, ptr elementtype(void ()) @func, i32 0, i32 0, i32 0, i32 0) ["gc-live" (ptr addrspace(1) %b, ptr addrspace(1) %b, ptr addrspace(1) %d, ptr addrspace(1) %d)]
to label %normal_dest unwind label %unwind_dest

normal_dest:
Expand All @@ -36,17 +36,17 @@ unwind_dest:
ret void
}

define i8* @test_ptr_annotation(i8* %p) {
define ptr @test_ptr_annotation(ptr %p) {
; CHECK-LABEL: @test_ptr_annotation(
; CHECK-NEXT: [[P2:%.*]] = call ptr @llvm.ptr.annotation.p0.p0(ptr [[P:%.*]], ptr undef, ptr undef, i32 undef, ptr undef)
; CHECK-NEXT: ret ptr [[P2]]
;
%p2 = call i8* @llvm.ptr.annotation.p0i8(i8* %p, i8* undef, i8* undef, i32 undef, i8* undef)
ret i8* %p2
%p2 = call ptr @llvm.ptr.annotation.p0(ptr %p, ptr undef, ptr undef, i32 undef, ptr undef)
ret ptr %p2
}


define void @test_struct_return(%int8x16x2_t* %res.p, i8* %a) {
define void @test_struct_return(ptr %res.p, ptr %a) {
; CHECK-LABEL: @test_struct_return(
; CHECK-NEXT: [[TMP1:%.*]] = call { <16 x i8>, <16 x i8> } @llvm.aarch64.neon.ld1x2.v16i8.p0(ptr [[A:%.*]])
; CHECK-NEXT: [[TMP2:%.*]] = extractvalue { <16 x i8>, <16 x i8> } [[TMP1]], 0
Expand All @@ -56,11 +56,11 @@ define void @test_struct_return(%int8x16x2_t* %res.p, i8* %a) {
; CHECK-NEXT: store [[INT8X16X2_T]] [[TMP5]], ptr [[RES_P:%.*]], align 16
; CHECK-NEXT: ret void
;
%res = call %int8x16x2_t @llvm.aarch64.neon.ld1x2.v16i8.p0i8(i8* %a)
store %int8x16x2_t %res, %int8x16x2_t* %res.p
%res = call %int8x16x2_t @llvm.aarch64.neon.ld1x2.v16i8.p0(ptr %a)
store %int8x16x2_t %res, ptr %res.p
ret void
}

declare token @llvm.experimental.gc.statepoint.p0f_isVoidf(i64, i32, void ()*, i32, i32, ...)
declare i8* @llvm.ptr.annotation.p0i8(i8*, i8*, i8*, i32, i8*)
declare %int8x16x2_t @llvm.aarch64.neon.ld1x2.v16i8.p0i8(i8*)
declare token @llvm.experimental.gc.statepoint.p0(i64, i32, ptr, i32, i32, ...)
declare ptr @llvm.ptr.annotation.p0(ptr, ptr, ptr, i32, ptr)
declare %int8x16x2_t @llvm.aarch64.neon.ld1x2.v16i8.p0(ptr)
2 changes: 1 addition & 1 deletion llvm/test/Assembler/opaque-ptr-struct-types.ll
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ define %T2 @f(ptr %p) {
unreachable
}

define %T2* @f.resolver(ptr %p) {
define ptr @f.resolver(ptr %p) {
alloca %T3
getelementptr %T4, ptr %p, i64 1
call void @f(ptr sret(%T5) %p)
Expand Down
14 changes: 6 additions & 8 deletions llvm/test/Assembler/opaque-ptr.ll
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,17 @@
; CHECK: @fptr1 = external global ptr
; CHECK: @fptr2 = external global ptr addrspace(1)
; CHECK: @fptr3 = external global ptr addrspace(2)
@fptr1 = external global ptr ()*
@fptr2 = external global ptr () addrspace(1)*
@fptr3 = external global ptr () addrspace(1)* addrspace(2)*
@fptr1 = external global ptr
@fptr2 = external global ptr addrspace(1)
@fptr3 = external global ptr addrspace(2)

; CHECK: @ifunc = ifunc void (), ptr @f
@ifunc = ifunc void (), ptr @f

; CHECK: define ptr @f(ptr %a) {
; CHECK: %b = bitcast ptr %a to ptr
; CHECK: ret ptr %b
; CHECK: ret ptr %a
define ptr @f(ptr %a) {
%b = bitcast ptr %a to ptr
ret ptr %b
ret ptr %a
}

; CHECK: define ptr @g(ptr addrspace(2) %a) {
Expand Down Expand Up @@ -151,7 +149,7 @@ define void @call_arg(ptr %p, i32 %a) {
; CHECK: invoke void %p()
; CHECK: to label %continue unwind label %cleanup
declare void @personality()
define void @invoke(ptr %p) personality void ()* @personality {
define void @invoke(ptr %p) personality ptr @personality {
invoke void %p()
to label %continue unwind label %cleanup

Expand Down
2 changes: 1 addition & 1 deletion llvm/test/Assembler/private-hidden-alias.ll
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

@global = global i32 0

@alias = private hidden alias i32, i32* @global
@alias = private hidden alias i32, ptr @global
; CHECK: symbol with local linkage must have default visibility
2 changes: 1 addition & 1 deletion llvm/test/Assembler/private-protected-alias.ll
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

@global = global i32 0

@alias = private protected alias i32, i32* @global
@alias = private protected alias i32, ptr @global
; CHECK: symbol with local linkage must have default visibility
36 changes: 18 additions & 18 deletions llvm/test/Assembler/remangle.ll
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ target triple = "x86_64-unknown-linux-gnu"

declare void @foo(%fum*)

; Will be remagled to @"llvm.ssa.copy.p0p0s_fum.1s"
declare %fum.1** @"llvm.ssa.copy.p0p0s_fums"(%fum.1**)
; Will be remagled to @"llvm.ssa.copy.s_fum.1s"
declare %fum.1 @"llvm.ssa.copy.s_fums"(%fum.1)

; Will be remagled to @"llvm.ssa.copy.p0p0s_fums"
declare %fum** @"llvm.ssa.copy.p0p0s_fum.1s"(%fum**)
; Will be remagled to @"llvm.ssa.copy.s_fums"
declare %fum @"llvm.ssa.copy.s_fum.1s"(%fum)

define void @foo1(%fum** %a, %fum.1 ** %b) {
%b.copy = call %fum.1** @"llvm.ssa.copy.p0p0s_fums"(%fum.1** %b)
%a.copy = call %fum** @"llvm.ssa.copy.p0p0s_fum.1s"(%fum** %a)
define void @foo1(%fum %a, %fum.1 %b) {
%b.copy = call %fum.1 @"llvm.ssa.copy.s_fums"(%fum.1 %b)
%a.copy = call %fum @"llvm.ssa.copy.s_fum.1s"(%fum %a)
ret void
}

define void @foo2(%fum.1 ** %b, %fum** %a) {
%a.copy = call %fum** @"llvm.ssa.copy.p0p0s_fum.1s"(%fum** %a)
%b.copy = call %fum.1** @"llvm.ssa.copy.p0p0s_fums"(%fum.1** %b)
define void @foo2(%fum.1 %b, %fum %a) {
%a.copy = call %fum @"llvm.ssa.copy.s_fum.1s"(%fum %a)
%b.copy = call %fum.1 @"llvm.ssa.copy.s_fums"(%fum.1 %b)
ret void
}

Expand All @@ -45,16 +45,16 @@ define void @foo2(%fum.1 ** %b, %fum** %a) {
; CHECK-DAG: %abb = type { %abc }
; CHECK-DAG: %abc = type { [4 x i8] }

; CHECK-LABEL: define void @foo1(%fum** %a, %fum.1** %b) {
; CHECK-NEXT: %b.copy = call %fum.1** @llvm.ssa.copy.p0p0s_fum.1s(%fum.1** %b)
; CHECK-NEXT: %a.copy = call %fum** @llvm.ssa.copy.p0p0s_fums(%fum** %a)
; CHECK-LABEL: define void @foo1(%fum %a, %fum.1 %b) {
; CHECK-NEXT: %b.copy = call %fum.1 @llvm.ssa.copy.s_fum.1s(%fum.1 %b)
; CHECK-NEXT: %a.copy = call %fum @llvm.ssa.copy.s_fums(%fum %a)
; CHECK-NEXT: ret void

; CHECK-LABEL: define void @foo2(%fum.1** %b, %fum** %a) {
; CHECK-NEXT: %a.copy = call %fum** @llvm.ssa.copy.p0p0s_fums(%fum** %a)
; CHECK-NEXT: %b.copy = call %fum.1** @llvm.ssa.copy.p0p0s_fum.1s(%fum.1** %b)
; CHECK-LABEL: define void @foo2(%fum.1 %b, %fum %a) {
; CHECK-NEXT: %a.copy = call %fum @llvm.ssa.copy.s_fums(%fum %a)
; CHECK-NEXT: %b.copy = call %fum.1 @llvm.ssa.copy.s_fum.1s(%fum.1 %b)
; CHECK-NEXT: ret void

; CHECK: declare %fum.1** @llvm.ssa.copy.p0p0s_fum.1s(%fum.1** returned)
; CHECK: declare %fum.1 @llvm.ssa.copy.s_fum.1s(%fum.1 returned)

; CHECK: declare %fum** @llvm.ssa.copy.p0p0s_fums(%fum** returned)
; CHECK: declare %fum @llvm.ssa.copy.s_fums(%fum returned)
2 changes: 1 addition & 1 deletion llvm/test/Assembler/sret-parse-error0.ll
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
; RUN: not llvm-as < %s 2>&1 | FileCheck %s

; CHECK: <stdin>:[[@LINE+1]]:32: error: expected '('{{$}}
define void @test_sret(i8* sret) {
define void @test_sret(ptr sret) {
ret void
}
36 changes: 18 additions & 18 deletions llvm/test/Assembler/sret-type-attr.ll
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s

; CHECK: define void @foo(i32* sret(i32) align 4 %0)
define void @foo(i32* sret(i32) align 4 %0) {
; CHECK: define void @foo(ptr sret(i32) align 4 %0)
define void @foo(ptr sret(i32) align 4 %0) {
ret void
}

; CHECK: define void @bar({ i32*, i8 }* sret({ i32*, i8 }) align 4 %0)
define void @bar({i32*, i8}* sret({i32*, i8}) align 4 %0) {
; CHECK: define void @bar(ptr sret({ ptr, i8 }) align 4 %0)
define void @bar(ptr sret({ptr, i8}) align 4 %0) {
ret void
}

define void @caller({ i32*, i8 }* %ptr) personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
; CHECK: call void @bar({ i32*, i8 }* sret({ i32*, i8 }) %ptr)
; CHECK: invoke void @bar({ i32*, i8 }* sret({ i32*, i8 }) %ptr)
call void @bar({i32*, i8}* sret({i32*, i8}) %ptr)
invoke void @bar({i32*, i8}* sret({i32*, i8}) %ptr) to label %success unwind label %fail
define void @caller(ptr %ptr) personality ptr @__gxx_personality_v0 {
; CHECK: call void @bar(ptr sret({ ptr, i8 }) %ptr)
; CHECK: invoke void @bar(ptr sret({ ptr, i8 }) %ptr)
call void @bar(ptr sret({ptr, i8}) %ptr)
invoke void @bar(ptr sret({ptr, i8}) %ptr) to label %success unwind label %fail

success:
ret void

fail:
landingpad { i8*, i32 } cleanup
landingpad { ptr, i32 } cleanup
ret void
}

; CHECK: declare void @baz([8 x i8]* sret([8 x i8]))
; CHECK: declare void @baz(ptr sret([8 x i8]))
%named_type = type [8 x i8]
declare void @baz(%named_type* sret(%named_type))
declare void @baz(ptr sret(%named_type))

declare i32 @__gxx_personality_v0(...)

%0 = type opaque

; CHECK: define void @anon({ %0* }* sret({ %0* }) %arg)
; CHECK: call void @anon_callee({ %0* }* sret({ %0* }) %arg)
define void @anon({ %0* }* sret({ %0* }) %arg) {
call void @anon_callee({ %0* }* sret({ %0* }) %arg)
; CHECK: define void @anon(ptr sret({ ptr }) %arg)
; CHECK: call void @anon_callee(ptr sret({ ptr }) %arg)
define void @anon(ptr sret({ ptr }) %arg) {
call void @anon_callee(ptr sret({ ptr }) %arg)
ret void
}

; CHECK: declare void @anon_callee({ %0* }* sret({ %0* }))
declare void @anon_callee({ %0* }* sret({ %0* }))
; CHECK: declare void @anon_callee(ptr sret({ ptr }))
declare void @anon_callee(ptr sret({ ptr }))
12 changes: 6 additions & 6 deletions llvm/test/Assembler/thinlto-vtable-summary.ll
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ source_filename = "thinlto-vtable-summary.ll"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-grtev4-linux-gnu"

%struct.A = type { i32 (...)** }
%struct.A = type { ptr }
%struct.B = type { %struct.A }
%struct.C = type { %struct.A }

@_ZTV1B = constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* undef, i8* bitcast (i32 (%struct.B*, i32)* @_ZN1B1fEi to i8*), i8* bitcast (i32 (%struct.A*, i32)* @_ZN1A1nEi to i8*)] }, !type !0, !type !1
@_ZTV1C = constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* undef, i8* bitcast (i32 (%struct.C*, i32)* @_ZN1C1fEi to i8*), i8* bitcast (i32 (%struct.A*, i32)* @_ZN1A1nEi to i8*)] }, !type !0, !type !2
@_ZTV1B = constant { [4 x ptr] } { [4 x ptr] [ptr null, ptr undef, ptr @_ZN1B1fEi, ptr @_ZN1A1nEi] }, !type !0, !type !1
@_ZTV1C = constant { [4 x ptr] } { [4 x ptr] [ptr null, ptr undef, ptr @_ZN1C1fEi, ptr @_ZN1A1nEi] }, !type !0, !type !2

declare i32 @_ZN1B1fEi(%struct.B*, i32)
declare i32 @_ZN1B1fEi(ptr, i32)

declare i32 @_ZN1A1nEi(%struct.A*, i32)
declare i32 @_ZN1A1nEi(ptr, i32)

declare i32 @_ZN1C1fEi(%struct.C*, i32)
declare i32 @_ZN1C1fEi(ptr, i32)

!0 = !{i64 16, !"_ZTS1A"}
!1 = !{i64 16, !"_ZTS1B"}
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/Assembler/unnamed-addr.ll
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

define i32 @main() unnamed_addr nounwind ssp {
entry:
%call2 = tail call i32 @zed(%struct.foobar* @foo.d, %struct.foobar* @bar.d) nounwind
%call2 = tail call i32 @zed(ptr @foo.d, ptr @bar.d) nounwind
ret i32 0
}

declare i32 @zed(%struct.foobar*, %struct.foobar*)
declare i32 @zed(ptr, ptr)

; CHECK: @bar.d = internal unnamed_addr constant %struct.foobar zeroinitializer, align 4
; CHECK: @foo.d = internal constant %struct.foobar zeroinitializer, align 4
Expand Down
8 changes: 4 additions & 4 deletions llvm/test/Assembler/unnamed-alias.ll
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@1 = private constant i32 1
; CHECK: @1 = private constant i32 1

@2 = private alias i32, i32* @3
; CHECK: @2 = private alias i32, i32* @3
@3 = private alias i32, i32* @1
; CHECK: @3 = private alias i32, i32* @1
@2 = private alias i32, ptr @3
; CHECK: @2 = private alias i32, ptr @3
@3 = private alias i32, ptr @1
; CHECK: @3 = private alias i32, ptr @1
36 changes: 18 additions & 18 deletions llvm/test/Assembler/unnamed.ll
Original file line number Diff line number Diff line change
Expand Up @@ -12,41 +12,41 @@ module asm "this is another inline asm block"

@0 = global i32 0
@1 = global float 3.0
@2 = global i8* null
@2 = global ptr null
@3 = global x86_fp80 0xK4001E000000000000000

define float @foo(%0* %p) nounwind {
%t = load %0, %0* %p ; <%0> [#uses=2]
define float @foo(ptr %p) nounwind {
%t = load %0, ptr %p ; <%0> [#uses=2]
%s = extractvalue %0 %t, 1, 0 ; <float> [#uses=1]
%r = insertvalue %0 %t, double 2.000000e+00, 1, 1; <%0> [#uses=1]
store %0 %r, %0* %p
store %0 %r, ptr %p
ret float %s
}

define float @bar(%0* %p) nounwind {
store %0 { %1 { i32 4 }, %2 { float 4.000000e+00, double 2.000000e+01 } }, %0* %p
define float @bar(ptr %p) nounwind {
store %0 { %1 { i32 4 }, %2 { float 4.000000e+00, double 2.000000e+01 } }, ptr %p
ret float 7.000000e+00
}

define float @car(%0* %p) nounwind {
store %0 { %1 undef, %2 { float undef, double 2.000000e+01 } }, %0* %p
define float @car(ptr %p) nounwind {
store %0 { %1 undef, %2 { float undef, double 2.000000e+01 } }, ptr %p
ret float undef
}

define float @dar(%0* %p) nounwind {
store %0 { %1 zeroinitializer, %2 { float 0.000000e+00, double 2.000000e+01 } }, %0* %p
define float @dar(ptr %p) nounwind {
store %0 { %1 zeroinitializer, %2 { float 0.000000e+00, double 2.000000e+01 } }, ptr %p
ret float 0.000000e+00
}

define i32* @qqq() {
ret i32* @0
define ptr @qqq() {
ret ptr @0
}
define float* @rrr() {
ret float* @1
define ptr @rrr() {
ret ptr @1
}
define i8** @sss() {
ret i8** @2
define ptr @sss() {
ret ptr @2
}
define x86_fp80* @nnn() {
ret x86_fp80* @3
define ptr @nnn() {
ret ptr @3
}
4 changes: 2 additions & 2 deletions llvm/test/Assembler/unsized-recursive-type.ll
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
; CHECK: base element of getelementptr must be sized

%myTy = type { %myTy }
define void @foo(%myTy* %p){
%0 = getelementptr %myTy, %myTy* %p, i32 0
define void @foo(ptr %p){
getelementptr %myTy, ptr %p, i64 1
ret void
}
6 changes: 3 additions & 3 deletions llvm/test/Assembler/uselistorder.ll
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
; RUN: verify-uselistorder < %s

@a = global [4 x i1] [i1 0, i1 1, i1 0, i1 1]
@b = alias i1, getelementptr ([4 x i1], [4 x i1]* @a, i64 0, i64 2)
@b = alias i1, getelementptr ([4 x i1], ptr @a, i64 0, i64 2)

; Check use-list order of constants used by globals.
@glob1 = global i5 7
Expand Down Expand Up @@ -48,9 +48,9 @@ first:

define i1 @loada() {
entry:
%a = load i1, i1* getelementptr ([4 x i1], [4 x i1]* @a, i64 0, i64 2)
%a = load i1, ptr getelementptr ([4 x i1], ptr @a, i64 0, i64 2)
ret i1 %a
}

uselistorder i5 7, { 1, 0, 2 }
uselistorder i1* getelementptr ([4 x i1], [4 x i1]* @a, i64 0, i64 2), { 1, 0 }
uselistorder ptr getelementptr ([4 x i1], ptr @a, i64 0, i64 2), { 1, 0 }
22 changes: 11 additions & 11 deletions llvm/test/Assembler/uselistorder_bb.ll
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
; CHECK-NOT: warning
; RUN: verify-uselistorder < %s

@ba1 = constant i8* blockaddress (@bafunc1, %bb)
@ba2 = constant i8* getelementptr (i8, i8* blockaddress (@bafunc2, %bb), i61 0)
@ba3 = constant i8* getelementptr (i8, i8* blockaddress (@bafunc2, %bb), i61 0)
@ba1 = constant ptr blockaddress (@bafunc1, %bb)
@ba2 = constant ptr getelementptr (i8, ptr blockaddress (@bafunc2, %bb), i61 0)
@ba3 = constant ptr getelementptr (i8, ptr blockaddress (@bafunc2, %bb), i61 0)

define i8* @babefore() {
ret i8* getelementptr (i8, i8* blockaddress (@bafunc2, %bb), i61 0)
define ptr @babefore() {
ret ptr getelementptr (i8, ptr blockaddress (@bafunc2, %bb), i61 0)
bb1:
ret i8* blockaddress (@bafunc1, %bb)
ret ptr blockaddress (@bafunc1, %bb)
bb2:
ret i8* blockaddress (@bafunc3, %bb)
ret ptr blockaddress (@bafunc3, %bb)
}
define void @bafunc1() {
br label %bb
Expand All @@ -29,12 +29,12 @@ define void @bafunc3() {
bb:
unreachable
}
define i8* @baafter() {
ret i8* blockaddress (@bafunc2, %bb)
define ptr @baafter() {
ret ptr blockaddress (@bafunc2, %bb)
bb1:
ret i8* blockaddress (@bafunc1, %bb)
ret ptr blockaddress (@bafunc1, %bb)
bb2:
ret i8* blockaddress (@bafunc3, %bb)
ret ptr blockaddress (@bafunc3, %bb)
}

uselistorder_bb @bafunc1, %bb, { 1, 0 }
Expand Down
12 changes: 6 additions & 6 deletions llvm/test/Assembler/uselistorder_global.ll
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
; CHECK: define void @func2() {
; CHECK-NOT: uselistorder
; CHECK: }
; CHECK: uselistorder i32* @g, { 3, 2, 1, 0 }
; CHECK: uselistorder ptr @g, { 3, 2, 1, 0 }

@g = external global i32

define void @func1() {
load i32, i32* @g
load i32, i32* @g
load i32, ptr @g
load i32, ptr @g
ret void
}

define void @func2() {
load i32, i32* @g
load i32, i32* @g
load i32, ptr @g
load i32, ptr @g
ret void
}

uselistorder i32* @g, { 3, 2, 1, 0 }
uselistorder ptr @g, { 3, 2, 1, 0 }
4 changes: 2 additions & 2 deletions llvm/test/Assembler/vector-cmp.ll
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
target triple = "i686-apple-darwin9.2.2"

; CHECK: @1 = global <4 x i1> <i1 icmp slt (i32 ptrtoint (i32* @B to i32), i32 1), i1 true, i1 false, i1 true>
; CHECK: @1 = global <4 x i1> <i1 icmp slt (i32 ptrtoint (ptr @B to i32), i32 1), i1 true, i1 false, i1 true>

define <4 x i1> @foo(<4 x float> %a, <4 x float> %b) nounwind {
entry:
Expand All @@ -14,4 +14,4 @@ entry:

@0 = global <4 x i1> icmp slt ( <4 x i32> <i32 1, i32 1, i32 1, i32 1>, <4 x i32> <i32 1, i32 2, i32 1, i32 2> )
@B = external global i32
@1 = global <4 x i1> icmp slt ( <4 x i32> <i32 ptrtoint (i32 * @B to i32), i32 1, i32 1, i32 1>, <4 x i32> <i32 1, i32 2, i32 1, i32 2> )
@1 = global <4 x i1> icmp slt ( <4 x i32> <i32 ptrtoint (ptr @B to i32), i32 1, i32 1, i32 1>, <4 x i32> <i32 1, i32 2, i32 1, i32 2> )
4 changes: 2 additions & 2 deletions llvm/test/Assembler/x86_intrcc.ll
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ define x86_intrcc void @no_args() {
ret void
}

; CHECK: define x86_intrcc void @byval_arg(i32* byval(i32) %0) {
define x86_intrcc void @byval_arg(i32* byval(i32)) {
; CHECK: define x86_intrcc void @byval_arg(ptr byval(i32) %0) {
define x86_intrcc void @byval_arg(ptr byval(i32)) {
ret void
}