From: Steve Naroff <snaroff@apple.com>
Date: Thu, 28 Aug 2008 10:07:06 +0000 (+0000)
Subject: Fix Parser::ParseDeclaratorInternal(): add langopts test when recognizing blocks.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ef1c99433a5147f0f75d0dc6ba75af95ee79a68;p=clang

Fix Parser::ParseDeclaratorInternal(): add langopts test when recognizing blocks.


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

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 76fca9e885..cd2dda2941 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -1116,10 +1116,10 @@ void Parser::ParseDeclaratorInternal(Declarator &D) {
       (Kind != tok::caret || !getLang().Blocks))
     return ParseDirectDeclarator(D);
   
-  // Otherwise, '*' -> pointer or '&' -> reference.
+  // Otherwise, '*' -> pointer, '^' -> block, '&' -> reference.
   SourceLocation Loc = ConsumeToken();  // Eat the * or &.
 
-  if (Kind == tok::star || Kind == tok::caret) {
+  if (Kind == tok::star || (Kind == tok::caret && getLang().Blocks)) {
     // Is a pointer.
     DeclSpec DS;