diff --git a/llvm/test/Transforms/Tapir/outline-helper-debug.ll b/llvm/test/Transforms/Tapir/outline-helper-debug.ll
index da88529e4716..f6be62b3f033 100644
--- a/llvm/test/Transforms/Tapir/outline-helper-debug.ll
+++ b/llvm/test/Transforms/Tapir/outline-helper-debug.ll
@@ -116,7 +116,7 @@ cleanup:                                          ; preds = %sync.continue, %pfo
 ; CHECK-NEXT: br i1 %{{.+}}, label %[[CLEANUP_SPLIT:.+]], label %det.cont
 
 ; CHECK: [[CLEANUP_SPLIT]]:
-; CHECK-NEXT: call {{.*}}void @main.outline_pfor.end.otd1(ptr %x), !dbg ![[DBGMD:[0-9]+]]
+; CHECK-NEXT: call {{.*}}void @main.outline_pfor.end.otd1(ptr %x, ptr %{{.+}}), !dbg ![[DBGMD:[0-9]+]]
 
 ; CHECK: pfor.end:
 ; CHECK: detach within %syncreg6, label %det.achd, label %det.cont, !dbg ![[DBGMD]]
diff --git a/llvm/test/Transforms/Tapir/outline-shared-unreachable.ll b/llvm/test/Transforms/Tapir/outline-shared-unreachable.ll
index ec0224e66939..90f113d5ebd1 100644
--- a/llvm/test/Transforms/Tapir/outline-shared-unreachable.ll
+++ b/llvm/test/Transforms/Tapir/outline-shared-unreachable.ll
@@ -33,10 +33,10 @@ unreachable:                                      ; preds = %entry.unreachable_c
 
 ; CHECK: define void @_ZN9LAMMPS_NS6Verlet14run_stencil_mdEiRNSt3__13mapIiNS1_6vectorIiNS1_9allocatorIiEEEENS1_4lessIiEENS4_INS1_4pairIKiS6_EEEEEESE_RNS2_IiiS8_NS4_INS9_ISA_iEEEEEESI_PPdSK_()
 ; CHECK: pfor.detach:
-; CHECK: invoke fastcc void @_ZN9LAMMPS_NS6Verlet14run_stencil_mdEiRNSt3__13mapIiNS1_6vectorIiNS1_9allocatorIiEEEENS1_4lessIiEENS4_INS1_4pairIKiS6_EEEEEESE_RNS2_IiiS8_NS4_INS9_ISA_iEEEEEESI_PPdSK_.outline_pfor.body.otd1()
+; CHECK: invoke fastcc void @_ZN9LAMMPS_NS6Verlet14run_stencil_mdEiRNSt3__13mapIiNS1_6vectorIiNS1_9allocatorIiEEEENS1_4lessIiEENS4_INS1_4pairIKiS6_EEEEEESE_RNS2_IiiS8_NS4_INS9_ISA_iEEEEEESI_PPdSK_.outline_pfor.body.otd1(ptr {{.*}}%{{.+}})
 ; CHECK: to label %pfor.detach unwind label %lpad714.loopexit
 
-; CHECK: define internal fastcc void @_ZN9LAMMPS_NS6Verlet14run_stencil_mdEiRNSt3__13mapIiNS1_6vectorIiNS1_9allocatorIiEEEENS1_4lessIiEENS4_INS1_4pairIKiS6_EEEEEESE_RNS2_IiiS8_NS4_INS9_ISA_iEEEEEESI_PPdSK_.outline_pfor.body.otd1()
+; CHECK: define internal fastcc void @_ZN9LAMMPS_NS6Verlet14run_stencil_mdEiRNSt3__13mapIiNS1_6vectorIiNS1_9allocatorIiEEEENS1_4lessIiEENS4_INS1_4pairIKiS6_EEEEEESE_RNS2_IiiS8_NS4_INS9_ISA_iEEEEEESI_PPdSK_.outline_pfor.body.otd1(ptr {{.*}}%{{.+}})
 ; CHECK: pfor.detach.otd1:
 ; CHECK: br label %pfor.body.otd1
 
diff --git a/llvm/test/Transforms/Tapir/spawner-memory-effects.ll b/llvm/test/Transforms/Tapir/spawner-memory-effects.ll
index 8317ab571c37..9d9bbbdec57d 100644
--- a/llvm/test/Transforms/Tapir/spawner-memory-effects.ll
+++ b/llvm/test/Transforms/Tapir/spawner-memory-effects.ll
@@ -35,7 +35,7 @@ det.cont192:                                      ; preds = %det.achd190, %entry
 
 ; CHECK: define internal fastcc void @_Z12generateNodePP5rangePP5eventS0_ii.outline_det.achd190.otd1(ptr {{.*}}%boxes.otd1, ptr
 ; CHECK-NOT: readnone
-; CHECK: %leftEvents.otd1)
+; CHECK: %leftEvents.otd1
 
 ; Function Attrs: nounwind willreturn memory(argmem: readwrite)
 declare token @llvm.taskframe.create() #0
diff --git a/llvm/test/Transforms/Tapir/unlink-unreachable-detach-unwind.ll b/llvm/test/Transforms/Tapir/unlink-unreachable-detach-unwind.ll
index 53a67a632edf..6d62b0a69df7 100644
--- a/llvm/test/Transforms/Tapir/unlink-unreachable-detach-unwind.ll
+++ b/llvm/test/Transforms/Tapir/unlink-unreachable-detach-unwind.ll
@@ -68,7 +68,7 @@ pfor.inc907:                                      ; preds = %pfor.inc907, %pfor.
 
 ; CHECK: pfor.detach470:
 ; CHECK-NOT: detach within
-; CHECK: invoke fastcc void @_ZN9LAMMPS_NS6Verlet14run_stencil_mdEiPNSt3__16vectorIiNS1_9allocatorIiEEEES6_PiS7_PPdS9_.outline_pfor.body.entry472.otd1()
+; CHECK: invoke fastcc void @_ZN9LAMMPS_NS6Verlet14run_stencil_mdEiPNSt3__16vectorIiNS1_9allocatorIiEEEES6_PiS7_PPdS9_.outline_pfor.body.entry472.otd1(ptr %{{.+}})
 ; CHECK-NEXT: to label %pfor.detach470 unwind label %lpad651
 
 ; Function Attrs: nounwind willreturn memory(argmem: readwrite)