aboutsummaryrefslogtreecommitdiff
path: root/lib/Parse/Parser.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2011-08-25 21:09:22 +0000
committerFariborz Jahanian <fjahanian@apple.com>2011-08-25 21:09:22 +0000
commitf09530f88ece49993f1b72271b0417574e897956 (patch)
tree2d4f2c245e884becc61023bdc9ed7cdeb37f1ae8 /lib/Parse/Parser.cpp
parentc69a292f9f7bee2a7359df18d1db501d8717f0b2 (diff)
Reverse r138567 until a buildbot failure is investigated.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@138584 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/Parser.cpp')
-rw-r--r--lib/Parse/Parser.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index e57b898d52..0da2b4302c 100644
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -593,7 +593,10 @@ Parser::ParseExternalDeclaration(ParsedAttributesWithRange &attrs,
break;
}
case tok::at:
- return ParseObjCAtDirectives();
+ // @ is not a legal token unless objc is enabled, no need to check for ObjC.
+ /// FIXME: ParseObjCAtDirectives should return a DeclGroup for things like
+ /// @class foo, bar;
+ SingleDecl = ParseObjCAtDirectives();
break;
case tok::minus:
case tok::plus: