Skip to content

Commit 8f5f77a

Browse files
author
marcrasi
authored
TF-587: Default arguments not working in Swift-Jupyter (#25664)
Revert "IRGen: give non_abi WeakODR linkage" This reverts commit 846a64b.
1 parent 8996939 commit 8f5f77a

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

lib/IRGen/GenDecl.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,16 +1654,13 @@ getIRLinkage(const UniversalLinkageInfo &info, SILLinkage linkage,
16541654
return {llvm::GlobalValue::ExternalLinkage, PublicDefinitionVisibility,
16551655
ExportedStorage};
16561656

1657-
case SILLinkage::PublicNonABI:
1658-
return isDefinition ? RESULT(WeakODR, Hidden, Default)
1659-
: RESULT(External, Hidden, Default);
1660-
16611657
case SILLinkage::Shared:
16621658
case SILLinkage::SharedExternal:
16631659
return isDefinition ? RESULT(LinkOnceODR, Hidden, Default)
16641660
: RESULT(External, Hidden, Default);
16651661

16661662
case SILLinkage::Hidden:
1663+
case SILLinkage::PublicNonABI:
16671664
return RESULT(External, Hidden, Default);
16681665

16691666
case SILLinkage::Private: {

test/IRGen/sil_linkage.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sil_stage canonical
55
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @public_fragile_function_test() {{.*}} {
66
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @public_transparent_fragile_function_test() {{.*}} {
77
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @public_transparent_function_test() {{.*}} {
8-
// CHECK: define weak_odr hidden swiftcc void @public_non_abi_function_test() {{.*}} {
8+
// CHECK: define hidden swiftcc void @public_non_abi_function_test() {{.*}} {
99
// CHECK: define hidden swiftcc void @hidden_fragile_function_test() {{.*}} {
1010
// CHECK: define linkonce_odr hidden swiftcc void @shared_fragile_function_test() {{.*}} {
1111
// CHECK: define{{( internal)?}} swiftcc void @private_fragile_function_test() {{.*}} {

0 commit comments

Comments
 (0)