Index: clang/test/OpenMP/target_codegen_registration.cpp =================================================================== --- clang/test/OpenMP/target_codegen_registration.cpp +++ clang/test/OpenMP/target_codegen_registration.cpp @@ -393,7 +393,7 @@ //CHECK: ret void //CHECK: declare i32 @__tgt_unregister_lib([[DSCTY]]*) -//CHECK: define linkonce dso_local hidden void @[[REGFN]](i8*) +//CHECK: define linkonce hidden void @[[REGFN]](i8*) //CHECK-SAME: comdat { //CHECK: call i32 @__tgt_register_lib([[DSCTY]]* [[DESC]]) //CHECK: call i32 @__cxa_atexit(void (i8*)* @[[UNREGFN]], i8* bitcast ([[DSCTY]]* [[DESC]] to i8*), Index: clang/test/OpenMP/target_parallel_codegen_registration.cpp =================================================================== --- clang/test/OpenMP/target_parallel_codegen_registration.cpp +++ clang/test/OpenMP/target_parallel_codegen_registration.cpp @@ -393,7 +393,7 @@ //CHECK: ret void //CHECK: declare i32 @__tgt_unregister_lib([[DSCTY]]*) -//CHECK: define linkonce dso_local hidden void @[[REGFN]](i8*) +//CHECK: define linkonce hidden void @[[REGFN]](i8*) //CHECK-SAME: comdat { //CHECK: call i32 @__tgt_register_lib([[DSCTY]]* [[DESC]]) //CHECK: call i32 @__cxa_atexit(void (i8*)* @[[UNREGFN]], i8* bitcast ([[DSCTY]]* [[DESC]] to i8*), Index: clang/test/OpenMP/target_parallel_for_codegen_registration.cpp =================================================================== --- clang/test/OpenMP/target_parallel_for_codegen_registration.cpp +++ clang/test/OpenMP/target_parallel_for_codegen_registration.cpp @@ -402,7 +402,7 @@ //CHECK: ret void //CHECK: declare i32 @__tgt_unregister_lib([[DSCTY]]*) -//CHECK: define linkonce dso_local hidden void @[[REGFN]](i8*) +//CHECK: define linkonce hidden void @[[REGFN]](i8*) //CHECK-SAME: comdat { //CHECK: call i32 @__tgt_register_lib([[DSCTY]]* [[DESC]]) //CHECK: call i32 @__cxa_atexit(void (i8*)* @[[UNREGFN]], i8* bitcast ([[DSCTY]]* [[DESC]] to i8*), Index: clang/test/OpenMP/target_parallel_for_simd_codegen_registration.cpp =================================================================== --- clang/test/OpenMP/target_parallel_for_simd_codegen_registration.cpp +++ clang/test/OpenMP/target_parallel_for_simd_codegen_registration.cpp @@ -402,7 +402,7 @@ //CHECK: ret void //CHECK: declare i32 @__tgt_unregister_lib([[DSCTY]]*) -//CHECK: define linkonce dso_local hidden void @[[REGFN]](i8*) +//CHECK: define linkonce hidden void @[[REGFN]](i8*) //CHECK-SAME: comdat { //CHECK: call i32 @__tgt_register_lib([[DSCTY]]* [[DESC]]) //CHECK: call i32 @__cxa_atexit(void (i8*)* @[[UNREGFN]], i8* bitcast ([[DSCTY]]* [[DESC]] to i8*), Index: clang/test/OpenMP/target_simd_codegen_registration.cpp =================================================================== --- clang/test/OpenMP/target_simd_codegen_registration.cpp +++ clang/test/OpenMP/target_simd_codegen_registration.cpp @@ -402,7 +402,7 @@ //CHECK: ret void //CHECK: declare i32 @__tgt_unregister_lib([[DSCTY]]*) -//CHECK: define linkonce dso_local hidden void @[[REGFN]](i8*) +//CHECK: define linkonce hidden void @[[REGFN]](i8*) //CHECK-SAME: comdat { //CHECK: call i32 @__tgt_register_lib([[DSCTY]]* [[DESC]]) //CHECK: call i32 @__cxa_atexit(void (i8*)* @[[UNREGFN]], i8* bitcast ([[DSCTY]]* [[DESC]] to i8*), Index: clang/test/OpenMP/target_teams_codegen_registration.cpp =================================================================== --- clang/test/OpenMP/target_teams_codegen_registration.cpp +++ clang/test/OpenMP/target_teams_codegen_registration.cpp @@ -393,7 +393,7 @@ //CHECK: ret void //CHECK: declare i32 @__tgt_unregister_lib([[DSCTY]]*) -//CHECK: define linkonce dso_local hidden void @[[REGFN]](i8*) +//CHECK: define linkonce hidden void @[[REGFN]](i8*) //CHECK-SAME: comdat { //CHECK: call i32 @__tgt_register_lib([[DSCTY]]* [[DESC]]) //CHECK: call i32 @__cxa_atexit(void (i8*)* @[[UNREGFN]], i8* bitcast ([[DSCTY]]* [[DESC]] to i8*), Index: clang/test/OpenMP/target_teams_distribute_codegen_registration.cpp =================================================================== --- clang/test/OpenMP/target_teams_distribute_codegen_registration.cpp +++ clang/test/OpenMP/target_teams_distribute_codegen_registration.cpp @@ -402,7 +402,7 @@ //CHECK: ret void //CHECK: declare i32 @__tgt_unregister_lib([[DSCTY]]*) -//CHECK: define linkonce dso_local hidden void @[[REGFN]](i8*) +//CHECK: define linkonce hidden void @[[REGFN]](i8*) //CHECK-SAME: comdat { //CHECK: call i32 @__tgt_register_lib([[DSCTY]]* [[DESC]]) //CHECK: call i32 @__cxa_atexit(void (i8*)* @[[UNREGFN]], i8* bitcast ([[DSCTY]]* [[DESC]] to i8*), Index: clang/test/OpenMP/target_teams_distribute_parallel_for_simd_codegen_registration.cpp =================================================================== --- clang/test/OpenMP/target_teams_distribute_parallel_for_simd_codegen_registration.cpp +++ clang/test/OpenMP/target_teams_distribute_parallel_for_simd_codegen_registration.cpp @@ -402,7 +402,7 @@ //CHECK: ret void //CHECK: declare i32 @__tgt_unregister_lib([[DSCTY]]*) -//CHECK: define linkonce dso_local hidden void @[[REGFN]](i8*) +//CHECK: define linkonce hidden void @[[REGFN]](i8*) //CHECK-SAME: comdat { //CHECK: call i32 @__tgt_register_lib([[DSCTY]]* [[DESC]]) //CHECK: call i32 @__cxa_atexit(void (i8*)* @[[UNREGFN]], i8* bitcast ([[DSCTY]]* [[DESC]] to i8*), Index: clang/test/OpenMP/target_teams_distribute_simd_codegen_registration.cpp =================================================================== --- clang/test/OpenMP/target_teams_distribute_simd_codegen_registration.cpp +++ clang/test/OpenMP/target_teams_distribute_simd_codegen_registration.cpp @@ -402,7 +402,7 @@ //CHECK: ret void //CHECK: declare i32 @__tgt_unregister_lib([[DSCTY]]*) -//CHECK: define linkonce dso_local hidden void @[[REGFN]](i8*) +//CHECK: define linkonce hidden void @[[REGFN]](i8*) //CHECK-SAME: comdat { //CHECK: call i32 @__tgt_register_lib([[DSCTY]]* [[DESC]]) //CHECK: call i32 @__cxa_atexit(void (i8*)* @[[UNREGFN]], i8* bitcast ([[DSCTY]]* [[DESC]] to i8*), Index: lld/test/ELF/lto/internalize-llvmused.ll =================================================================== --- lld/test/ELF/lto/internalize-llvmused.ll +++ lld/test/ELF/lto/internalize-llvmused.ll @@ -17,4 +17,4 @@ @llvm.used = appending global [1 x i8*] [ i8* bitcast (void ()* @f to i8*)] ; Check that f is not internalized. -; CHECK: define dso_local hidden void @f() +; CHECK: define hidden void @f() Index: lld/test/ELF/lto/visibility.ll =================================================================== --- lld/test/ELF/lto/visibility.ll +++ lld/test/ELF/lto/visibility.ll @@ -29,7 +29,7 @@ target triple = "x86_64-unknown-linux-gnu" declare hidden void @g() -; IR: declare dso_local hidden void @g() +; IR: declare hidden void @g() define void @f() { call void @g() Index: llvm/include/llvm/IR/GlobalValue.h =================================================================== --- llvm/include/llvm/IR/GlobalValue.h +++ llvm/include/llvm/IR/GlobalValue.h @@ -233,6 +233,8 @@ assert((!hasLocalLinkage() || V == DefaultVisibility) && "local linkage requires default visibility"); Visibility = V; + if (!hasExternalWeakLinkage() && V != DefaultVisibility) + setDSOLocal(true); } /// If the value is "Thread Local", its value isn't shared by the threads. Index: llvm/lib/IR/AsmWriter.cpp =================================================================== --- llvm/lib/IR/AsmWriter.cpp +++ llvm/lib/IR/AsmWriter.cpp @@ -2499,8 +2499,11 @@ static void PrintDSOLocation(const GlobalValue &GV, formatted_raw_ostream &Out) { - // GVs with local linkage are implicitly dso_local, so we don't print it. - if (GV.isDSOLocal() && !GV.hasLocalLinkage()) + // GVs with local linkage or non default visibility are implicitly dso_local, + // so we don't print it. + bool Implicit = GV.hasLocalLinkage() || + (!GV.hasExternalWeakLinkage() && !GV.hasDefaultVisibility()); + if (GV.isDSOLocal() && !Implicit) Out << "dso_local "; } Index: llvm/lib/IR/Verifier.cpp =================================================================== --- llvm/lib/IR/Verifier.cpp +++ llvm/lib/IR/Verifier.cpp @@ -575,6 +575,10 @@ "GlobalValue with private or internal linkage must be dso_local!", &GV); + if (!GV.hasDefaultVisibility() && !GV.hasExternalWeakLinkage()) + Assert(GV.isDSOLocal(), + "GlobalValue with non default visibility must be dso_local!", &GV); + forEachUser(&GV, GlobalValueVisited, [&](const Value *V) -> bool { if (const Instruction *I = dyn_cast(V)) { if (!I->getParent() || !I->getParent()->getParent()) Index: llvm/test/Bitcode/dso_location.ll =================================================================== --- llvm/test/Bitcode/dso_location.ll +++ llvm/test/Bitcode/dso_location.ll @@ -15,11 +15,11 @@ @default_local_global = dso_local default global i32 0 ; CHECK: @default_local_global = dso_local global i32 0 -@hidden_local_global = dso_local hidden global i32 0 -; CHECK: @hidden_local_global = dso_local hidden global i32 0 +@hidden_local_global = hidden global i32 0 +; CHECK: @hidden_local_global = hidden global i32 0 -@protected_local_global = dso_local protected global i32 0 -; CHECK: @protected_local_global = dso_local protected global i32 0 +@protected_local_global = protected global i32 0 +; CHECK: @protected_local_global = protected global i32 0 @local_alias = dso_local alias i32, i32* @local_global ; CHECK-DAG: @local_alias = dso_local alias i32, i32* @local_global @@ -32,11 +32,11 @@ declare dso_local default void @default_local() ; CHECK: declare dso_local void @default_local() -declare dso_local hidden void @hidden_local() -; CHECK: declare dso_local hidden void @hidden_local() +declare hidden void @hidden_local() +; CHECK: declare hidden void @hidden_local() -define dso_local protected void @protected_local() { -; CHECK: define dso_local protected void @protected_local() +define protected void @protected_local() { +; CHECK: define protected void @protected_local() entry: ret void } Index: llvm/test/Linker/funcimport.ll =================================================================== --- llvm/test/Linker/funcimport.ll +++ llvm/test/Linker/funcimport.ll @@ -13,12 +13,12 @@ ; Ensure statics are promoted/renamed correctly from this file (all but ; constant variable need promotion). ; RUN: llvm-link %t.bc -summary-index=%t3.thinlto.bc -S | FileCheck %s --check-prefix=EXPORTSTATIC -; EXPORTSTATIC-DAG: @staticvar.llvm.{{.*}} = dso_local hidden global +; EXPORTSTATIC-DAG: @staticvar.llvm.{{.*}} = hidden global ; Eventually @staticconstvar can be exported as a copy and not promoted -; EXPORTSTATIC-DAG: @staticconstvar.llvm.0 = dso_local hidden unnamed_addr constant -; EXPORTSTATIC-DAG: @P.llvm.{{.*}} = dso_local hidden global void ()* null -; EXPORTSTATIC-DAG: define dso_local hidden i32 @staticfunc.llvm. -; EXPORTSTATIC-DAG: define dso_local hidden void @staticfunc2.llvm. +; EXPORTSTATIC-DAG: @staticconstvar.llvm.0 = hidden unnamed_addr constant +; EXPORTSTATIC-DAG: @P.llvm.{{.*}} = hidden global void ()* null +; EXPORTSTATIC-DAG: define hidden i32 @staticfunc.llvm. +; EXPORTSTATIC-DAG: define hidden void @staticfunc2.llvm. ; Ensure that both weak alias to an imported function and strong alias to a ; non-imported function are correctly turned into declarations. @@ -67,13 +67,13 @@ ; Ensure that imported static variable and function references are correctly ; promoted and renamed (including static constant variable). ; RUN: llvm-link %t2.bc -summary-index=%t3.thinlto.bc -import=referencestatics:%t.bc -S | FileCheck %s --check-prefix=IMPORTSTATIC -; IMPORTSTATIC-DAG: @staticvar.llvm.{{.*}} = external dso_local hidden global +; IMPORTSTATIC-DAG: @staticvar.llvm.{{.*}} = external hidden global ; Eventually @staticconstvar can be imported as a copy -; IMPORTSTATIC-DAG: @staticconstvar.llvm.{{.*}} = external dso_local hidden unnamed_addr constant +; IMPORTSTATIC-DAG: @staticconstvar.llvm.{{.*}} = external hidden unnamed_addr constant ; IMPORTSTATIC-DAG: define available_externally i32 @referencestatics ; IMPORTSTATIC-DAG: %call = call i32 @staticfunc.llvm. ; IMPORTSTATIC-DAG: %0 = load i32, i32* @staticvar.llvm. -; IMPORTSTATIC-DAG: declare dso_local hidden i32 @staticfunc.llvm. +; IMPORTSTATIC-DAG: declare hidden i32 @staticfunc.llvm. ; Ensure that imported global (external) function and variable references ; are handled correctly (including referenced variable imported as @@ -90,7 +90,7 @@ ; Ensure that imported static function pointer correctly promoted and renamed. ; RUN: llvm-link %t2.bc -summary-index=%t3.thinlto.bc -import=callfuncptr:%t.bc -S | FileCheck %s --check-prefix=IMPORTFUNCPTR -; IMPORTFUNCPTR-DAG: @P.llvm.{{.*}} = external dso_local hidden global void ()* +; IMPORTFUNCPTR-DAG: @P.llvm.{{.*}} = external hidden global void ()* ; IMPORTFUNCPTR-DAG: define available_externally void @callfuncptr ; IMPORTFUNCPTR-DAG: %0 = load void ()*, void ()** @P.llvm. Index: llvm/test/Other/extract.ll =================================================================== --- llvm/test/Other/extract.ll +++ llvm/test/Other/extract.ll @@ -7,13 +7,13 @@ ; llvm-extract uses lazy bitcode loading, so make sure it correctly reads ; from bitcode files in addition to assembly files. -; CHECK: define dso_local hidden void @foo() comdat($x) { +; CHECK: define hidden void @foo() comdat($x) { ; CHECK: ret void ; CHECK: } ; The private linkage for foo() should be changed to external linkage and ; hidden visibility added. -; DELETE: declare dso_local hidden void @foo() +; DELETE: declare hidden void @foo() ; DELETE-NOT: comdat ; DELETE: define void @bar() { ; DELETE: call void @foo() Index: llvm/test/ThinLTO/X86/export.ll =================================================================== --- llvm/test/ThinLTO/X86/export.ll +++ llvm/test/ThinLTO/X86/export.ll @@ -5,8 +5,8 @@ ; Ensure statics are promoted/renamed correctly from this file. ; RUN: llvm-lto -thinlto-action=promote %t1.bc -thinlto-index=%t3.bc -o - | llvm-dis -o - | FileCheck %s -; CHECK-DAG: @staticvar.llvm.0 = dso_local hidden global -; CHECK-DAG: define dso_local hidden void @staticfunc.llvm.0 +; CHECK-DAG: @staticvar.llvm.0 = hidden global +; CHECK-DAG: define hidden void @staticfunc.llvm.0 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" Index: llvm/test/ThinLTO/X86/funcimport.ll =================================================================== --- llvm/test/ThinLTO/X86/funcimport.ll +++ llvm/test/ThinLTO/X86/funcimport.ll @@ -9,12 +9,12 @@ ; Ensure statics are promoted/renamed correctly from this file (all but ; constant variable need promotion). ; RUN: llvm-lto -thinlto-action=promote %t.bc -thinlto-index=%t3.bc -o - | llvm-dis -o - | FileCheck %s --check-prefix=EXPORTSTATIC -; EXPORTSTATIC-DAG: @staticvar.llvm.0 = dso_local hidden global +; EXPORTSTATIC-DAG: @staticvar.llvm.0 = hidden global ; Eventually @staticconstvar can be exported as a copy and not promoted -; EXPORTSTATIC-DAG: @staticconstvar.llvm.0 = dso_local hidden unnamed_addr constant -; EXPORTSTATIC-DAG: @P.llvm.0 = dso_local hidden global void ()* null -; EXPORTSTATIC-DAG: define dso_local hidden i32 @staticfunc.llvm.0 -; EXPORTSTATIC-DAG: define dso_local hidden void @staticfunc2.llvm.0 +; EXPORTSTATIC-DAG: @staticconstvar.llvm.0 = hidden unnamed_addr constant +; EXPORTSTATIC-DAG: @P.llvm.0 = hidden global void ()* null +; EXPORTSTATIC-DAG: define hidden i32 @staticfunc.llvm.0 +; EXPORTSTATIC-DAG: define hidden void @staticfunc2.llvm.0 ; Ensure that weak alias to an imported function is correctly turned into ; a declaration. Index: llvm/test/ThinLTO/X86/local_name_conflict.ll =================================================================== --- llvm/test/ThinLTO/X86/local_name_conflict.ll +++ llvm/test/ThinLTO/X86/local_name_conflict.ll @@ -13,7 +13,7 @@ ; promoted name matches the imported copy. ; RUN: llvm-lto -thinlto-action=import %t.bc -thinlto-index=%t4.bc -o - | llvm-dis -o - | FileCheck %s --check-prefix=IMPORT ; IMPORT: call i32 @foo.llvm.[[HASH:[0-9]+]] -; IMPORT: define available_externally dso_local hidden i32 @foo.llvm.[[HASH]]() +; IMPORT: define available_externally hidden i32 @foo.llvm.[[HASH]]() ; The copy in %t2.bc should not be exported/promoted/renamed ; RUN: llvm-lto -thinlto-action=promote %t2.bc -thinlto-index=%t4.bc -o - | llvm-dis -o - | FileCheck %s --check-prefix=NOEXPORTSTATIC @@ -21,7 +21,7 @@ ; Make sure foo is promoted and renamed without complaint in %t3.bc. ; RUN: llvm-lto -thinlto-action=promote %t3.bc -thinlto-index=%t4.bc -o - | llvm-dis -o - | FileCheck %s --check-prefix=EXPORTSTATIC -; EXPORTSTATIC: define dso_local hidden i32 @foo.llvm. +; EXPORTSTATIC: define hidden i32 @foo.llvm. ; ModuleID = 'local_name_conflict_main.o' source_filename = "local_name_conflict_main.c" Index: llvm/test/ThinLTO/X86/referenced_by_constant.ll =================================================================== --- llvm/test/ThinLTO/X86/referenced_by_constant.ll +++ llvm/test/ThinLTO/X86/referenced_by_constant.ll @@ -9,15 +9,15 @@ ; cause @referencedbyglobal and @localreferencedbyglobal to be exported ; and promoted). ; RUN: llvm-lto -thinlto-action=import %t.bc -thinlto-index=%t3.bc -o - | llvm-dis -o - | FileCheck %s --check-prefix=IMPORT -; IMPORT: @someglobal.llvm.0 = external dso_local hidden unnamed_addr constant -; IMPORT: @someglobal2.llvm.0 = external dso_local hidden unnamed_addr constant +; IMPORT: @someglobal.llvm.0 = external hidden unnamed_addr constant +; IMPORT: @someglobal2.llvm.0 = external hidden unnamed_addr constant ; IMPORT: define available_externally void @bar() ; Check the export side: we currently only export bar(), which causes ; @someglobal and @someglobal2 to be promoted (see above). ; RUN: llvm-lto -thinlto-action=promote %t2.bc -thinlto-index=%t3.bc -o - | llvm-dis -o - | FileCheck %s --check-prefix=EXPORT -; EXPORT: @someglobal.llvm.0 = dso_local hidden unnamed_addr constant -; EXPORT: @someglobal2.llvm.0 = dso_local hidden unnamed_addr constant +; EXPORT: @someglobal.llvm.0 = hidden unnamed_addr constant +; EXPORT: @someglobal2.llvm.0 = hidden unnamed_addr constant ; EXPORT: define void @referencedbyglobal() ; EXPORT: define internal void @localreferencedbyglobal() Index: llvm/test/Transforms/FunctionImport/funcimport.ll =================================================================== --- llvm/test/Transforms/FunctionImport/funcimport.ll +++ llvm/test/Transforms/FunctionImport/funcimport.ll @@ -55,7 +55,7 @@ ; Ensure that the call is to the properly-renamed function. ; INSTLIMDEF-DAG: Import staticfunc ; INSTLIMDEF-DAG: %call = call i32 @staticfunc.llvm. -; INSTLIMDEF-DAG: define available_externally dso_local hidden i32 @staticfunc.llvm.{{.*}} !thinlto_src_module !0 { +; INSTLIMDEF-DAG: define available_externally hidden i32 @staticfunc.llvm.{{.*}} !thinlto_src_module !0 { ; INSTLIMDEF-DAG: Import referenceglobals ; CHECK-DAG: define available_externally i32 @referenceglobals(i32 %i) !thinlto_src_module !0 { @@ -80,7 +80,7 @@ ; Ensure that all uses of local variable @P which has used in setfuncptr ; and callfuncptr are to the same promoted/renamed global. -; CHECK-DAG: @P.llvm.{{.*}} = external dso_local hidden global void ()* +; CHECK-DAG: @P.llvm.{{.*}} = external hidden global void ()* ; CHECK-DAG: %0 = load void ()*, void ()** @P.llvm. ; CHECK-DAG: store void ()* @staticfunc2.llvm.{{.*}}, void ()** @P.llvm. @@ -99,8 +99,8 @@ declare void @linkoncefunc2(...) #1 ; INSTLIMDEF-DAG: Import funcwithpersonality -; INSTLIMDEF-DAG: define available_externally dso_local hidden void @funcwithpersonality.llvm.{{.*}}() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) !thinlto_src_module !0 { -; INSTLIM5-DAG: declare dso_local hidden void @funcwithpersonality.llvm.{{.*}}() +; INSTLIMDEF-DAG: define available_externally hidden void @funcwithpersonality.llvm.{{.*}}() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) !thinlto_src_module !0 { +; INSTLIM5-DAG: declare hidden void @funcwithpersonality.llvm.{{.*}}() ; CHECK-DAG: declare void @variadic(...) declare void @variadic(...) Index: llvm/test/Transforms/ThinLTOBitcodeWriter/comdat.ll =================================================================== --- llvm/test/Transforms/ThinLTOBitcodeWriter/comdat.ll +++ llvm/test/Transforms/ThinLTOBitcodeWriter/comdat.ll @@ -25,9 +25,9 @@ ; MERGED-SAME: comdat(${{"?lwt[^ ]+}}) @lwt_aliasee = private unnamed_addr global [1 x i8*] [i8* null], comdat($lwt), !type !0 -; MERGED: {{@"?lwt_nl[^ ]+}} = dso_local hidden unnamed_addr global +; MERGED: {{@"?lwt_nl[^ ]+}} = hidden unnamed_addr global ; MERGED-SAME: comdat(${{"?lwt[^ ]+}}) -; THIN: {{@"?lwt_nl[^ ]+}} = external dso_local hidden +; THIN: {{@"?lwt_nl[^ ]+}} = external hidden @lwt_nl = internal unnamed_addr global i32 0, comdat($lwt) ; MERGED: @nlwt_aliasee = private unnamed_addr global @@ -47,11 +47,11 @@ ; THIN-SAME: comdat($nt) @nt_nl = internal unnamed_addr global i32 0, comdat($nt) -; MERGED: {{@"?lwt[^ ]+}} = dso_local hidden unnamed_addr alias +; MERGED: {{@"?lwt[^ ]+}} = hidden unnamed_addr alias ; THIN: {{@"?lwt[^ ]+}} = external hidden @lwt = internal unnamed_addr alias [1 x i8*], [1 x i8*]* @lwt_aliasee -; MERGED: {{@"?nlwt_nl[^ ]+}} = dso_local hidden unnamed_addr alias +; MERGED: {{@"?nlwt_nl[^ ]+}} = hidden unnamed_addr alias ; THIN: {{@"?nlwt_nl[^ ]+}} = external hidden @nlwt_nl = internal unnamed_addr alias [1 x i8*], [1 x i8*]* @nlwt_aliasee Index: llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal1.ll =================================================================== --- llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal1.ll +++ llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal1.ll @@ -12,8 +12,8 @@ ; BCA0: