diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2018-03-14 18:19:26 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2018-03-14 18:19:26 +0000 |
commit | 3c8a39cfbb739447362a10cd57dd2f02a5e3acaf (patch) | |
tree | 96dcccd3d223a265bc7c7bb59373ae75838a8c56 /clang/lib | |
parent | 3f727a8f3a5e1c2e811e1da5fdcd654015c89815 (diff) | |
download | bcm5719-llvm-3c8a39cfbb739447362a10cd57dd2f02a5e3acaf.tar.gz bcm5719-llvm-3c8a39cfbb739447362a10cd57dd2f02a5e3acaf.zip |
Set dso_local for NSConcreteStackBlock.
llvm-svn: 327544
Diffstat (limited to 'clang/lib')
-rw-r--r-- | clang/lib/CodeGen/CGBlocks.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp index 132314ad2dc..663f1d03fdc 100644 --- a/clang/lib/CodeGen/CGBlocks.cpp +++ b/clang/lib/CodeGen/CGBlocks.cpp @@ -2586,11 +2586,11 @@ static void configureBlocksRuntimeObject(CodeGenModule &CGM, } } - if (!CGM.getLangOpts().BlocksRuntimeOptional) - return; - - if (GV->isDeclaration() && GV->hasExternalLinkage()) + if (CGM.getLangOpts().BlocksRuntimeOptional && GV->isDeclaration() && + GV->hasExternalLinkage()) GV->setLinkage(llvm::GlobalValue::ExternalWeakLinkage); + + CGM.setDSOLocal(GV); } llvm::Constant *CodeGenModule::getBlockObjectDispose() { |