commit 7bc8d964405ce3b0b95091cdb66a391e50275b3c
author Mike Stump <mrs@apple.com> Thu May 07 21:56:17 2009 +0000
committer Mike Stump <mrs@apple.com> Thu May 07 21:56:17 2009 +0000
tree 2c74fc3251424eb2c0d228177cdf300b2e226332
parent 7704a33fb398a4352a18bd3fcb18218d3dc5cc60

Allow qualifiers on blocks.  Radar 6441502


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

lib/Sema/SemaType.cpp

diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index 6f9818f..08a5770 100644
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -666,12 +666,11 @@
       if (!LangOpts.Blocks)
         Diag(DeclType.Loc, diag::err_blocks_disable);
         
-      if (DeclType.Cls.TypeQuals)
-        Diag(D.getIdentifierLoc(), diag::err_qualified_block_pointer_type);
       if (!T.getTypePtr()->isFunctionType())
         Diag(D.getIdentifierLoc(), diag::err_nonfunction_block_type);
       else
-        T = Context.getBlockPointerType(T);
+        T = (Context.getBlockPointerType(T)
+             .getQualifiedType(DeclType.Cls.TypeQuals));
       break;
     case DeclaratorChunk::Pointer:
       T = BuildPointerType(T, DeclType.Ptr.TypeQuals, DeclType.Loc, Name);