diff --git a/llvm/test/tools/gold/X86/alias2.ll b/llvm/test/tools/gold/X86/alias2.ll index 1163d8cc7ff22..b045845ff5ac3 100644 --- a/llvm/test/tools/gold/X86/alias2.ll +++ b/llvm/test/tools/gold/X86/alias2.ll @@ -4,7 +4,7 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" -@bar = alias void (), void ()* @zed +@bar = alias void (), ptr @zed define void @foo() { call void @bar() ret void @@ -13,7 +13,7 @@ define void @zed() { ret void } -; CHECK: @bar = alias void (), void ()* @zed +; CHECK: @bar = alias void (), ptr @zed ; CHECK: define void @foo() { ; CHECK-NEXT: call void @bar() diff --git a/llvm/test/tools/gold/X86/ctors.ll b/llvm/test/tools/gold/X86/ctors.ll index 86d6c374a040d..29695410caecf 100644 --- a/llvm/test/tools/gold/X86/ctors.ll +++ b/llvm/test/tools/gold/X86/ctors.ll @@ -6,10 +6,10 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" -@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @foo, i8* null }] +@llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr @foo, ptr null }] define internal void @foo() { ret void } -; CHECK: @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @foo, i8* null }] +; CHECK: @llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr @foo, ptr null }] diff --git a/llvm/test/tools/gold/X86/ctors2.ll b/llvm/test/tools/gold/X86/ctors2.ll index 35e77c4053039..d0664f1ef66cb 100644 --- a/llvm/test/tools/gold/X86/ctors2.ll +++ b/llvm/test/tools/gold/X86/ctors2.ll @@ -7,10 +7,10 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" -@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @foo, i8* null }] +@llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr @foo, ptr null }] define void @foo() { ret void } -; CHECK: @llvm.global_ctors = appending global [2 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @foo, i8* null }, { i32, void ()*, i8* } { i32 65535, void ()* @bar, i8* null }] +; CHECK: @llvm.global_ctors = appending global [2 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr @foo, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @bar, ptr null }] diff --git a/llvm/test/tools/gold/X86/resolve-to-alias.ll b/llvm/test/tools/gold/X86/resolve-to-alias.ll index fd108a7eb4e88..cf8e3801bfdb5 100644 --- a/llvm/test/tools/gold/X86/resolve-to-alias.ll +++ b/llvm/test/tools/gold/X86/resolve-to-alias.ll @@ -23,7 +23,7 @@ define void @foo() { } declare void @bar() -; PASS1: @bar = alias void (), void ()* @zed +; PASS1: @bar = alias void (), ptr @zed ; PASS1: define void @foo() { ; PASS1-NEXT: call void @bar() diff --git a/llvm/test/tools/gold/X86/strip_names.ll b/llvm/test/tools/gold/X86/strip_names.ll index 150754ef79b33..f39f6c3bf7cab 100644 --- a/llvm/test/tools/gold/X86/strip_names.ll +++ b/llvm/test/tools/gold/X86/strip_names.ll @@ -15,14 +15,14 @@ ; CHECK: @GlobalValueName ; CHECK: @foo(i32 %in) ; CHECK: somelabel: -; CHECK: %GV = load i32, i32* @GlobalValueName +; CHECK: %GV = load i32, ptr @GlobalValueName ; CHECK: %add = add i32 %in, %GV ; CHECK: ret i32 %add ; NONAME: @GlobalValueName ; NONAME: @foo(i32 %0) ; NONAME-NOT: somelabel: -; NONAME: %2 = load i32, i32* @GlobalValueName +; NONAME: %2 = load i32, ptr @GlobalValueName ; NONAME: %3 = add i32 %0, %2 ; NONAME: ret i32 %3 @@ -33,7 +33,7 @@ target triple = "x86_64-unknown-linux-gnu" define i32 @foo(i32 %in) { somelabel: - %GV = load i32, i32* @GlobalValueName + %GV = load i32, ptr @GlobalValueName %add = add i32 %in, %GV ret i32 %add } diff --git a/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll b/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll index 277c92f1eecae..cab79b1d4975f 100644 --- a/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll +++ b/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll @@ -43,15 +43,15 @@ entry: ; Alias are resolved to weak_odr in prevailing module, but left as linkonce_odr ; in non-prevailing module (illegal to have an available_externally alias). -; IMPORT: @linkonceodralias = weak_odr alias void (), void ()* @linkonceodrfuncwithalias -; IMPORT2: @linkonceodralias = linkonce_odr alias void (), void ()* @linkonceodrfuncwithalias -@linkonceodralias = linkonce_odr alias void (), void ()* @linkonceodrfuncwithalias +; IMPORT: @linkonceodralias = weak_odr alias void (), ptr @linkonceodrfuncwithalias +; IMPORT2: @linkonceodralias = linkonce_odr alias void (), ptr @linkonceodrfuncwithalias +@linkonceodralias = linkonce_odr alias void (), ptr @linkonceodrfuncwithalias ; Alias are resolved in prevailing module, but not optimized in ; non-prevailing module (illegal to have an available_externally alias). -; IMPORT: @linkoncealias = weak alias void (), void ()* @linkoncefuncwithalias -; IMPORT2: @linkoncealias = linkonce alias void (), void ()* @linkoncefuncwithalias -@linkoncealias = linkonce alias void (), void ()* @linkoncefuncwithalias +; IMPORT: @linkoncealias = weak alias void (), ptr @linkoncefuncwithalias +; IMPORT2: @linkoncealias = linkonce alias void (), ptr @linkoncefuncwithalias +@linkoncealias = linkonce alias void (), ptr @linkoncefuncwithalias ; Function with an alias are resolved in prevailing module, but ; not optimized in non-prevailing module (illegal to have an diff --git a/llvm/test/tools/gold/X86/type-merge.ll b/llvm/test/tools/gold/X86/type-merge.ll index 373487d97e9dd..0c2f510943dde 100644 --- a/llvm/test/tools/gold/X86/type-merge.ll +++ b/llvm/test/tools/gold/X86/type-merge.ll @@ -8,19 +8,19 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @foo() { - call void @bar(i8* null) + call void @bar(ptr null) ret void } -declare void @bar(i8*) +declare void @bar(ptr) ; CHECK: define void @foo() { -; CHECK-NEXT: call void @bar(i8* null) +; CHECK-NEXT: call void @bar(ptr null) ; CHECK-NEXT: ret void ; CHECK-NEXT: } -; CHECK: declare void @bar(i8*) +; CHECK: declare void @bar(ptr) ; CHECK: define void @zed() { -; CHECK-NEXT: call void bitcast (void (i8*)* @bar to void ()*)() +; CHECK-NEXT: call void @bar() ; CHECK-NEXT: ret void ; CHECK-NEXT: } diff --git a/llvm/test/tools/gold/X86/type-merge2.ll b/llvm/test/tools/gold/X86/type-merge2.ll index 28ba37e9dcdea..0975e2a9dbbd6 100644 --- a/llvm/test/tools/gold/X86/type-merge2.ll +++ b/llvm/test/tools/gold/X86/type-merge2.ll @@ -16,15 +16,14 @@ define void @foo() { } declare void @bar(%zed*) -; CHECK: %zed = type { i8 } -; CHECK-NEXT: %zed.0 = type { i16 } +; CHECK-NOT: %zed ; CHECK: define void @foo() { -; CHECK-NEXT: call void bitcast (void (%zed.0*)* @bar to void (%zed*)*)(%zed* null) +; CHECK-NEXT: call void @bar(ptr null) ; CHECK-NEXT: ret void ; CHECK-NEXT: } -; CHECK: define void @bar(%zed.0* %this) { -; CHECK-NEXT: store %zed.0* %this, %zed.0** null +; CHECK: define void @bar(ptr %this) { +; CHECK-NEXT: store ptr %this, ptr null ; CHECK-NEXT: ret void ; CHECK-NEXT: } diff --git a/llvm/test/tools/gold/X86/weak.ll b/llvm/test/tools/gold/X86/weak.ll index 340de107b43b8..c9dc7d425cb16 100644 --- a/llvm/test/tools/gold/X86/weak.ll +++ b/llvm/test/tools/gold/X86/weak.ll @@ -10,10 +10,10 @@ target triple = "x86_64-unknown-linux-gnu" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" @a = weak global i32 42 -@b = global i32* @a +@b = global ptr @a ; Test that @b and @c end up pointing to the same variable. -; CHECK: @b = global i32* @a{{$}} +; CHECK: @b = global ptr @a{{$}} ; CHECK: @a = weak global i32 42 -; CHECK: @c = global i32* @a{{$}} +; CHECK: @c = global ptr @a{{$}}