summaryrefslogtreecommitdiffstats
path: root/clang/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
commitd8114f7560617df42c502408362e25aad1b81e12 (patch)
tree61b56a70ae9596ee998298733047f708c127221f /clang/lib/Parse/Parser.cpp
parent2fdb6b53912bda7847edd513ef013c7cc6a2d975 (diff)
downloadbcm5719-llvm-d8114f7560617df42c502408362e25aad1b81e12.tar.gz
bcm5719-llvm-d8114f7560617df42c502408362e25aad1b81e12.zip
Reverse r138567 until a buildbot failure is investigated.
llvm-svn: 138584
Diffstat (limited to 'clang/lib/Parse/Parser.cpp')
-rw-r--r--clang/lib/Parse/Parser.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp
index e57b898d523..0da2b4302c4 100644
--- a/clang/lib/Parse/Parser.cpp
+++ b/clang/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:
OpenPOWER on IntegriCloud