From 835aa85d7f64d4515c75e9f8cae4857b5abdd42b Mon Sep 17 00:00:00 2001
From: Alexey Bataev <a.bataev@hotmail.com>
Date: Fri, 25 Jul 2014 06:27:47 +0000
Subject: [PATCH] [OPENMP] Improved DSA processing of the loop control
 variables for loop directives.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@213925 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Sema/SemaOpenMP.cpp                  |   36 +-
 test/OpenMP/for_misc_messages.c          |   10 +
 test/OpenMP/parallel_for_misc_messages.c |   11 +
 test/OpenMP/simd_misc_messages.c         | 1039 ++++++++++++----------
 4 files changed, 627 insertions(+), 469 deletions(-)

diff --git a/lib/Sema/SemaOpenMP.cpp b/lib/Sema/SemaOpenMP.cpp
index 046ef55254..1721bea769 100644
--- a/lib/Sema/SemaOpenMP.cpp
+++ b/lib/Sema/SemaOpenMP.cpp
@@ -1641,6 +1641,8 @@ class OpenMPIterationSpaceChecker {
   SourceRange ConditionSrcRange;
   /// \brief Loop variable.
   VarDecl *Var;
+  /// \brief Reference to loop variable.
+  DeclRefExpr *VarRef;
   /// \brief Lower bound (initializer for the var).
   Expr *LB;
   /// \brief Upper bound.
@@ -1661,9 +1663,9 @@ class OpenMPIterationSpaceChecker {
 public:
   OpenMPIterationSpaceChecker(Sema &SemaRef, SourceLocation DefaultLoc)
       : SemaRef(SemaRef), DefaultLoc(DefaultLoc), ConditionLoc(DefaultLoc),
-        ConditionSrcRange(SourceRange()), Var(nullptr), LB(nullptr),
-        UB(nullptr), Step(nullptr), TestIsLessOp(false), TestIsStrictOp(false),
-        SubtractStep(false) {}
+        ConditionSrcRange(SourceRange()), Var(nullptr), VarRef(nullptr),
+        LB(nullptr), UB(nullptr), Step(nullptr), TestIsLessOp(false),
+        TestIsStrictOp(false), SubtractStep(false) {}
   /// \brief Check init-expr for canonical loop form and save loop counter
   /// variable - #Var and its initialization value - #LB.
   bool CheckInit(Stmt *S);
@@ -1675,6 +1677,8 @@ public:
   bool CheckInc(Expr *S);
   /// \brief Return the loop counter variable.
   VarDecl *GetLoopVar() const { return Var; }
+  /// \brief Return the reference expression to loop counter variable.
+  DeclRefExpr *GetLoopVarRefExpr() const { return VarRef; }
   /// \brief Return true if any expression is dependent.
   bool Dependent() const;
 
@@ -1683,7 +1687,7 @@ private:
   /// expression.
   bool CheckIncRHS(Expr *RHS);
   /// \brief Helper to set loop counter variable and its initializer.
-  bool SetVarAndLB(VarDecl *NewVar, Expr *NewLB);
+  bool SetVarAndLB(VarDecl *NewVar, DeclRefExpr *NewVarRefExpr, Expr *NewLB);
   /// \brief Helper to set upper bound.
   bool SetUB(Expr *NewUB, bool LessOp, bool StrictOp, const SourceRange &SR,
              const SourceLocation &SL);
@@ -1700,13 +1704,16 @@ bool OpenMPIterationSpaceChecker::Dependent() const {
          (UB && UB->isValueDependent()) || (Step && Step->isValueDependent());
 }
 
-bool OpenMPIterationSpaceChecker::SetVarAndLB(VarDecl *NewVar, Expr *NewLB) {
+bool OpenMPIterationSpaceChecker::SetVarAndLB(VarDecl *NewVar,
+                                              DeclRefExpr *NewVarRefExpr,
+                                              Expr *NewLB) {
   // State consistency checking to ensure correct usage.
-  assert(Var == nullptr && LB == nullptr && UB == nullptr && Step == nullptr &&
-         !TestIsLessOp && !TestIsStrictOp);
+  assert(Var == nullptr && LB == nullptr && VarRef == nullptr &&
+         UB == nullptr && Step == nullptr && !TestIsLessOp && !TestIsStrictOp);
   if (!NewVar || !NewLB)
     return true;
   Var = NewVar;
+  VarRef = NewVarRefExpr;
   LB = NewLB;
   return false;
 }
@@ -1794,7 +1801,8 @@ bool OpenMPIterationSpaceChecker::CheckInit(Stmt *S) {
   if (auto BO = dyn_cast<BinaryOperator>(S)) {
     if (BO->getOpcode() == BO_Assign)
       if (auto DRE = dyn_cast<DeclRefExpr>(BO->getLHS()->IgnoreParens()))
-        return SetVarAndLB(dyn_cast<VarDecl>(DRE->getDecl()), BO->getLHS());
+        return SetVarAndLB(dyn_cast<VarDecl>(DRE->getDecl()), DRE,
+                           BO->getLHS());
   } else if (auto DS = dyn_cast<DeclStmt>(S)) {
     if (DS->isSingleDecl()) {
       if (auto Var = dyn_cast_or_null<VarDecl>(DS->getSingleDecl())) {
@@ -1804,14 +1812,15 @@ bool OpenMPIterationSpaceChecker::CheckInit(Stmt *S) {
             SemaRef.Diag(S->getLocStart(),
                          diag::ext_omp_loop_not_canonical_init)
                 << S->getSourceRange();
-          return SetVarAndLB(Var, Var->getInit());
+          return SetVarAndLB(Var, nullptr, Var->getInit());
         }
       }
     }
   } else if (auto CE = dyn_cast<CXXOperatorCallExpr>(S))
     if (CE->getOperator() == OO_Equal)
       if (auto DRE = dyn_cast<DeclRefExpr>(CE->getArg(0)))
-        return SetVarAndLB(dyn_cast<VarDecl>(DRE->getDecl()), CE->getArg(1));
+        return SetVarAndLB(dyn_cast<VarDecl>(DRE->getDecl()), DRE,
+                           CE->getArg(1));
 
   SemaRef.Diag(S->getLocStart(), diag::err_omp_loop_not_canonical_init)
       << S->getSourceRange();
@@ -2056,6 +2065,9 @@ static bool CheckOpenMPIterationSpace(
   // The loop iteration variable(s) in the associated for-loop(s) of a for or
   // parallel for construct may be listed in a private or lastprivate clause.
   DSAStackTy::DSAVarData DVar = DSA.getTopDSA(Var, false);
+  auto LoopVarRefExpr = ISC.GetLoopVarRefExpr();
+  // If LoopVarRefExpr is nullptr it means the corresponding loop variable is
+  // declared in the loop and it is predetermined as a private.
   auto PredeterminedCKind =
       isOpenMPSimdDirective(DKind)
           ? ((NestedLoopCount == 1) ? OMPC_linear : OMPC_lastprivate)
@@ -2070,11 +2082,11 @@ static bool CheckOpenMPIterationSpace(
         << getOpenMPClauseName(PredeterminedCKind);
     ReportOriginalDSA(SemaRef, &DSA, Var, DVar, true);
     HasErrors = true;
-  } else {
+  } else if (LoopVarRefExpr != nullptr) {
     // Make the loop iteration variable private (for worksharing constructs),
     // linear (for simd directives with the only one associated loop) or
     // lastprivate (for simd directives with several collapsed loops).
-    DSA.addDSA(Var, nullptr, PredeterminedCKind);
+    DSA.addDSA(Var, LoopVarRefExpr, PredeterminedCKind);
   }
 
   assert(isOpenMPLoopDirective(DKind) && "DSA for non-loop vars");
diff --git a/test/OpenMP/for_misc_messages.c b/test/OpenMP/for_misc_messages.c
index 854898c044..99e6a2b7d5 100644
--- a/test/OpenMP/for_misc_messages.c
+++ b/test/OpenMP/for_misc_messages.c
@@ -190,6 +190,16 @@ void test_collapse() {
 #pragma omp for collapse(5 - 5)
   for (i = 0; i < 16; ++i)
     ;
+#pragma omp parallel
+#pragma omp for collapse(2)
+  for (i = 0; i < 16; ++i)
+// expected-note@+1 {{variable with automatic storage duration is predetermined as private; perhaps you forget to enclose 'omp for' directive into a parallel or another task region?}}
+    for (int j = 0; j < 16; ++j)
+// expected-error@+2 {{private variable cannot be reduction}}
+// expected-error@+1 {{region cannot be closely nested inside 'for' region; perhaps you forget to enclose 'omp for' directive into a parallel region?}}
+#pragma omp for reduction(+ : i, j)
+      for (int k = 0; k < 16; ++k)
+        i += j;
 }
 
 void test_private() {
diff --git a/test/OpenMP/parallel_for_misc_messages.c b/test/OpenMP/parallel_for_misc_messages.c
index b236a613c3..f07a0f2a4c 100644
--- a/test/OpenMP/parallel_for_misc_messages.c
+++ b/test/OpenMP/parallel_for_misc_messages.c
@@ -165,6 +165,17 @@ void test_collapse() {
 #pragma omp parallel for collapse(5 - 5)
   for (i = 0; i < 16; ++i)
     ;
+// expected-note@+1 {{defined as firstprivate}}
+#pragma omp parallel for collapse(2) firstprivate(i)
+  for (i = 0; i < 16; ++i)
+// expected-note@+1 {{variable with automatic storage duration is predetermined as private; perhaps you forget to enclose 'omp for' directive into a parallel or another task region?}}
+    for (int j = 0; j < 16; ++j)
+// expected-error@+3 {{reduction variable must be shared}}
+// expected-error@+2 {{private variable cannot be reduction}}
+// expected-error@+1 {{region cannot be closely nested inside 'parallel for' region; perhaps you forget to enclose 'omp for' directive into a parallel region?}}
+#pragma omp for reduction(+ : i, j)
+      for (int k = 0; k < 16; ++k)
+        i += j;
 }
 
 void test_private() {
diff --git a/test/OpenMP/simd_misc_messages.c b/test/OpenMP/simd_misc_messages.c
index 67edc6d1f8..f94bb3870c 100644
--- a/test/OpenMP/simd_misc_messages.c
+++ b/test/OpenMP/simd_misc_messages.c
@@ -9,26 +9,25 @@
 // expected-error@+1 {{unexpected OpenMP directive '#pragma omp simd'}}
 #pragma omp simd safelen(4)
 
-void test_no_clause()
-{
+void test_no_clause() {
   int i;
-  #pragma omp simd
-  for (i = 0; i < 16; ++i) ;
+#pragma omp simd
+  for (i = 0; i < 16; ++i)
+    ;
 
-  // expected-error@+2 {{statement after '#pragma omp simd' must be a for loop}}
-  #pragma omp simd
+// expected-error@+2 {{statement after '#pragma omp simd' must be a for loop}}
+#pragma omp simd
   ++i;
 }
 
-void test_branch_protected_scope()
-{
+void test_branch_protected_scope() {
   int i = 0;
 L1:
   ++i;
 
   int x[24];
 
-  #pragma omp simd
+#pragma omp simd
   for (i = 0; i < 16; ++i) {
     if (i == 5)
       goto L1; // expected-error {{use of undeclared label 'L1'}}
@@ -37,7 +36,7 @@ L1:
     else if (i == 7)
       goto L2;
     else if (i == 8) {
-L2:
+    L2:
       x[i]++;
     }
   }
@@ -48,506 +47,632 @@ L2:
     goto L1;
 }
 
-void test_invalid_clause()
-{
+void test_invalid_clause() {
   int i;
-  // expected-warning@+1 {{extra tokens at the end of '#pragma omp simd' are ignored}}
-  #pragma omp simd foo bar
-  for (i = 0; i < 16; ++i) ;
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp simd' are ignored}}
+#pragma omp simd foo bar
+  for (i = 0; i < 16; ++i)
+    ;
 }
 
-void test_non_identifiers()
-{
+void test_non_identifiers() {
   int i, x;
 
-  // expected-warning@+1 {{extra tokens at the end of '#pragma omp simd' are ignored}}
-  #pragma omp simd;
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{unexpected OpenMP clause 'firstprivate' in directive '#pragma omp simd'}}
-  // expected-warning@+1 {{extra tokens at the end of '#pragma omp simd' are ignored}}
-  #pragma omp simd firstprivate(x);
-  for (i = 0; i < 16; ++i) ;
-
-  // expected-warning@+1 {{extra tokens at the end of '#pragma omp simd' are ignored}}
-  #pragma omp simd private(x);
-  for (i = 0; i < 16; ++i) ;
-
-  // expected-warning@+1 {{extra tokens at the end of '#pragma omp simd' are ignored}}
-  #pragma omp simd , private(x);
-  for (i = 0; i < 16; ++i) ;
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp simd' are ignored}}
+#pragma omp simd;
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{unexpected OpenMP clause 'firstprivate' in directive '#pragma omp simd'}}
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp simd' are ignored}}
+#pragma omp simd firstprivate(x);
+  for (i = 0; i < 16; ++i)
+    ;
+
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp simd' are ignored}}
+#pragma omp simd private(x);
+  for (i = 0; i < 16; ++i)
+    ;
+
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp simd' are ignored}}
+#pragma omp simd, private(x);
+  for (i = 0; i < 16; ++i)
+    ;
 }
 
 extern int foo();
-void test_safelen()
-{
+void test_safelen() {
   int i;
-  // expected-error@+1 {{expected '('}}
-  #pragma omp simd safelen
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd safelen(
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd safelen()
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd safelen(,
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}  expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd safelen(,)
-  for (i = 0; i < 16; ++i) ;
-  // expected-warning@+2 {{extra tokens at the end of '#pragma omp simd' are ignored}}
-  // expected-error@+1 {{expected '('}}
-  #pragma omp simd safelen 4)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected ')'}}
-  // expected-note@+1 {{to match this '('}}
-  #pragma omp simd safelen(4
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected ')'}}
-  // expected-note@+1 {{to match this '('}}
-  #pragma omp simd safelen(4,
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected ')'}}
-  // expected-note@+1 {{to match this '('}}
-  #pragma omp simd safelen(4,)
-  for (i = 0; i < 16; ++i) ;
-  // xxpected-error@+1 {{expected expression}}
-  #pragma omp simd safelen(4)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected ')'}}
-  // expected-note@+1 {{to match this '('}}
-  #pragma omp simd safelen(4 4)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected ')'}}
-  // expected-note@+1 {{to match this '('}}
-  #pragma omp simd safelen(4,,4)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd safelen(4)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected ')'}}
-  // expected-note@+1 {{to match this '('}}
-  #pragma omp simd safelen(4,8)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expression is not an integer constant expression}}
-  #pragma omp simd safelen(2.5)
-  for (i = 0; i < 16; ++i);
-  // expected-error@+1 {{expression is not an integer constant expression}}
-  #pragma omp simd safelen(foo())
-  for (i = 0; i < 16; ++i);
-  // expected-error@+1 {{argument to 'safelen' clause must be a positive integer value}}
-  #pragma omp simd safelen(-5)
-  for (i = 0; i < 16; ++i);
-  // expected-error@+1 {{argument to 'safelen' clause must be a positive integer value}}
-  #pragma omp simd safelen(0)
-  for (i = 0; i < 16; ++i);
-  // expected-error@+1 {{argument to 'safelen' clause must be a positive integer value}}
-  #pragma omp simd safelen(5-5)
-  for (i = 0; i < 16; ++i);
+// expected-error@+1 {{expected '('}}
+#pragma omp simd safelen
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd safelen(
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd safelen()
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd safelen(,
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}  expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd safelen(, )
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-warning@+2 {{extra tokens at the end of '#pragma omp simd' are ignored}}
+// expected-error@+1 {{expected '('}}
+#pragma omp simd safelen 4)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected ')'}}
+// expected-note@+1 {{to match this '('}}
+#pragma omp simd safelen(4
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected ')'}}
+// expected-note@+1 {{to match this '('}}
+#pragma omp simd safelen(4,
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected ')'}}
+// expected-note@+1 {{to match this '('}}
+#pragma omp simd safelen(4, )
+  for (i = 0; i < 16; ++i)
+    ;
+// xxpected-error@+1 {{expected expression}}
+#pragma omp simd safelen(4)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected ')'}}
+// expected-note@+1 {{to match this '('}}
+#pragma omp simd safelen(4 4)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected ')'}}
+// expected-note@+1 {{to match this '('}}
+#pragma omp simd safelen(4, , 4)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd safelen(4)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected ')'}}
+// expected-note@+1 {{to match this '('}}
+#pragma omp simd safelen(4, 8)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expression is not an integer constant expression}}
+#pragma omp simd safelen(2.5)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expression is not an integer constant expression}}
+#pragma omp simd safelen(foo())
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{argument to 'safelen' clause must be a positive integer value}}
+#pragma omp simd safelen(-5)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{argument to 'safelen' clause must be a positive integer value}}
+#pragma omp simd safelen(0)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{argument to 'safelen' clause must be a positive integer value}}
+#pragma omp simd safelen(5 - 5)
+  for (i = 0; i < 16; ++i)
+    ;
 }
 
-void test_collapse()
-{
+void test_collapse() {
   int i;
-  // expected-error@+1 {{expected '('}}
-  #pragma omp simd collapse
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd collapse(
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd collapse()
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd collapse(,
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}  expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd collapse(,)
-  for (i = 0; i < 16; ++i) ;
-  // expected-warning@+2 {{extra tokens at the end of '#pragma omp simd' are ignored}}
-  // expected-error@+1 {{expected '('}}
-  #pragma omp simd collapse 4)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected ')'}}
-  // expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}
-  #pragma omp simd collapse(4
-  for (i = 0; i < 16; ++i) ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
-  // expected-error@+2 {{expected ')'}}
-  // expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}
-  #pragma omp simd collapse(4,
-  for (i = 0; i < 16; ++i) ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
-  // expected-error@+2 {{expected ')'}}
-  // expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}
-  #pragma omp simd collapse(4,)
-  for (i = 0; i < 16; ++i) ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
-  // xxpected-error@+1 {{expected expression}} expected-note@+1 {{as specified in 'collapse' clause}}
-  #pragma omp simd collapse(4)
-  for (i = 0; i < 16; ++i) ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
-  // expected-error@+2 {{expected ')'}}
-  // expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}
-  #pragma omp simd collapse(4 4)
-  for (i = 0; i < 16; ++i) ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
-  // expected-error@+2 {{expected ')'}}
-  // expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}
-  #pragma omp simd collapse(4,,4)
-  for (i = 0; i < 16; ++i) ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
-  #pragma omp simd collapse(4)
+// expected-error@+1 {{expected '('}}
+#pragma omp simd collapse
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd collapse(
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd collapse()
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd collapse(,
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}  expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd collapse(, )
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-warning@+2 {{extra tokens at the end of '#pragma omp simd' are ignored}}
+// expected-error@+1 {{expected '('}}
+#pragma omp simd collapse 4)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected ')'}}
+// expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}
+#pragma omp simd collapse(4
+  for (i = 0; i < 16; ++i)
+    ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
+// expected-error@+2 {{expected ')'}}
+// expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}
+#pragma omp simd collapse(4,
+  for (i = 0; i < 16; ++i)
+    ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
+// expected-error@+2 {{expected ')'}}
+// expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}
+#pragma omp simd collapse(4, )
+  for (i = 0; i < 16; ++i)
+    ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
+// xxpected-error@+1 {{expected expression}} expected-note@+1 {{as specified in 'collapse' clause}}
+#pragma omp simd collapse(4)
+  for (i = 0; i < 16; ++i)
+    ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
+// expected-error@+2 {{expected ')'}}
+// expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}
+#pragma omp simd collapse(4 4)
+  for (i = 0; i < 16; ++i)
+    ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
+// expected-error@+2 {{expected ')'}}
+// expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}
+#pragma omp simd collapse(4, , 4)
+  for (i = 0; i < 16; ++i)
+    ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
+#pragma omp simd collapse(4)
   for (int i1 = 0; i1 < 16; ++i1)
     for (int i2 = 0; i2 < 16; ++i2)
       for (int i3 = 0; i3 < 16; ++i3)
         for (int i4 = 0; i4 < 16; ++i4)
           foo();
-  // expected-error@+2 {{expected ')'}}
-  // expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}
-  #pragma omp simd collapse(4,8)
-  for (i = 0; i < 16; ++i) ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
-  // expected-error@+1 {{expression is not an integer constant expression}}
-  #pragma omp simd collapse(2.5)
-  for (i = 0; i < 16; ++i);
-  // expected-error@+1 {{expression is not an integer constant expression}}
-  #pragma omp simd collapse(foo())
-  for (i = 0; i < 16; ++i);
-  // expected-error@+1 {{argument to 'collapse' clause must be a positive integer value}}
-  #pragma omp simd collapse(-5)
-  for (i = 0; i < 16; ++i);
-  // expected-error@+1 {{argument to 'collapse' clause must be a positive integer value}}
-  #pragma omp simd collapse(0)
-  for (i = 0; i < 16; ++i);
-  // expected-error@+1 {{argument to 'collapse' clause must be a positive integer value}}
-  #pragma omp simd collapse(5-5)
-  for (i = 0; i < 16; ++i);
+// expected-error@+2 {{expected ')'}}
+// expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}
+#pragma omp simd collapse(4, 8)
+  for (i = 0; i < 16; ++i)
+    ; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}}
+// expected-error@+1 {{expression is not an integer constant expression}}
+#pragma omp simd collapse(2.5)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expression is not an integer constant expression}}
+#pragma omp simd collapse(foo())
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{argument to 'collapse' clause must be a positive integer value}}
+#pragma omp simd collapse(-5)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{argument to 'collapse' clause must be a positive integer value}}
+#pragma omp simd collapse(0)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{argument to 'collapse' clause must be a positive integer value}}
+#pragma omp simd collapse(5 - 5)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-note@+2 {{defined as reduction}}
+#pragma omp parallel
+#pragma omp simd collapse(2) reduction(+ : i)
+  for (i = 0; i < 16; ++i)
+    // expected-note@+1 {{variable with automatic storage duration is predetermined as private; perhaps you forget to enclose 'omp for' directive into a parallel or another task region?}}
+    for (int j = 0; j < 16; ++j)
+// expected-error@+3 {{reduction variable must be shared}}
+// expected-error@+2 {{private variable cannot be reduction}}
+// expected-error@+1 {{OpenMP constructs may not be nested inside a simd region}}
+#pragma omp for reduction(+ : i, j)
+      for (int k = 0; k < 16; ++k)
+        i += j;
 }
 
-void test_linear()
-{
+void test_linear() {
   int i;
-  // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd linear(
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected expression}}
-  // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd linear(,
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected expression}}
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd linear(,)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd linear()
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd linear(int)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected variable name}}
-  #pragma omp simd linear(0)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{use of undeclared identifier 'x'}}
-  #pragma omp simd linear(x)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{use of undeclared identifier 'x'}}
-  // expected-error@+1 {{use of undeclared identifier 'y'}}
-  #pragma omp simd linear(x, y)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+3 {{use of undeclared identifier 'x'}}
-  // expected-error@+2 {{use of undeclared identifier 'y'}}
-  // expected-error@+1 {{use of undeclared identifier 'z'}}
-  #pragma omp simd linear(x, y, z)
-  for (i = 0; i < 16; ++i) ;
+// expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd linear(
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected expression}}
+// expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd linear(,
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected expression}}
+// expected-error@+1 {{expected expression}}
+#pragma omp simd linear(, )
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd linear()
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd linear(int)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected variable name}}
+#pragma omp simd linear(0)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{use of undeclared identifier 'x'}}
+#pragma omp simd linear(x)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{use of undeclared identifier 'x'}}
+// expected-error@+1 {{use of undeclared identifier 'y'}}
+#pragma omp simd linear(x, y)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+3 {{use of undeclared identifier 'x'}}
+// expected-error@+2 {{use of undeclared identifier 'y'}}
+// expected-error@+1 {{use of undeclared identifier 'z'}}
+#pragma omp simd linear(x, y, z)
+  for (i = 0; i < 16; ++i)
+    ;
 
   int x, y;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd linear(x:)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd linear(x:,)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd linear(x:1)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd linear(x:2*2)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd linear(x:1,y)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd linear(x:1,y,z:1)
-  for (i = 0; i < 16; ++i) ;
-
-  // expected-note@+2 {{defined as linear}}
-  // expected-error@+1 {{linear variable cannot be linear}}
-  #pragma omp simd linear(x) linear(x)
-  for (i = 0; i < 16; ++i) ;
-
-  // expected-note@+2 {{defined as private}}
-  // expected-error@+1 {{private variable cannot be linear}}
-  #pragma omp simd private(x) linear(x)
-  for (i = 0; i < 16; ++i) ;
-
-  // expected-note@+2 {{defined as linear}}
-  // expected-error@+1 {{linear variable cannot be private}}
-  #pragma omp simd linear(x) private(x)
-  for (i = 0; i < 16; ++i) ;
-
-  // expected-warning@+1 {{zero linear step (x and other variables in clause should probably be const)}}
-  #pragma omp simd linear(x,y:0)
-  for (i = 0; i < 16; ++i) ;
-
-  // expected-note@+2 {{defined as linear}}
-  // expected-error@+1 {{linear variable cannot be lastprivate}}
-  #pragma omp simd linear(x) lastprivate(x)
-  for (i = 0; i < 16; ++i) ;
-
-  // expected-note@+2 {{defined as lastprivate}}
-  // expected-error@+1 {{lastprivate variable cannot be linear}}
-  #pragma omp simd lastprivate(x) linear(x) 
-  for (i = 0; i < 16; ++i) ;
-
+// expected-error@+1 {{expected expression}}
+#pragma omp simd linear(x :)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd linear(x :, )
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd linear(x : 1)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd linear(x : 2 * 2)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd linear(x : 1, y)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd linear(x : 1, y, z : 1)
+  for (i = 0; i < 16; ++i)
+    ;
+
+// expected-note@+2 {{defined as linear}}
+// expected-error@+1 {{linear variable cannot be linear}}
+#pragma omp simd linear(x) linear(x)
+  for (i = 0; i < 16; ++i)
+    ;
+
+// expected-note@+2 {{defined as private}}
+// expected-error@+1 {{private variable cannot be linear}}
+#pragma omp simd private(x) linear(x)
+  for (i = 0; i < 16; ++i)
+    ;
+
+// expected-note@+2 {{defined as linear}}
+// expected-error@+1 {{linear variable cannot be private}}
+#pragma omp simd linear(x) private(x)
+  for (i = 0; i < 16; ++i)
+    ;
+
+// expected-warning@+1 {{zero linear step (x and other variables in clause should probably be const)}}
+#pragma omp simd linear(x, y : 0)
+  for (i = 0; i < 16; ++i)
+    ;
+
+// expected-note@+2 {{defined as linear}}
+// expected-error@+1 {{linear variable cannot be lastprivate}}
+#pragma omp simd linear(x) lastprivate(x)
+  for (i = 0; i < 16; ++i)
+    ;
+
+// expected-note@+2 {{defined as lastprivate}}
+// expected-error@+1 {{lastprivate variable cannot be linear}}
+#pragma omp simd lastprivate(x) linear(x)
+  for (i = 0; i < 16; ++i)
+    ;
 }
 
-void test_aligned()
-{
+void test_aligned() {
   int i;
-  // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd aligned(
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected expression}}
-  // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd aligned(,
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected expression}}
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd aligned(,)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd aligned()
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd aligned(int)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected variable name}}
-  #pragma omp simd aligned(0)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{use of undeclared identifier 'x'}}
-  #pragma omp simd aligned(x)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{use of undeclared identifier 'x'}}
-  // expected-error@+1 {{use of undeclared identifier 'y'}}
-  #pragma omp simd aligned(x, y)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+3 {{use of undeclared identifier 'x'}}
-  // expected-error@+2 {{use of undeclared identifier 'y'}}
-  // expected-error@+1 {{use of undeclared identifier 'z'}}
-  #pragma omp simd aligned(x, y, z)
-  for (i = 0; i < 16; ++i) ;
+// expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd aligned(
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected expression}}
+// expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd aligned(,
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected expression}}
+// expected-error@+1 {{expected expression}}
+#pragma omp simd aligned(, )
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd aligned()
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd aligned(int)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected variable name}}
+#pragma omp simd aligned(0)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{use of undeclared identifier 'x'}}
+#pragma omp simd aligned(x)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{use of undeclared identifier 'x'}}
+// expected-error@+1 {{use of undeclared identifier 'y'}}
+#pragma omp simd aligned(x, y)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+3 {{use of undeclared identifier 'x'}}
+// expected-error@+2 {{use of undeclared identifier 'y'}}
+// expected-error@+1 {{use of undeclared identifier 'z'}}
+#pragma omp simd aligned(x, y, z)
+  for (i = 0; i < 16; ++i)
+    ;
 
   int *x, y, z[25]; // expected-note 4 {{'y' defined here}}
-  #pragma omp simd aligned(x)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd aligned(z)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd aligned(x:)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd aligned(x:,)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd aligned(x:1)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd aligned(x:2*2)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd aligned(x:1,y)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd aligned(x:1,y,z:1)
-  for (i = 0; i < 16; ++i) ;
-
-  // expected-error@+1 {{argument of aligned clause should be array or pointer, not 'int'}}
-  #pragma omp simd aligned(x, y)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{argument of aligned clause should be array or pointer, not 'int'}}
-  #pragma omp simd aligned(x, y, z)
-  for (i = 0; i < 16; ++i) ;
-
-  // expected-note@+2 {{defined as aligned}}
-  // expected-error@+1 {{a variable cannot appear in more than one aligned clause}}
-  #pragma omp simd aligned(x) aligned(z,x)
-  for (i = 0; i < 16; ++i) ;
-
-  // expected-note@+3 {{defined as aligned}}
-  // expected-error@+2 {{a variable cannot appear in more than one aligned clause}}
-  // expected-error@+1 2 {{argument of aligned clause should be array or pointer, not 'int'}}
-  #pragma omp simd aligned(x,y,z) aligned(y,z)
-  for (i = 0; i < 16; ++i) ;
+#pragma omp simd aligned(x)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd aligned(z)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd aligned(x :)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd aligned(x :, )
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd aligned(x : 1)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd aligned(x : 2 * 2)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd aligned(x : 1, y)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd aligned(x : 1, y, z : 1)
+  for (i = 0; i < 16; ++i)
+    ;
+
+// expected-error@+1 {{argument of aligned clause should be array or pointer, not 'int'}}
+#pragma omp simd aligned(x, y)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{argument of aligned clause should be array or pointer, not 'int'}}
+#pragma omp simd aligned(x, y, z)
+  for (i = 0; i < 16; ++i)
+    ;
+
+// expected-note@+2 {{defined as aligned}}
+// expected-error@+1 {{a variable cannot appear in more than one aligned clause}}
+#pragma omp simd aligned(x) aligned(z, x)
+  for (i = 0; i < 16; ++i)
+    ;
+
+// expected-note@+3 {{defined as aligned}}
+// expected-error@+2 {{a variable cannot appear in more than one aligned clause}}
+// expected-error@+1 2 {{argument of aligned clause should be array or pointer, not 'int'}}
+#pragma omp simd aligned(x, y, z) aligned(y, z)
+  for (i = 0; i < 16; ++i)
+    ;
 }
 
-void test_private()
-{
+void test_private() {
   int i;
-  // expected-error@+2 {{expected expression}}
-  // expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
-  #pragma omp simd private(
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-  // expected-error@+1 2 {{expected expression}}
-  #pragma omp simd private(,
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 2 {{expected expression}}
-  #pragma omp simd private(,)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd private()
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd private(int)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected variable name}}
-  #pragma omp simd private(0)
-  for (i = 0; i < 16; ++i) ;
+// expected-error@+2 {{expected expression}}
+// expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
+#pragma omp simd private(
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
+// expected-error@+1 2 {{expected expression}}
+#pragma omp simd private(,
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 2 {{expected expression}}
+#pragma omp simd private(, )
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd private()
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd private(int)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected variable name}}
+#pragma omp simd private(0)
+  for (i = 0; i < 16; ++i)
+    ;
 
   int x, y, z;
-  #pragma omp simd private(x)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd private(x, y)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd private(x, y, z)
+#pragma omp simd private(x)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd private(x, y)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd private(x, y, z)
   for (i = 0; i < 16; ++i) {
     x = y * i + z;
   }
 }
 
-void test_firstprivate()
-{
+void test_firstprivate() {
   int i;
-  // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}}
-  // expected-error@+2 {{unexpected OpenMP clause 'firstprivate' in directive '#pragma omp simd'}}
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd firstprivate(
-  for (i = 0; i < 16; ++i) ;
+// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}}
+// expected-error@+2 {{unexpected OpenMP clause 'firstprivate' in directive '#pragma omp simd'}}
+// expected-error@+1 {{expected expression}}
+#pragma omp simd firstprivate(
+  for (i = 0; i < 16; ++i)
+    ;
 }
 
-void test_lastprivate()
-{
+void test_lastprivate() {
   int i;
-  // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd lastprivate(
-  for (i = 0; i < 16; ++i) ;
-
-  // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-  // expected-error@+1 2 {{expected expression}}
-  #pragma omp simd lastprivate(,
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 2 {{expected expression}}
-  #pragma omp simd lastprivate(,)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd lastprivate()
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd lastprivate(int)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected variable name}}
-  #pragma omp simd lastprivate(0)
-  for (i = 0; i < 16; ++i) ;
+// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
+// expected-error@+1 {{expected expression}}
+#pragma omp simd lastprivate(
+  for (i = 0; i < 16; ++i)
+    ;
+
+// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
+// expected-error@+1 2 {{expected expression}}
+#pragma omp simd lastprivate(,
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 2 {{expected expression}}
+#pragma omp simd lastprivate(, )
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd lastprivate()
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd lastprivate(int)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected variable name}}
+#pragma omp simd lastprivate(0)
+  for (i = 0; i < 16; ++i)
+    ;
 
   int x, y, z;
-  #pragma omp simd lastprivate(x)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd lastprivate(x, y)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd lastprivate(x, y, z)
-  for (i = 0; i < 16; ++i) ;
+#pragma omp simd lastprivate(x)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd lastprivate(x, y)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd lastprivate(x, y, z)
+  for (i = 0; i < 16; ++i)
+    ;
 }
 
-void test_reduction()
-{
+void test_reduction() {
   int i, x, y;
-  // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}}
-  // expected-error@+2 {{expected identifier}}
-  // expected-warning@+1 {{missing ':' after reduction identifier - ignoring}}
-  #pragma omp simd reduction(
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected identifier}}
-  // expected-warning@+1 {{missing ':' after reduction identifier - ignoring}}
-  #pragma omp simd reduction()
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected expression}}
-  // expected-warning@+1 {{missing ':' after reduction identifier - ignoring}}
-  #pragma omp simd reduction(x)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected identifier}}
-  #pragma omp simd reduction(:x)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}}
-  // expected-error@+2 {{expected identifier}}
-  // expected-warning@+1 {{missing ':' after reduction identifier - ignoring}}
-  #pragma omp simd reduction(,
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}}
-  // expected-error@+2 {{expected expression}}
-  // expected-warning@+1 {{missing ':' after reduction identifier - ignoring}}
-  #pragma omp simd reduction(+
-  for (i = 0; i < 16; ++i) ;
-
-  // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}}
-  //
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd reduction(+:
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd reduction(+:)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd reduction(+:,y)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected expression}}
-  #pragma omp simd reduction(+:x,+:y)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+2 {{expected identifier}}
-  // expected-warning@+1 {{missing ':' after reduction identifier - ignoring}}
-  #pragma omp simd reduction(%:x)
-  for (i = 0; i < 16; ++i) ;
-
-  #pragma omp simd reduction(+:x)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd reduction(*:x)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd reduction(-:x)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd reduction(&:x)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd reduction(|:x)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd reduction(^:x)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd reduction(&&:x)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd reduction(||:x)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd reduction(max:x)
-  for (i = 0; i < 16; ++i) ;
-  #pragma omp simd reduction(min:x)
-  for (i = 0; i < 16; ++i) ;
-  struct X { int x; };
+// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}}
+// expected-error@+2 {{expected identifier}}
+// expected-warning@+1 {{missing ':' after reduction identifier - ignoring}}
+#pragma omp simd reduction(
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected identifier}}
+// expected-warning@+1 {{missing ':' after reduction identifier - ignoring}}
+#pragma omp simd reduction()
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+2 {{expected expression}}
+// expected-warning@+1 {{missing ':' after reduction identifier - ignoring}}
+#pragma omp simd reduction(x)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected identifier}}
+#pragma omp simd reduction( : x)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}}
+// expected-error@+2 {{expected identifier}}
+// expected-warning@+1 {{missing ':' after reduction identifier - ignoring}}
+#pragma omp simd reduction(,
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}}
+// expected-error@+2 {{expected expression}}
+// expected-warning@+1 {{missing ':' after reduction identifier - ignoring}}
+#pragma omp simd reduction(+
+  for (i = 0; i < 16; ++i)
+    ;
+
+// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}}
+//
+// expected-error@+1 {{expected expression}}
+#pragma omp simd reduction(+:
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd reduction(+ :)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd reduction(+ :, y)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected expression}}
+#pragma omp simd reduction(+ : x, + : y)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected identifier}}
+#pragma omp simd reduction(% : x)
+  for (i = 0; i < 16; ++i)
+    ;
+
+#pragma omp simd reduction(+ : x)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd reduction(* : x)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd reduction(- : x)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd reduction(& : x)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd reduction(| : x)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd reduction(^ : x)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd reduction(&& : x)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd reduction(|| : x)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd reduction(max : x)
+  for (i = 0; i < 16; ++i)
+    ;
+#pragma omp simd reduction(min : x)
+  for (i = 0; i < 16; ++i)
+    ;
+  struct X {
+    int x;
+  };
   struct X X;
-  // expected-error@+1 {{expected variable name}}
-  #pragma omp simd reduction(+:X.x)
-  for (i = 0; i < 16; ++i) ;
-  // expected-error@+1 {{expected variable name}}
-  #pragma omp simd reduction(+:x+x)
-  for (i = 0; i < 16; ++i) ;
+// expected-error@+1 {{expected variable name}}
+#pragma omp simd reduction(+ : X.x)
+  for (i = 0; i < 16; ++i)
+    ;
+// expected-error@+1 {{expected variable name}}
+#pragma omp simd reduction(+ : x + x)
+  for (i = 0; i < 16; ++i)
+    ;
 }
 
-void test_loop_messages()
-{
+void test_loop_messages() {
   float a[100], b[100], c[100];
-  // expected-error@+2 {{variable must be of integer or pointer type}}
-  #pragma omp simd
+// expected-error@+2 {{variable must be of integer or pointer type}}
+#pragma omp simd
   for (float fi = 0; fi < 10.0; fi++) {
     c[(int)fi] = a[(int)fi] + b[(int)fi];
   }
-  // expected-error@+2 {{variable must be of integer or pointer type}}
-  #pragma omp simd
+// expected-error@+2 {{variable must be of integer or pointer type}}
+#pragma omp simd
   for (double fi = 0; fi < 10.0; fi++) {
     c[(int)fi] = a[(int)fi] + b[(int)fi];
   }
-- 
2.40.0