averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2080 from compnerd/dllstorage

Browse Source
This commit is contained in:
swift-ci
2016-07-07 18:02:08 -07:00
committed by GitHub
parent ce94bd9cca 7352392830
commit 3691b48c67
10 changed files with 280 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/IRGen/IRGenModule.cpp
View File

@@ -451,6 +451,11 @@ llvm::Constant *swift::getRuntimeFn(llvm::Module &Module,
if (auto fn = dyn_cast<llvm::Function>(cache)) {
fn->setCallingConv(cc);
if (llvm::Triple(Module.getTargetTriple()).isOSBinFormatCOFF() &&
(fn->getLinkage() == llvm::GlobalValue::ExternalLinkage ||
fn->getLinkage() == llvm::GlobalValue::AvailableExternallyLinkage))
fn->setDLLStorageClass(llvm::GlobalValue::DLLImportStorageClass);
llvm::AttrBuilder buildFnAttr;
llvm::AttrBuilder buildRetAttr;
@@ -509,6 +514,7 @@ llvm::Constant *swift::getWrapperFn(llvm::Module &Module,
// and leave only one copy.
fun->setLinkage(llvm::Function::LinkOnceODRLinkage);
fun->setVisibility(llvm::Function::HiddenVisibility);
fun->setDLLStorageClass(llvm::Function::DefaultStorageClass);
fun->setDoesNotThrow();
// Add the body of a wrapper.
@@ -525,6 +531,8 @@ llvm::Constant *swift::getWrapperFn(llvm::Module &Module,
auto *globalFnPtr =
new llvm::GlobalVariable(Module, fnPtrTy, false,
llvm::GlobalValue::ExternalLinkage, 0, symbol);
if (llvm::Triple(Module.getTargetTriple()).isOSBinFormatCOFF())
globalFnPtr->setDLLStorageClass(llvm::GlobalValue::DLLImportStorageClass);
// Forward all arguments.
llvm::SmallVector<llvm::Value *, 4> args;
@@ -639,17 +647,25 @@ llvm::Constant *IRGenModule::getEmptyTupleMetadata() {
if (EmptyTupleMetadata)
return EmptyTupleMetadata;
return EmptyTupleMetadata =
Module.getOrInsertGlobal("_TMT_", FullTypeMetadataStructTy);
EmptyTupleMetadata =
Module.getOrInsertGlobal("_TMT_", FullTypeMetadataStructTy);
if (Triple.isOSBinFormatCOFF())
cast<llvm::GlobalVariable>(EmptyTupleMetadata)
->setDLLStorageClass(llvm::GlobalValue::DLLImportStorageClass);
return EmptyTupleMetadata;
}
llvm::Constant *IRGenModule::getObjCEmptyCachePtr() {
if (ObjCEmptyCachePtr) return ObjCEmptyCachePtr;
if (ObjCEmptyCachePtr)
return ObjCEmptyCachePtr;
if (ObjCInterop) {
// struct objc_cache _objc_empty_cache;
ObjCEmptyCachePtr = Module.getOrInsertGlobal("_objc_empty_cache",
OpaquePtrTy->getElementType());
if (Triple.isOSBinFormatCOFF())
cast<llvm::GlobalVariable>(ObjCEmptyCachePtr)
->setDLLStorageClass(llvm::GlobalValue::DLLImportStorageClass);
} else {
// FIXME: Remove even the null value per rdar://problem/18801263
ObjCEmptyCachePtr = llvm::ConstantPointerNull::get(OpaquePtrTy);
@@ -679,7 +695,10 @@ Address IRGenModule::getAddrOfObjCISAMask() {
// isa masking.
assert(TargetInfo.hasISAMasking());
if (!ObjCISAMaskPtr) {
ObjCISAMaskPtr = Module.getOrInsertGlobal("swift_isaMask", IntPtrTy);
ObjCISAMaskPtr = Module.getOrInsertGlobal("swift_isaMask", IntPtrTy);
if (Triple.isOSBinFormatCOFF())
cast<llvm::GlobalVariable>(ObjCISAMaskPtr)
->setDLLStorageClass(llvm::GlobalValue::DLLImportStorageClass);
}
return Address(ObjCISAMaskPtr, getPointerAlignment());
}
@@ -843,6 +862,9 @@ void IRGenModule::addLinkLibrary(const LinkLibrary &linkLib) {
llvm::SmallString<64> buf;
encodeForceLoadSymbolName(buf, linkLib.getName());
auto symbolAddr = Module.getOrInsertGlobal(buf.str(), Int1Ty);
if (Triple.isOSBinFormatCOFF())
cast<llvm::GlobalVariable>(symbolAddr)
->setDLLStorageClass(llvm::GlobalValue::DLLImportStorageClass);
buf += "_$";
appendEncodedName(buf, IRGen.Opts.ModuleName);