commit 3c8a39cfbb739447362a10cd57dd2f02a5e3acaf
author Rafael Espindola <rafael.espindola@gmail.com> Wed Mar 14 18:19:26 2018 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Wed Mar 14 18:19:26 2018 +0000
tree 96dcccd3d223a265bc7c7bb59373ae75838a8c56
parent 3f727a8f3a5e1c2e811e1da5fdcd654015c89815

Set dso_local for NSConcreteStackBlock.

llvm-svn: 327544

clang/lib/CodeGen/CGBlocks.cpp

diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp
index 132314a..663f1d0 100644
--- a/clang/lib/CodeGen/CGBlocks.cpp
+++ b/clang/lib/CodeGen/CGBlocks.cpp
@@ -2586,11 +2586,11 @@
     }
   }
 
-  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() {