Skip to content

Commit 69d9690

Browse files
compnerdbob-wilson
authored andcommitted
IRGen: do not use WeakImport on PE/COFF
PE/COFF does not provide weak import semantics. Fallback to strong import semantics on PE/COFF.
1 parent 0db9b9c commit 69d9690

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

lib/IRGen/IRGenModule.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -981,8 +981,12 @@ void IRGenModule::addLinkLibrary(const LinkLibrary &linkLib) {
981981
encodeForceLoadSymbolName(buf, linkLib.getName());
982982
auto ForceImportThunk =
983983
Module.getOrInsertFunction(buf, llvm::FunctionType::get(VoidTy, false));
984-
ApplyIRLinkage(IRLinkage::ExternalWeakImport)
985-
.to(cast<llvm::GlobalValue>(ForceImportThunk));
984+
985+
const IRLinkage IRL =
986+
llvm::Triple(Module.getTargetTriple()).isOSBinFormatCOFF()
987+
? IRLinkage::ExternalImport
988+
: IRLinkage::ExternalWeakImport;
989+
ApplyIRLinkage(IRL).to(cast<llvm::GlobalValue>(ForceImportThunk));
986990

987991
buf += "_$";
988992
appendEncodedName(buf, IRGen.Opts.ModuleName);

test/Serialization/autolinking.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// RUN: %target-swift-frontend -emit-module -parse-stdlib -o %t -module-name someModule -module-link-name module %S/../Inputs/empty.swift -autolink-force-load
1414
// RUN: %target-swift-frontend -emit-ir -lmagic %s -I %t > %t/force-load.txt
1515
// RUN: %FileCheck %s < %t/force-load.txt
16-
// RUN: %FileCheck -check-prefix=FORCE-LOAD-CLIENT %s < %t/force-load.txt
16+
// RUN: %FileCheck -check-prefix FORCE-LOAD-CLIENT -check-prefix FORCE-LOAD-CLIENT-%target-object-format %s < %t/force-load.txt
1717

1818
// RUN: %target-swift-frontend -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift | %FileCheck --check-prefix=NO-FORCE-LOAD %s
1919
// RUN: %target-swift-frontend -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift -autolink-force-load | %FileCheck --check-prefix=FORCE-LOAD %s
@@ -49,5 +49,6 @@ import someModule
4949
// FORCE-LOAD-CLIENT: @llvm.used = appending global [{{[0-9]+}} x i8*] [
5050
// FORCE-LOAD-CLIENT: i8* bitcast (void ()** @"_swift_FORCE_LOAD_$_module_$_autolinking" to i8*)
5151
// FORCE-LOAD-CLIENT: ], section "llvm.metadata"
52-
// FORCE-LOAD-CLIENT: declare extern_weak {{(dllimport )?}}void @"_swift_FORCE_LOAD_$_module"()
52+
// FORCE-LOAD-CLIENT-MACHO: declare extern_weak {{(dllimport )?}}void @"_swift_FORCE_LOAD_$_module"()
53+
// FORCE-LOAD-CLIENT-COFF: declare extern {{(dllimport )?}}void @"_swift_FORCE_LOAD_$_module"()
5354

0 commit comments

Comments
 (0)