This is an archive of the discontinued LLVM Phabricator instance.

Differential D44805

Set dso_local on __ImageBase
ClosedPublic

Authored by • espindola on Mar 22 2018, 1:49 PM.

Details

Reviewers
echristo
rnk

Diff Detail

Event Timeline

• espindola created this revision.Mar 22 2018, 1:49 PM
rnk accepted this revision.Mar 22 2018, 1:56 PM

lgtm

This revision is now accepted and ready to land.Mar 22 2018, 1:56 PM
• espindola closed this revision.Mar 22 2018, 4:05 PM

328266

Revision Contents

PathSize
lib/
CodeGen/
10 lines
test/
CodeGenCXX/
2 lines

Diff 139505

lib/CodeGen/MicrosoftCXXABI.cpp

Show First 20 Lines • Show All 517 Lines • ▼ Show 20 Lines llvm::StructType *getCompleteObjectLocatorType() {
return CompleteObjectLocatorType; return CompleteObjectLocatorType;
} }
llvm::GlobalVariable *getImageBase() { llvm::GlobalVariable *getImageBase() {
StringRef Name = "__ImageBase"; StringRef Name = "__ImageBase";
if (llvm::GlobalVariable *GV = CGM.getModule().getNamedGlobal(Name)) if (llvm::GlobalVariable *GV = CGM.getModule().getNamedGlobal(Name))
return GV; return GV;
return new llvm::GlobalVariable(CGM.getModule(), CGM.Int8Ty, auto *GV = new llvm::GlobalVariable(CGM.getModule(), CGM.Int8Ty,
/*isConstant=*/true, /*isConstant=*/true,
llvm::GlobalValue::ExternalLinkage, llvm::GlobalValue::ExternalLinkage,
/*Initializer=*/nullptr, Name); /*Initializer=*/nullptr, Name);
CGM.setDSOLocal(GV);
return GV;
} }
llvm::Constant *getImageRelativeConstant(llvm::Constant *PtrVal) { llvm::Constant *getImageRelativeConstant(llvm::Constant *PtrVal) {
if (!isImageRelative()) if (!isImageRelative())
return PtrVal; return PtrVal;
if (PtrVal->isNullValue()) if (PtrVal->isNullValue())
return llvm::Constant::getNullValue(CGM.IntTy); return llvm::Constant::getNullValue(CGM.IntTy);
▲ Show 20 Lines • Show All 3,790 Lines • Show Last 20 Lines

test/CodeGenCXX/dllexport.cpp

Show All 37 Lines
// Declarations are not exported. // Declarations are not exported.
// MSC-NOT: @"?ExternGlobalDecl@@3HA" // MSC-NOT: @"?ExternGlobalDecl@@3HA"
// GNU-NOT: @ExternGlobalDecl // GNU-NOT: @ExternGlobalDecl
__declspec(dllexport) extern int ExternGlobalDecl; __declspec(dllexport) extern int ExternGlobalDecl;
// GNU-DAG: @_ZTVN10__cxxabiv117__class_type_infoE = external dso_local global // GNU-DAG: @_ZTVN10__cxxabiv117__class_type_infoE = external dso_local global
// M64-DAG: @__ImageBase = external dso_local constant i8
// dllexport implies a definition. // dllexport implies a definition.
// MSC-DAG: @"?GlobalDef@@3HA" = dso_local dllexport global i32 0, align 4 // MSC-DAG: @"?GlobalDef@@3HA" = dso_local dllexport global i32 0, align 4
// GNU-DAG: @GlobalDef = dso_local dllexport global i32 0, align 4 // GNU-DAG: @GlobalDef = dso_local dllexport global i32 0, align 4
__declspec(dllexport) int GlobalDef; __declspec(dllexport) int GlobalDef;
// Export definition. // Export definition.
// MSC-DAG: @"?GlobalInit1@@3HA" = dso_local dllexport global i32 1, align 4 // MSC-DAG: @"?GlobalInit1@@3HA" = dso_local dllexport global i32 1, align 4
// GNU-DAG: @GlobalInit1 = dso_local dllexport global i32 1, align 4 // GNU-DAG: @GlobalInit1 = dso_local dllexport global i32 1, align 4
▲ Show 20 Lines • Show All 968 Lines • Show Last 20 Lines