[Tapir] Use internal linkage for generated helper functions, to ensur…

…e that they have symbols that tools can use. Fix issue OpenCilk#172.
neboat · Jul 6, 2023 · 2e0bb60 · 2e0bb60
1 parent 05195c4
commit 2e0bb60
Show file tree

Hide file tree

Showing 28 changed files with 73 additions and 73 deletions.
diff --git a/llvm/lib/Transforms/Tapir/CilkABI.cpp b/llvm/lib/Transforms/Tapir/CilkABI.cpp
@@ -107,8 +107,8 @@ void CilkABI::addHelperAttributes(Function &Helper) {
   }
   // Note that the address of the helper is unimportant.
   Helper.setUnnamedAddr(GlobalValue::UnnamedAddr::Global);
-  // The helper is private to this module.
-  Helper.setLinkage(GlobalValue::PrivateLinkage);
+  // The helper is internal to this module.
+  Helper.setLinkage(GlobalValue::InternalLinkage);
 }
 
 CilkABI::CilkABI(Module &M) : TapirTarget(M) {}
@@ -839,7 +839,7 @@ Function *CilkABI::GetCilkSyncNothrowFn(bool instrument) {
     B.CreateRetVoid();
   }
 
-  Fn->setLinkage(Function::PrivateLinkage);
+  Fn->setLinkage(Function::InternalLinkage);
   Fn->setDoesNotThrow();
   if (!DebugABICalls)
     Fn->addFnAttr(Attribute::AlwaysInline);
@@ -994,7 +994,7 @@ Function *CilkABI::GetCilkCatchExceptionFn(Type *ExnTy) {
     B.CreateRet(ExnPN);
   }
 
-  Fn->setLinkage(Function::PrivateLinkage);
+  Fn->setLinkage(Function::InternalLinkage);
   if (!DebugABICalls)
     Fn->addFnAttr(Attribute::AlwaysInline);
   Fn->addFnAttr(Attribute::ReturnsTwice);
@@ -1699,8 +1699,8 @@ void CilkABI::processSubTaskCall(TaskOutlineInfo &TOI, DominatorTree &DT) {
   }
   // Note that the address of the helper is unimportant.
   SpawnHelper->setUnnamedAddr(GlobalValue::UnnamedAddr::Global);
-  // The helper is private to this module.
-  SpawnHelper->setLinkage(GlobalValue::PrivateLinkage);
+  // The helper is internal to this module.
+  SpawnHelper->setLinkage(GlobalValue::InternalLinkage);
 
   // Add alignment assumptions to arguments of helper, based on alignment of
   // values in old function.

diff --git a/llvm/lib/Transforms/Tapir/CilkRTSCilkFor.cpp b/llvm/lib/Transforms/Tapir/CilkRTSCilkFor.cpp
@@ -254,8 +254,8 @@ void RuntimeCilkFor::processOutlinedLoopCall(TapirLoopInfo &TL,
   SpawnHelper->setCallingConv(CallingConv::Fast);
   // Note that the address of the helper is unimportant.
   SpawnHelper->setUnnamedAddr(GlobalValue::UnnamedAddr::Global);
-  // The helper is private to this module.
-  SpawnHelper->setLinkage(GlobalValue::PrivateLinkage);
+  // The helper is internal to this module.
+  SpawnHelper->setLinkage(GlobalValue::InternalLinkage);
 
   // Add alignment assumptions to arguments of helper, based on alignment of
   // values in old function.

diff --git a/llvm/lib/Transforms/Tapir/LoopSpawningTI.cpp b/llvm/lib/Transforms/Tapir/LoopSpawningTI.cpp
@@ -170,8 +170,8 @@ void LoopOutlineProcessor::postProcessOutline(TapirLoopInfo &TL,
   Helper->setCallingConv(CallingConv::Fast);
   // Note that the address of the helper is unimportant.
   Helper->setUnnamedAddr(GlobalValue::UnnamedAddr::Global);
-  // The helper is private to this module.
-  Helper->setLinkage(GlobalValue::PrivateLinkage);
+  // The helper is internal to this module.
+  Helper->setLinkage(GlobalValue::InternalLinkage);
 }
 
 void LoopOutlineProcessor::addSyncToOutlineReturns(TapirLoopInfo &TL,

diff --git a/llvm/test/Transforms/Tapir/CilkSanitizer/loop-spawning-move-instrumentation.ll b/llvm/test/Transforms/Tapir/CilkSanitizer/loop-spawning-move-instrumentation.ll
@@ -420,7 +420,7 @@ cleanup:                                          ; preds = %pfor.cond.cleanup,
   ret i64 %sum.0.load21
 }
 
-; CHECK-LABEL: define private fastcc void @_Z11accum_wrongPKll.outline_pfor.cond.ls1(
+; CHECK-LABEL: define internal fastcc void @_Z11accum_wrongPKll.outline_pfor.cond.ls1(
 
 ; CHECK: call void @__csan_detach(
 ; CHECK: call void @__csan_task(
@@ -637,7 +637,7 @@ csi.cleanup:                                      ; preds = %entry
   resume { i8*, i32 } %csi.cleanup.lpad
 }
 
-; CHECK-LABEL: define private fastcc void @_Z13accum_reducerPKll.outline_pfor.cond.ls1(
+; CHECK-LABEL: define internal fastcc void @_Z13accum_reducerPKll.outline_pfor.cond.ls1(
 
 ; CHECK: call void @__csan_detach(
 ; CHECK: call void @__csan_task(

diff --git a/llvm/test/Transforms/Tapir/csi-tapir-lowering.ll b/llvm/test/Transforms/Tapir/csi-tapir-lowering.ll
@@ -3326,7 +3326,7 @@ if.then146.us.4:                                  ; preds = %if.end141.us.4
 ; CHECK: define void @_ZN3tfk6Render23render_stack_with_patchEPNS_5StackESt4pairIN2cv6Point_IfEES6_ENS_10ResolutionESs(
 ; CHECK: csi.cleanup:
 
-; CHECK-LABEL: define private fastcc void @_ZN3tfk6Render23render_stack_with_patchEPNS_5StackESt4pairIN2cv6Point_IfEES6_ENS_10ResolutionESs.outline_pfor.detach236.ls3(
+; CHECK-LABEL: define internal fastcc void @_ZN3tfk6Render23render_stack_with_patchEPNS_5StackESt4pairIN2cv6Point_IfEES6_ENS_10ResolutionESs.outline_pfor.detach236.ls3(
 ; CHECK: unnamed_addr #[[ATTRIBUTE:[0-9]+]]
 ; CHECK: detach within %[[SYNCREG:.+]], label %[[DETACHED:.+]], label %[[CONTINUE:.+]]
 ; CHECK: [[DETACHED]]:
@@ -3335,7 +3335,7 @@ if.then146.us.4:                                  ; preds = %if.end141.us.4
 ; CHECK: call void @__csi_task_exit(
 ; CHECK: reattach within %[[SYNCREG]], label %[[CONTINUE]]
 
-; CHECK-LABEL: define private fastcc void @_ZN3tfk6Render23render_stack_with_patchEPNS_5StackESt4pairIN2cv6Point_IfEES6_ENS_10ResolutionESs.outline_pfor.detach216.ls2(
+; CHECK-LABEL: define internal fastcc void @_ZN3tfk6Render23render_stack_with_patchEPNS_5StackESt4pairIN2cv6Point_IfEES6_ENS_10ResolutionESs.outline_pfor.detach216.ls2(
 ; CHECK: unnamed_addr #[[ATTRIBUTE]]
 ; CHECK: detach within %[[SYNCREG:.+]], label %[[DETACHED:.+]], label %[[CONTINUE:.+]]
 ; CHECK: [[DETACHED]]:
@@ -3344,7 +3344,7 @@ if.then146.us.4:                                  ; preds = %if.end141.us.4
 ; CHECK: call void @__csi_task_exit(
 ; CHECK: reattach within %[[SYNCREG]], label %[[CONTINUE]]
 
-; CHECK-LABEL: define private fastcc void @_ZN3tfk6Render23render_stack_with_patchEPNS_5StackESt4pairIN2cv6Point_IfEES6_ENS_10ResolutionESs.outline_pfor.detach64.ls2(
+; CHECK-LABEL: define internal fastcc void @_ZN3tfk6Render23render_stack_with_patchEPNS_5StackESt4pairIN2cv6Point_IfEES6_ENS_10ResolutionESs.outline_pfor.detach64.ls2(
 ; CHECK: unnamed_addr #[[ATTRIBUTE]]
 ; CHECK: detach within %[[SYNCREG:.+]], label %[[DETACHED:.+]], label %[[CONTINUE:.+]]
 ; CHECK: [[DETACHED]]:
@@ -3353,7 +3353,7 @@ if.then146.us.4:                                  ; preds = %if.end141.us.4
 ; CHECK: call void @__csi_task_exit(
 ; CHECK: reattach within %[[SYNCREG]], label %[[CONTINUE]]
 
-; CHECK-LABEL: define private fastcc void @_ZN3tfk6Render23render_stack_with_patchEPNS_5StackESt4pairIN2cv6Point_IfEES6_ENS_10ResolutionESs.outline_pfor.detach.us.ls2(
+; CHECK-LABEL: define internal fastcc void @_ZN3tfk6Render23render_stack_with_patchEPNS_5StackESt4pairIN2cv6Point_IfEES6_ENS_10ResolutionESs.outline_pfor.detach.us.ls2(
 ; CHECK: unnamed_addr #[[ATTRIBUTE2:[0-9]+]]
 ; CHECK: detach within %[[SYNCREG:.+]], label %[[DETACHED:.+]], label %[[CONTINUE:.+]]
 ; CHECK: [[DETACHED]]:

diff --git a/llvm/test/Transforms/Tapir/dac-loopspawning-ivs.ll b/llvm/test/Transforms/Tapir/dac-loopspawning-ivs.ll
@@ -472,7 +472,7 @@ pfor.detach122:                                   ; preds = %pfor.inc159, %invok
   %67 = mul i64 %63, %__begin113.0663
   %scevgep = getelementptr i8, i8* %call.i575, i64 %67
   detach within %syncreg111, label %pfor.body126, label %pfor.inc159 unwind label %lpad161.loopexit
-; CHECK: define private fastcc void @_ZN4pbbs12sample_sort_Im8sequenceIlESt4lessIlEEES1_INT0_1TEES5_RKT1_b.outline_pfor.detach122.ls1(i64 %__begin113.0663.start.ls1,
+; CHECK: define internal fastcc void @_ZN4pbbs12sample_sort_Im8sequenceIlESt4lessIlEEES1_INT0_1TEES5_RKT1_b.outline_pfor.detach122.ls1(i64 %__begin113.0663.start.ls1,
 ; CHECK: pfor.detach122.ls1:
 ; CHECK-NOT: indvars.iv = phi
 ; CHECK: %__begin113.0663.ls1 = phi i64

diff --git a/llvm/test/Transforms/Tapir/dac-loopspawning-simple.ll b/llvm/test/Transforms/Tapir/dac-loopspawning-simple.ll
@@ -37,7 +37,7 @@ pfor.detach:                                      ; preds = %pfor.detach.prehead
 ; CHECK-NOT: phi
 ; CHECK: detach
 
-; CHECK: define private fastcc void @[[OUTLINED]](
+; CHECK: define internal fastcc void @[[OUTLINED]](
 ; CHECK: [[TYPE]] [[START:%[a-zA-Z0-9._]+]]
 ; CHECK: [[TYPE]] [[END:%[a-zA-Z0-9._]+]]
 ; CHECK: [[TYPE]] [[GRAIN:%[a-zA-Z0-9._]+]]

diff --git a/llvm/test/Transforms/Tapir/equal-tripcounts.ll b/llvm/test/Transforms/Tapir/equal-tripcounts.ll
@@ -242,7 +242,7 @@ for.end123:                                       ; preds = %for.inc121
   ret void
 }
 
-; CHECK: define private fastcc void @test_correctness.outline_pfor.detach.us.i.ls2(i64 %indvars.iv.i.start.ls2, i64 %end.ls2
+; CHECK: define internal fastcc void @test_correctness.outline_pfor.detach.us.i.ls2(i64 %indvars.iv.i.start.ls2, i64 %end.ls2
 ; CHECK: pfor.inc.us.i.ls2:
 ; CHECK: %exitcond.i.ls2 = icmp eq i64 %indvars.iv.next.i.ls2, %end.ls2
 

diff --git a/llvm/test/Transforms/Tapir/exception-loop-spawning.ll b/llvm/test/Transforms/Tapir/exception-loop-spawning.ll
@@ -446,7 +446,7 @@ unreachable:                                      ; preds = %lpad.body
   unreachable
 }
 
-; CHECK-LABEL: define private fastcc void @_Z19parallelfor_nocatchi.outline_pfor.cond.ls1(
+; CHECK-LABEL: define internal fastcc void @_Z19parallelfor_nocatchi.outline_pfor.cond.ls1(
 ; CHECK: %[[SYNCREG:.+]] = tail call token @llvm.syncregion.start()
 ; CHECK: detach within %[[SYNCREG]], label %[[RECURDET:.+]], label %[[RECURCONT:.+]]
 
@@ -466,7 +466,7 @@ unreachable:                                      ; preds = %lpad.body
 ; CHECK-NOT: detached.rethrow
 
 
-; CHECK-LABEL: define private fastcc void @_Z20parallelfor_tryblocki.outline_pfor.cond17.ls1(
+; CHECK-LABEL: define internal fastcc void @_Z20parallelfor_tryblocki.outline_pfor.cond17.ls1(
 ; CHECK: %[[SYNCREG:.+]] = tail call token @llvm.syncregion.start()
 ; CHECK: detach within %[[SYNCREG]], label %[[RECURDET:.+]], label %[[RECURCONT:.+]] unwind label %[[RECURUW:.+]]
 
@@ -502,13 +502,13 @@ unreachable:                                      ; preds = %lpad.body
 ; CHECK-NEXT: to label %{{.+}} unwind label %[[RECURUW]]
 
 
-; CHECK-LABEL: define private fastcc void @_Z20parallelfor_tryblocki.outline_pfor.cond.ls1(
+; CHECK-LABEL: define internal fastcc void @_Z20parallelfor_tryblocki.outline_pfor.cond.ls1(
 ; CHECK-NOT: invoke
 ; CHECK-NOT: resume
 ; CHECK-NOT: detached.rethrow
 
 
-; CHECK-LABEL: define private fastcc void @_Z27parallelfor_tryblock_inlinei.outline_pfor.cond.ls1(
+; CHECK-LABEL: define internal fastcc void @_Z27parallelfor_tryblock_inlinei.outline_pfor.cond.ls1(
 ; CHECK: %[[SYNCREG:.+]] = tail call token @llvm.syncregion.start()
 ; CHECK: detach within %[[SYNCREG]], label %[[RECURDET:.+]], label %[[RECURCONT:.+]] unwind label %[[RECURUW:.+]]
 

diff --git a/llvm/test/Transforms/Tapir/exception-lowering.ll b/llvm/test/Transforms/Tapir/exception-lowering.ll
@@ -672,7 +672,7 @@ unreachable:                                      ; preds = %lpad, %lpad5
 ; Function Attrs: nounwind
 declare void @llvm.assume(i1) #10
 
-; CHECK-LABEL: define private fastcc void @_Z14spawn_tryblocki.outline_entry.tf.otd1(i32
+; CHECK-LABEL: define internal fastcc void @_Z14spawn_tryblocki.outline_entry.tf.otd1(i32
 ; CHECK: %[[ARG:[a-zA-Z0-9._]+]])
 ; CHECK: %[[CILKSF:.+]] = alloca %struct.__cilkrts_stack_frame
 
@@ -685,7 +685,7 @@ declare void @llvm.assume(i1) #10
 ; CHECK-NEXT: br label %{{.+}}
 
 
-; CHECK-LABEL: define private fastcc void @_Z14spawn_tryblocki.outline_det.cont.tf.otd1()
+; CHECK-LABEL: define internal fastcc void @_Z14spawn_tryblocki.outline_det.cont.tf.otd1()
 ; CHECK: %[[CILKSF:.+]] = alloca %struct.__cilkrts_stack_frame
 
 ; CHECK: call void @__cilkrts_enter_frame_fast_1(ptr %[[CILKSF]])
@@ -722,7 +722,7 @@ declare void @llvm.assume(i1) #10
 ; CHECK-NEXT: resume { ptr, i32 } %[[LPADVAL]]
 
 
-; CHECK-LABEL: define private fastcc void @_Z14spawn_tryblocki.outline_det.cont11.tf.otd1(i32
+; CHECK-LABEL: define internal fastcc void @_Z14spawn_tryblocki.outline_det.cont11.tf.otd1(i32
 ; CHECK: %[[ARG:[a-zA-Z0-9._]+]])
 ; CHECK: %[[CILKSF:.+]] = alloca %struct.__cilkrts_stack_frame
 
@@ -735,7 +735,7 @@ declare void @llvm.assume(i1) #10
 ; CHECK-NEXT: br label %{{.+}}
 
 
-; CHECK-LABEL: define private fastcc void @_Z18spawn_throw_inlinei.outline_entry.tf.otd1()
+; CHECK-LABEL: define internal fastcc void @_Z18spawn_throw_inlinei.outline_entry.tf.otd1()
 ; CHECK: %[[CILKSF:.+]] = alloca %struct.__cilkrts_stack_frame
 
 ; CHECK: call void @__cilkrts_enter_frame_fast_1(ptr %[[CILKSF]])
@@ -763,7 +763,7 @@ declare void @llvm.assume(i1) #10
 ; CHECK-NEXT: unreachable
 
 
-; CHECK-LABEL: define private fastcc void @_Z22spawn_block_destructori.outline_entry.tf.otd1(
+; CHECK-LABEL: define internal fastcc void @_Z22spawn_block_destructori.outline_entry.tf.otd1(
 ; CHECK: %[[ARG:[a-zA-Z0-9._]+]])
 ; CHECK: %[[CILKSF:.+]] = alloca %struct.__cilkrts_stack_frame
 
@@ -789,7 +789,7 @@ declare void @llvm.assume(i1) #10
 ; CHECK-NEXT: resume { ptr, i32 } %[[LPADVAL]]
 
 
-; CHECK-LABEL: define private fastcc void @_Z21spawn_decl_destructori.outline_entry.tf.otd1()
+; CHECK-LABEL: define internal fastcc void @_Z21spawn_decl_destructori.outline_entry.tf.otd1()
 ; CHECK: %[[CILKSF:.+]] = alloca %struct.__cilkrts_stack_frame
 ; CHECK: %[[REFTMP:.+]] = alloca %class.Foo
 
@@ -812,7 +812,7 @@ declare void @llvm.assume(i1) #10
 ; CHECK-NEXT: unreachable
 
 
-; CHECK-LABEL: define private fastcc void @_Z21spawn_stmt_destructori.outline_entry.tf.otd1()
+; CHECK-LABEL: define internal fastcc void @_Z21spawn_stmt_destructori.outline_entry.tf.otd1()
 ; CHECK: %[[CILKSF:.+]] = alloca %struct.__cilkrts_stack_frame
 ; CHECK: %[[REFTMP:.+]] = alloca %class.Foo
 
@@ -835,7 +835,7 @@ declare void @llvm.assume(i1) #10
 ; CHECK-NEXT: unreachable
 
 
-; CHECK-LABEL: define private fastcc void @_Z16spawn_tf_nocatchi.outline_entry.tf.otd1()
+; CHECK-LABEL: define internal fastcc void @_Z16spawn_tf_nocatchi.outline_entry.tf.otd1()
 ; CHECK: %[[CILKSF:.+]] = alloca %struct.__cilkrts_stack_frame
 
 ; CHECK: call void @__cilkrts_enter_frame_fast_1(ptr %[[CILKSF]])

diff --git a/llvm/test/Transforms/Tapir/exception-spawn-in-parfor-loop-spawning.ll b/llvm/test/Transforms/Tapir/exception-spawn-in-parfor-loop-spawning.ll
@@ -616,7 +616,7 @@ declare void @llvm.assume(i1) #6
 ; Function Attrs: nounwind readnone speculatable
 declare i32 @llvm.tapir.loop.grainsize.i32(i32) #7
 
-; CHECK-LABEL: define private fastcc void @_Z15parfor_trycatchi.outline_pfor.cond48.ls1(
+; CHECK-LABEL: define internal fastcc void @_Z15parfor_trycatchi.outline_pfor.cond48.ls1(
 ; CHECK: %[[SYNCREG:.+]] = tail call token @llvm.syncregion.start()
 ; CHECK: %[[DACSYNCREG:.+]] = tail call token @llvm.syncregion.start()
 
@@ -660,7 +660,7 @@ declare i32 @llvm.tapir.loop.grainsize.i32(i32) #7
 ; CHECK-NEXT: unreachable
 
 
-; CHECK-LABEL: define private fastcc void @_Z15parfor_trycatchi.outline_pfor.cond.ls1(
+; CHECK-LABEL: define internal fastcc void @_Z15parfor_trycatchi.outline_pfor.cond.ls1(
 ; CHECK: %[[SYNCREG:.+]] = tail call token @llvm.syncregion.start()
 ; CHECK: %[[DACSYNCREG:.+]] = tail call token @llvm.syncregion.start()
 
@@ -704,7 +704,7 @@ declare i32 @llvm.tapir.loop.grainsize.i32(i32) #7
 ; CHECK-NEXT: unreachable
 
 
-; CHECK-LABEL: define private fastcc void @_Z27parfor_trycatch_destructorsi.outline_pfor.cond70.ls1(
+; CHECK-LABEL: define internal fastcc void @_Z27parfor_trycatch_destructorsi.outline_pfor.cond70.ls1(
 ; CHECK: %[[SYNCREG:.+]] = call token @llvm.syncregion.start()
 ; CHECK: %[[DACSYNCREG:.+]] = {{.*}}call token @llvm.syncregion.start()
 
@@ -783,7 +783,7 @@ declare i32 @llvm.tapir.loop.grainsize.i32(i32) #7
 ; CHECK-NEXT: to label %[[UNREACHABLE2:.+]] unwind label %[[DACDU]]
 
 
-; CHECK-LABEL: define private fastcc void @_Z27parfor_trycatch_destructorsi.outline_pfor.cond.ls1(
+; CHECK-LABEL: define internal fastcc void @_Z27parfor_trycatch_destructorsi.outline_pfor.cond.ls1(
 ; CHECK: %[[SYNCREG:.+]] = call token @llvm.syncregion.start()
 ; CHECK: %[[DACSYNCREG:.+]] = {{.*}}call token @llvm.syncregion.start()
 

diff --git a/llvm/test/Transforms/Tapir/inclusive-range-tapir-loop.ll b/llvm/test/Transforms/Tapir/inclusive-range-tapir-loop.ll
@@ -1334,14 +1334,14 @@ for.inc.i258.3:                                   ; preds = %if.then3.i254.3, %f
   br i1 %niter532.ncmp.3, label %invoke.cont86.loopexit.unr-lcssa, label %for.body.i251
 }
 
-; CHECK-LABEL: define private fastcc void @_ZN8sequence4packIllN5utils9identityFIlEEEE4_seqIT_EPS5_PbT0_S9_T1_.outline_pfor.detach64.ls1(i64 %__begin55.0288.start.ls1,
+; CHECK-LABEL: define internal fastcc void @_ZN8sequence4packIllN5utils9identityFIlEEEE4_seqIT_EPS5_PbT0_S9_T1_.outline_pfor.detach64.ls1(i64 %__begin55.0288.start.ls1,
 ; CHECK: %__begin55.0288.ls1.dac = phi i64
 ; CHECK: [ %__begin55.0288.start.ls1, %pfor.detach64.lr.ph.ls1 ]
 ; CHECK: [ %[[NEXTITERVAR:.+]], %[[RECURCONT:.+]] ]
 ; CHECK: [[RECURCONT]]:
 ; CHECK: %[[NEXTITERVAR]] = add nuw nsw i64 {{.+}}, 1
 
-; CHECK-LABEL: define private fastcc void @_ZN8sequence4packIllN5utils9identityFIlEEEE4_seqIT_EPS5_PbT0_S9_T1_.outline_pfor.detach.ls1(i64 %__begin.0290.start.ls1
+; CHECK-LABEL: define internal fastcc void @_ZN8sequence4packIllN5utils9identityFIlEEEE4_seqIT_EPS5_PbT0_S9_T1_.outline_pfor.detach.ls1(i64 %__begin.0290.start.ls1
 ; CHECK: %__begin.0290.ls1.dac = phi i64
 ; CHECK: [ %__begin.0290.start.ls1, %pfor.detach.lr.ph.ls1 ]
 ; CHECK: [ %[[NEXTITERVAR:.+]], %[[RECURCONT:.+]] ]

diff --git a/llvm/test/Transforms/Tapir/iv-canonicalize.ll b/llvm/test/Transforms/Tapir/iv-canonicalize.ll
@@ -70,7 +70,7 @@ exit:                                             ; preds = %L27
   ret void
 }
 
-; LS: define private fastcc void @julia_mynorm.outline_L12.ls1(i64 %indvar.start.ls1, i64 %end.ls1, i64 %grainsize.ls1)
+; LS: define internal fastcc void @julia_mynorm.outline_L12.ls1(i64 %indvar.start.ls1, i64 %end.ls1, i64 %grainsize.ls1)
 
 declare %jl_value_t*** @julia.ptls_states()
 

diff --git a/llvm/test/Transforms/Tapir/loop-control-uses-parameter.ll b/llvm/test/Transforms/Tapir/loop-control-uses-parameter.ll
@@ -364,7 +364,7 @@ eh.resume:                                        ; preds = %lpad43, %lpad23
   resume { i8*, i32 } %lpad.val59
 }
 
-; CHECK: define private fastcc void @_ZN4pbbs9transposeIjjE6transREmmmmmm.outline_pfor.detach.ls1(
+; CHECK: define internal fastcc void @_ZN4pbbs9transposeIjjE6transREmmmmmm.outline_pfor.detach.ls1(
 ; CHECK: i64 %rStart.ls1
 ; CHECK: )
 ; CHECK: call fastcc void @_ZN4pbbs9transposeIjjE6transREmmmmmm.outline_pfor.detach.ls1(

diff --git a/llvm/test/Transforms/Tapir/loop-spawning-iv-tripcount-type-mismatch.ll b/llvm/test/Transforms/Tapir/loop-spawning-iv-tripcount-type-mismatch.ll
@@ -207,7 +207,7 @@ pfor.cond.cleanup:                                ; preds = %pfor.inc
   unreachable
 }
 
-; CHECK-LABEL: define private fastcc void @_ZL9conj_gradPiS_PdS0_S0_S0_S0_S0_S0_S0_.outline_pfor.cond.ls1(i64 %indvars.iv376.start.ls1,
+; CHECK-LABEL: define internal fastcc void @_ZL9conj_gradPiS_PdS0_S0_S0_S0_S0_S0_S0_.outline_pfor.cond.ls1(i64 %indvars.iv376.start.ls1,
 ; CHECK: i32 %[[END:.+]], i32 %[[GRAINSIZE:.+]],
 
 ; CHECK: _Z10initializePdS_S_S_S_mm.exit.ls1:

diff --git a/llvm/test/Transforms/Tapir/looplimit.ll b/llvm/test/Transforms/Tapir/looplimit.ll
@@ -29,7 +29,7 @@ pfor.cond.cleanup:                                ; preds = %pfor.inc, %entry
 pfor.end.continue:                                ; preds = %pfor.cond.cleanup
   ret void
 
-; CHECK: define private fastcc void @[[OUTLINED]](
+; CHECK: define internal fastcc void @[[OUTLINED]](
 ; CHECK: [[TYPE]] [[START:%[a-zA-Z0-9._]+]]
 ; CHECK: [[TYPE]] [[END:%[a-zA-Z0-9._]+]]
 ; CHECK: [[TYPE]] [[GRAIN:%[a-zA-Z0-9._]+]]