From 1d97d2a3d20e1490a72d3275c37ad57df3ede45c Mon Sep 17 00:00:00 2001 From: Alexey Bataev Date: Mon, 19 Oct 2015 06:40:17 +0000 Subject: [OPENMP] Fix for http://llvm.org/PR25221: Infinite loop while parsing OpenMP directive Clang skipped annot_pragma_openmp token, while it should be considered as a stop token while skipping tokens. llvm-svn: 250684 --- clang/lib/Parse/Parser.cpp | 1 + clang/test/OpenMP/openmp_check.cpp | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 clang/test/OpenMP/openmp_check.cpp diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp index 5b0704658a2..26dc3998ad8 100644 --- a/clang/lib/Parse/Parser.cpp +++ b/clang/lib/Parse/Parser.cpp @@ -282,6 +282,7 @@ bool Parser::SkipUntil(ArrayRef Toks, SkipUntilFlags Flags) { // Ran out of tokens. return false; + case tok::annot_pragma_openmp: case tok::annot_pragma_openmp_end: // Stop before an OpenMP pragma boundary. case tok::annot_module_begin: diff --git a/clang/test/OpenMP/openmp_check.cpp b/clang/test/OpenMP/openmp_check.cpp new file mode 100644 index 00000000000..c9b5eb0b9cb --- /dev/null +++ b/clang/test/OpenMP/openmp_check.cpp @@ -0,0 +1,15 @@ +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 %s +int nested(int a) { +#pragma omp parallel + ++a; + + auto F = [&]() { // expected-error {{expected expression}} expected-error {{expected ';' at end of declaration}} expected-warning {{'auto' type specifier is a C++11 extension}} +#pragma omp parallel + { +#pragma omp target + ++a; + } + }; + F(); // expected-error {{C++ requires a type specifier for all declarations}} + return a; // expected-error {{expected unqualified-id}} +}// expected-error {{extraneous closing brace ('}')}} -- cgit v1.2.3