diff --git a/llvm/test/tools/llvm-link/Inputs/remangle1.ll b/llvm/test/tools/llvm-link/Inputs/remangle1.ll
index 5c7f7c922aac3..b94f01c0e5931 100644
--- a/llvm/test/tools/llvm-link/Inputs/remangle1.ll
+++ b/llvm/test/tools/llvm-link/Inputs/remangle1.ll
@@ -6,5 +6,5 @@ target triple = "x86_64-unknown-linux-gnu"
 %fum = type { %aac, i8, [7 x i8] }
 %aac = type { [8 x i8] }
 
-declare void @bar01(%aaa*)
-declare void @bar02(%fum*)
+declare void @bar01(%aaa)
+declare void @bar02(%fum)
diff --git a/llvm/test/tools/llvm-link/Inputs/remangle2.ll b/llvm/test/tools/llvm-link/Inputs/remangle2.ll
index b07be3c9cf03f..1b23dcfc52f51 100644
--- a/llvm/test/tools/llvm-link/Inputs/remangle2.ll
+++ b/llvm/test/tools/llvm-link/Inputs/remangle2.ll
@@ -8,20 +8,20 @@ target triple = "x86_64-unknown-linux-gnu"
 %abb = type { %abc }
 %abc = type { [4 x i8] }
 
-declare void @foo(%fum*)
+declare void @foo(%fum)
 
-declare %fum.1** @"llvm.ssa.copy.p0p0s_fum.1s"(%fum.1**)
+declare %fum.1 @"llvm.ssa.copy.s_fum.1s"(%fum.1)
 
-declare %fum** @"llvm.ssa.copy.p0p0s_fums"(%fum**)
+declare %fum @"llvm.ssa.copy.s_fums"(%fum)
 
-define void @foo1(%fum** %a, %fum.1 ** %b) {
-  %b.copy = call %fum.1** @"llvm.ssa.copy.p0p0s_fum.1s"(%fum.1** %b)
-  %a.copy = call %fum** @"llvm.ssa.copy.p0p0s_fums"(%fum** %a)
+define void @foo1(%fum %a, %fum.1 %b) {
+  %b.copy = call %fum.1 @"llvm.ssa.copy.s_fum.1s"(%fum.1 %b)
+  %a.copy = call %fum @"llvm.ssa.copy.s_fums"(%fum %a)
   ret void
 }
 
-define void @foo2(%fum.1 ** %b, %fum** %a) {
-  %a.copy = call %fum** @"llvm.ssa.copy.p0p0s_fums"(%fum** %a)
-  %b.copy = call %fum.1** @"llvm.ssa.copy.p0p0s_fum.1s"(%fum.1** %b)
+define void @foo2(%fum.1 %b, %fum %a) {
+  %a.copy = call %fum @"llvm.ssa.copy.s_fums"(%fum %a)
+  %b.copy = call %fum.1 @"llvm.ssa.copy.s_fum.1s"(%fum.1 %b)
   ret void
 }
diff --git a/llvm/test/tools/llvm-link/remangle.ll b/llvm/test/tools/llvm-link/remangle.ll
index f73fa117feb67..e65cab3963f6d 100644
--- a/llvm/test/tools/llvm-link/remangle.ll
+++ b/llvm/test/tools/llvm-link/remangle.ll
@@ -10,18 +10,18 @@
 ; CHECK-DAG: %abb = type { %abc }
 ; CHECK-DAG: %abc = type { [4 x i8] }
 
-; CHECK-LABEL: define void @foo1(%fum.1** %a, %fum.1.2** %b) {
-; CHECK-NEXT:   %b.copy = call %fum.1.2** @llvm.ssa.copy.p0p0s_fum.1.2s(%fum.1.2** %b)
-; CHECK-NEXT:   %a.copy = call %fum.1** @llvm.ssa.copy.p0p0s_fum.1s(%fum.1** %a)
+; CHECK-LABEL: define void @foo1(%fum.1 %a, %fum.1.2 %b) {
+; CHECK-NEXT:   %b.copy = call %fum.1.2 @llvm.ssa.copy.s_fum.1.2s(%fum.1.2 %b)
+; CHECK-NEXT:   %a.copy = call %fum.1 @llvm.ssa.copy.s_fum.1s(%fum.1 %a)
 ; CHECK-NEXT:  ret void
 
-; CHECK: declare %fum.1.2** @llvm.ssa.copy.p0p0s_fum.1.2s(%fum.1.2** returned)
+; CHECK: declare %fum.1.2 @llvm.ssa.copy.s_fum.1.2s(%fum.1.2 returned)
 
-; 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-LABEL: define void @foo2(%fum.1.2** %b, %fum.1** %a) {
-; CHECK-NEXT:   %a.copy = call %fum.1** @llvm.ssa.copy.p0p0s_fum.1s(%fum.1** %a)
-; CHECK-NEXT:  %b.copy = call %fum.1.2** @llvm.ssa.copy.p0p0s_fum.1.2s(%fum.1.2** %b)
+; CHECK-LABEL: define void @foo2(%fum.1.2 %b, %fum.1 %a) {
+; CHECK-NEXT:   %a.copy = call %fum.1 @llvm.ssa.copy.s_fum.1s(%fum.1 %a)
+; CHECK-NEXT:  %b.copy = call %fum.1.2 @llvm.ssa.copy.s_fum.1.2s(%fum.1.2 %b)
 ; CHECK-NEXT:  ret void