summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/Parser.cpp
diff options
context:
space:
mode:
authorAlp Toker <alp@nuanti.com>2013-12-18 19:10:54 +0000
committerAlp Toker <alp@nuanti.com>2013-12-18 19:10:54 +0000
commitb14a4709f5d77de17bfaac68fde2d341bfc9e801 (patch)
tree6459fad549f8a5bff719d6bcd0d8abe21c1f162b /clang/lib/Parse/Parser.cpp
parentd751fa7868db4a3c522c508900692f743bce8185 (diff)
downloadbcm5719-llvm-b14a4709f5d77de17bfaac68fde2d341bfc9e801.tar.gz
bcm5719-llvm-b14a4709f5d77de17bfaac68fde2d341bfc9e801.zip
Fix OpenMP recovery with trailing tokens following the pragma
The recovery was failing due to a missing case in SkipUntil(). Also add back tests from r197553 that were reverted in the previous commit. llvm-svn: 197598
Diffstat (limited to 'clang/lib/Parse/Parser.cpp')
-rw-r--r--clang/lib/Parse/Parser.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp
index 79a02eea423..5224c6bdc19 100644
--- a/clang/lib/Parse/Parser.cpp
+++ b/clang/lib/Parse/Parser.cpp
@@ -298,6 +298,8 @@ bool Parser::SkipUntil(ArrayRef<tok::TokenKind> Toks, SkipUntilFlags Flags) {
// Ran out of tokens.
return false;
+ case tok::annot_pragma_openmp_end:
+ // Stop before an OpenMP pragma boundary.
case tok::annot_module_begin:
case tok::annot_module_end:
case tok::annot_module_include:
OpenPOWER on IntegriCloud