This is an archive of the discontinued LLVM Phabricator instance.

Differential D44482

Set dso_local for NSConcreteStackBlock
ClosedPublic

Authored by • espindola on Mar 14 2018, 10:48 AM.

Details

Reviewers
rnk
echristo

Diff Detail

Event Timeline

• espindola created this revision.Mar 14 2018, 10:48 AM
rnk accepted this revision.Mar 14 2018, 10:52 AM

lgtm

This revision is now accepted and ready to land.Mar 14 2018, 10:52 AM
• espindola closed this revision.Mar 14 2018, 11:25 AM

r327544

Revision Contents

PathSize
lib/
CodeGen/
8 lines
test/
CodeGen/
2 lines

Diff 138410

lib/CodeGen/CGBlocks.cpp

Show First 20 Lines • Show All 2,580 Lines • ▼ Show 20 Lines if (GV->isDeclaration() && (!ND || !ND->hasAttr<DLLExportAttr>())) {
GV->setDLLStorageClass(llvm::GlobalValue::DLLImportStorageClass); GV->setDLLStorageClass(llvm::GlobalValue::DLLImportStorageClass);
GV->setLinkage(llvm::GlobalValue::ExternalLinkage); GV->setLinkage(llvm::GlobalValue::ExternalLinkage);
} else { } else {
GV->setDLLStorageClass(llvm::GlobalValue::DLLExportStorageClass); GV->setDLLStorageClass(llvm::GlobalValue::DLLExportStorageClass);
GV->setLinkage(llvm::GlobalValue::ExternalLinkage); GV->setLinkage(llvm::GlobalValue::ExternalLinkage);
} }
} }
if (!CGM.getLangOpts().BlocksRuntimeOptional) if (CGM.getLangOpts().BlocksRuntimeOptional && GV->isDeclaration() &&
return; GV->hasExternalLinkage())
if (GV->isDeclaration() && GV->hasExternalLinkage())
GV->setLinkage(llvm::GlobalValue::ExternalWeakLinkage); GV->setLinkage(llvm::GlobalValue::ExternalWeakLinkage);
CGM.setDSOLocal(GV);
} }
llvm::Constant *CodeGenModule::getBlockObjectDispose() { llvm::Constant *CodeGenModule::getBlockObjectDispose() {
if (BlockObjectDispose) if (BlockObjectDispose)
return BlockObjectDispose; return BlockObjectDispose;
llvm::Type *args[] = { Int8PtrTy, Int32Ty }; llvm::Type *args[] = { Int8PtrTy, Int32Ty };
llvm::FunctionType *fty llvm::FunctionType *fty
Show All 39 Lines

test/CodeGen/blocks-windows.c

Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Lines
__declspec(dllimport) long _NSConcreteStackBlock[]; __declspec(dllimport) long _NSConcreteStackBlock[];
#endif #endif
int (*g(void))(void) { int (*g(void))(void) {
__block int i; __block int i;
return _Block_copy(^{ ++i; return i; }); return _Block_copy(^{ ++i; return i; });
} }
// CHECK-BLOCKS-IN-BLOCKS-DECL: @_NSConcreteStackBlock = external dllexport global i8* // CHECK-BLOCKS-IN-BLOCKS-DECL: @_NSConcreteStackBlock = external dso_local dllexport global i8*
// CHECK-BLOCKS-IN-BLOCKS-DEFN: @_NSConcreteStackBlock = common dso_local dllexport global [5 x i32] // CHECK-BLOCKS-IN-BLOCKS-DEFN: @_NSConcreteStackBlock = common dso_local dllexport global [5 x i32]
// CHECK-BLOCKS-NOT-IN-BLOCKS: @_NSConcreteStackBlock = external dllimport global i8* // CHECK-BLOCKS-NOT-IN-BLOCKS: @_NSConcreteStackBlock = external dllimport global i8*
// CHECK-BLOCKS-NOT-IN-BLOCKS-EXTERN: @_NSConcreteStackBlock = external dllimport global i8* // CHECK-BLOCKS-NOT-IN-BLOCKS-EXTERN: @_NSConcreteStackBlock = external dllimport global i8*
// CHECK-BLOCKS-NOT-IN-BLOCKS-EXTERN-DLLIMPORT: @_NSConcreteStackBlock = external dllimport global i8* // CHECK-BLOCKS-NOT-IN-BLOCKS-EXTERN-DLLIMPORT: @_NSConcreteStackBlock = external dllimport global i8*
// CHECK-BLOCKS-NOT-IN-BLOCKS-DLLIMPORT: @_NSConcreteStackBlock = external dllimport global i8* // CHECK-BLOCKS-NOT-IN-BLOCKS-DLLIMPORT: @_NSConcreteStackBlock = external dllimport global i8*