commit 21f220e79450ee703952b1bd95c8c075dfd7dffa
author Mike Stump <mrs@apple.com> Fri May 01 23:41:47 2009 +0000
committer Mike Stump <mrs@apple.com> Fri May 01 23:41:47 2009 +0000
tree 52856c5ae7651f7f145393fea68e11b18bae4b26
parent 42714e934105bb56ad427e3257a43ae1e737a99c

Add Sema checking for __block on vm declarations.  Radar 6441502


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

lib/Sema/SemaDecl.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index af27229..3ae2ba1 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -1916,6 +1916,11 @@
     return NewVD->setInvalidDecl();
   }
     
+  if (isVM && NewVD->hasAttr<BlocksAttr>()) {
+    Diag(NewVD->getLocation(), diag::err_block_on_vm);
+    return NewVD->setInvalidDecl();
+  }
+
   if (PrevDecl) {
     Redeclaration = true;
     MergeVarDecl(NewVD, PrevDecl);