@@ -659,8 +659,8 @@ IRGenModule::createStringConstant(StringRef Str,
659
659
return NAME; \
660
660
NAME = Module.getOrInsertGlobal (SYM, FullTypeMetadataStructTy); \
661
661
if (useDllStorage () && !isStandardLibrary ()) \
662
- cast<llvm::GlobalVariable>(NAME)-> setDLLStorageClass ( \
663
- llvm::GlobalValue::DLLImportStorageClass); \
662
+ ApplyIRLinkage (IRLinkage::ExternalImport) \
663
+ . to (cast< llvm::GlobalVariable>(NAME)); \
664
664
return NAME; \
665
665
}
666
666
@@ -681,9 +681,8 @@ llvm::Constant *IRGenModule::getObjCEmptyCachePtr() {
681
681
// struct objc_cache _objc_empty_cache;
682
682
ObjCEmptyCachePtr = Module.getOrInsertGlobal (" _objc_empty_cache" ,
683
683
OpaquePtrTy->getElementType ());
684
- if (useDllStorage ())
685
- cast<llvm::GlobalVariable>(ObjCEmptyCachePtr)
686
- ->setDLLStorageClass (llvm::GlobalValue::DLLImportStorageClass);
684
+ ApplyIRLinkage (IRLinkage::ExternalImport)
685
+ .to (cast<llvm::GlobalVariable>(ObjCEmptyCachePtr));
687
686
} else {
688
687
// FIXME: Remove even the null value per rdar://problem/18801263
689
688
ObjCEmptyCachePtr = llvm::ConstantPointerNull::get (OpaquePtrTy);
@@ -714,9 +713,8 @@ Address IRGenModule::getAddrOfObjCISAMask() {
714
713
assert (TargetInfo.hasISAMasking ());
715
714
if (!ObjCISAMaskPtr) {
716
715
ObjCISAMaskPtr = Module.getOrInsertGlobal (" swift_isaMask" , IntPtrTy);
717
- if (useDllStorage ())
718
- cast<llvm::GlobalVariable>(ObjCISAMaskPtr)
719
- ->setDLLStorageClass (llvm::GlobalValue::DLLImportStorageClass);
716
+ ApplyIRLinkage (IRLinkage::ExternalImport)
717
+ .to (cast<llvm::GlobalVariable>(ObjCISAMaskPtr));
720
718
}
721
719
return Address (ObjCISAMaskPtr, getPointerAlignment ());
722
720
}
0 commit comments