This is an archive of the discontinued LLVM Phabricator instance.

Differential D44491

Set dso_local for CFConstantStringClassReference
ClosedPublic

Authored by • espindola on Mar 14 2018, 1:11 PM.

Details

Reviewers
rnk
echristo
Summary

This one cannot use setGVProperties since it has special logic for when it is dllimport or not.

Diff Detail

Revision Contents

PathSize
lib/
CodeGen/
14 lines
test/
CodeGen/
2 lines

Diff 138441

lib/CodeGen/CodeGenModule.cpp

Show First 20 Lines • Show All 3,789 Lines • ▼ Show 20 LinesCodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) {
llvm::Constant *Zero = llvm::Constant::getNullValue(Int32Ty); llvm::Constant *Zero = llvm::Constant::getNullValue(Int32Ty);
llvm::Constant *Zeros[] = { Zero, Zero }; llvm::Constant *Zeros[] = { Zero, Zero };
// If we don't already have it, get __CFConstantStringClassReference. // If we don't already have it, get __CFConstantStringClassReference.
if (!CFConstantStringClassRef) { if (!CFConstantStringClassRef) {
llvm::Type *Ty = getTypes().ConvertType(getContext().IntTy); llvm::Type *Ty = getTypes().ConvertType(getContext().IntTy);
Ty = llvm::ArrayType::get(Ty, 0); Ty = llvm::ArrayType::get(Ty, 0);
llvm::Constant *GV = llvm::GlobalValue *GV = cast<llvm::GlobalValue>(
CreateRuntimeVariable(Ty, "__CFConstantStringClassReference"); CreateRuntimeVariable(Ty, "__CFConstantStringClassReference"));
if (getTriple().isOSBinFormatCOFF()) { if (getTriple().isOSBinFormatCOFF()) {
IdentifierInfo &II = getContext().Idents.get(GV->getName()); IdentifierInfo &II = getContext().Idents.get(GV->getName());
TranslationUnitDecl *TUDecl = getContext().getTranslationUnitDecl(); TranslationUnitDecl *TUDecl = getContext().getTranslationUnitDecl();
DeclContext *DC = TranslationUnitDecl::castToDeclContext(TUDecl); DeclContext *DC = TranslationUnitDecl::castToDeclContext(TUDecl);
llvm::GlobalValue *CGV = cast<llvm::GlobalValue>(GV);
const VarDecl *VD = nullptr; const VarDecl *VD = nullptr;
for (const auto &Result : DC->lookup(&II)) for (const auto &Result : DC->lookup(&II))
if ((VD = dyn_cast<VarDecl>(Result))) if ((VD = dyn_cast<VarDecl>(Result)))
break; break;
if (!VD || !VD->hasAttr<DLLExportAttr>()) { if (!VD || !VD->hasAttr<DLLExportAttr>()) {
CGV->setDLLStorageClass(llvm::GlobalValue::DLLImportStorageClass); GV->setDLLStorageClass(llvm::GlobalValue::DLLImportStorageClass);
CGV->setLinkage(llvm::GlobalValue::ExternalLinkage); GV->setLinkage(llvm::GlobalValue::ExternalLinkage);
} else { } else {
CGV->setDLLStorageClass(llvm::GlobalValue::DLLExportStorageClass); GV->setDLLStorageClass(llvm::GlobalValue::DLLExportStorageClass);
CGV->setLinkage(llvm::GlobalValue::ExternalLinkage); GV->setLinkage(llvm::GlobalValue::ExternalLinkage);
} }
} }
setDSOLocal(GV);
// Decay array -> ptr // Decay array -> ptr
CFConstantStringClassRef = CFConstantStringClassRef =
llvm::ConstantExpr::getGetElementPtr(Ty, GV, Zeros); llvm::ConstantExpr::getGetElementPtr(Ty, GV, Zeros);
} }
QualType CFTy = getContext().getCFConstantStringType(); QualType CFTy = getContext().getCFConstantStringType();
▲ Show 20 Lines • Show All 1,173 Lines • Show Last 20 Lines

test/CodeGen/cfstring-windows.c

Show All 25 Lines
#elif defined(DLLIMPORT) #elif defined(DLLIMPORT)
__declspec(dllimport) long __CFConstantStringClassReference[]; __declspec(dllimport) long __CFConstantStringClassReference[];
#endif #endif
#endif #endif
typedef struct __CFString *CFStringRef; typedef struct __CFString *CFStringRef;
const CFStringRef string = (CFStringRef)__builtin___CFStringMakeConstantString("string"); const CFStringRef string = (CFStringRef)__builtin___CFStringMakeConstantString("string");
// CHECK-CF-IN-CF-DECL: @__CFConstantStringClassReference = external dllexport global [0 x i32] // CHECK-CF-IN-CF-DECL: @__CFConstantStringClassReference = external dso_local dllexport global [0 x i32]
// CHECK-CF-IN-CF-DEFN: @__CFConstantStringClassReference = common dso_local dllexport global [32 x i32] // CHECK-CF-IN-CF-DEFN: @__CFConstantStringClassReference = common dso_local dllexport global [32 x i32]
// CHECK-CF: @__CFConstantStringClassReference = external dllimport global [0 x i32] // CHECK-CF: @__CFConstantStringClassReference = external dllimport global [0 x i32]
// CHECK-CF-EXTERN: @__CFConstantStringClassReference = external dllimport global [0 x i32] // CHECK-CF-EXTERN: @__CFConstantStringClassReference = external dllimport global [0 x i32]
// CHECK-CF-EXTERN-DLLIMPORT: @__CFConstantStringClassReference = external dllimport global [0 x i32] // CHECK-CF-EXTERN-DLLIMPORT: @__CFConstantStringClassReference = external dllimport global [0 x i32]
// CHECK-CF-DLLIMPORT: @__CFConstantStringClassReference = external dllimport global [0 x i32] // CHECK-CF-DLLIMPORT: @__CFConstantStringClassReference = external dllimport global [0 x i32]