commit f41021d40f46f1577ec42ce20a1c270354bc0768
author Mike Stump <mrs@apple.com> Tue Apr 14 00:57:29 2009 +0000
committer Mike Stump <mrs@apple.com> Tue Apr 14 00:57:29 2009 +0000
tree 08c045c2c360401632cda99875cbc43e99360322
parent 0df11ba02c3767922c68f0375c806adfb2d1d3a0

Fixup CodeGen for __weak __block variables.  Radar 6756266


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@69010 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaDecl.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index ef8b9e8..f4f1311 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -1803,7 +1803,8 @@
     Invalid = true;
   }
 
-  if (NewVD->hasLocalStorage() && T.isObjCGCWeak())
+  if (NewVD->hasLocalStorage() && T.isObjCGCWeak()
+      && !NewVD->getAttr<BlocksAttr>())
     Diag(NewVD->getLocation(), diag::warn_attribute_weak_on_local);
 
   bool isIllegalVLA = T->isVariableArrayType() && NewVD->hasGlobalStorage();