<div dir="ltr"><div>I have reviewed this while reviewing: <br><h2>r212516 - [OPENMP] Parsing and sema analysis for 'omp parallel sections' directive.</h2><span><table cellpadding="0">
<tbody><tr><td style="background-color:rgb(221,221,221);color:rgb(102,102,102)"><br></td><td style="background-color:rgb(221,221,221);color:rgb(102,102,102)"><br></td></tr></tbody></table></span><br>
</div>All the code is a similar pattern and looks good.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Jun 25, 2014 at 7:44 AM, Alexey Bataev <span dir="ltr"><<a href="mailto:a.bataev@hotmail.com" target="_blank">a.bataev@hotmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: abataev<br>
Date: Wed Jun 25 06:44:49 2014<br>
New Revision: 211685<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=211685&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=211685&view=rev</a><br>
Log:<br>
[OPENMP] Initial support for 'sections' directive.<br>
<br>
Added:<br>
cfe/trunk/test/OpenMP/sections_ast_print.cpp (with props)<br>
cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/sections_misc_messages.c (with props)<br>
cfe/trunk/test/OpenMP/sections_private_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/sections_reduction_messages.cpp (with props)<br>
Modified:<br>
cfe/trunk/include/clang-c/Index.h<br>
cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h<br>
cfe/trunk/include/clang/AST/RecursiveASTVisitor.h<br>
cfe/trunk/include/clang/AST/StmtOpenMP.h<br>
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td<br>
cfe/trunk/include/clang/Basic/OpenMPKinds.def<br>
cfe/trunk/include/clang/Basic/StmtNodes.td<br>
cfe/trunk/include/clang/Sema/Sema.h<br>
cfe/trunk/include/clang/Serialization/ASTBitCodes.h<br>
cfe/trunk/lib/AST/Stmt.cpp<br>
cfe/trunk/lib/AST/StmtPrinter.cpp<br>
cfe/trunk/lib/AST/StmtProfile.cpp<br>
cfe/trunk/lib/Basic/OpenMPKinds.cpp<br>
cfe/trunk/lib/CodeGen/CGStmt.cpp<br>
cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp<br>
cfe/trunk/lib/CodeGen/CodeGenFunction.h<br>
cfe/trunk/lib/Parse/ParseOpenMP.cpp<br>
cfe/trunk/lib/Sema/SemaOpenMP.cpp<br>
cfe/trunk/lib/Sema/TreeTransform.h<br>
cfe/trunk/lib/Serialization/ASTReaderStmt.cpp<br>
cfe/trunk/lib/Serialization/ASTWriterStmt.cpp<br>
cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp<br>
cfe/trunk/test/OpenMP/nesting_of_regions.cpp<br>
cfe/trunk/tools/libclang/CIndex.cpp<br>
cfe/trunk/tools/libclang/CXCursor.cpp<br>
<br>
Modified: cfe/trunk/include/clang-c/Index.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang-c/Index.h?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang-c/Index.h?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang-c/Index.h (original)<br>
+++ cfe/trunk/include/clang-c/Index.h Wed Jun 25 06:44:49 2014<br>
@@ -2143,7 +2143,11 @@ enum CXCursorKind {<br>
*/<br>
CXCursor_OMPForDirective = 234,<br>
<br>
- CXCursor_LastStmt = CXCursor_OMPForDirective,<br>
+ /** \brief OpenMP sections directive.<br>
+ */<br>
+ CXCursor_OMPSectionsDirective = 235,<br>
+<br>
+ CXCursor_LastStmt = CXCursor_OMPSectionsDirective,<br>
<br>
/**<br>
* \brief Cursor that represents the translation unit itself.<br>
<br>
Modified: cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h (original)<br>
+++ cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h Wed Jun 25 06:44:49 2014<br>
@@ -2290,6 +2290,11 @@ DEF_TRAVERSE_STMT(OMPForDirective, {<br>
return false;<br>
})<br>
<br>
+DEF_TRAVERSE_STMT(OMPSectionsDirective, {<br>
+ if (!TraverseOMPExecutableDirective(S))<br>
+ return false;<br>
+})<br>
+<br>
// OpenMP clauses.<br>
template <typename Derived><br>
bool RecursiveASTVisitor<Derived>::TraverseOMPClause(OMPClause *C) {<br>
<br>
Modified: cfe/trunk/include/clang/AST/RecursiveASTVisitor.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/RecursiveASTVisitor.h?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/RecursiveASTVisitor.h?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/RecursiveASTVisitor.h (original)<br>
+++ cfe/trunk/include/clang/AST/RecursiveASTVisitor.h Wed Jun 25 06:44:49 2014<br>
@@ -2312,6 +2312,11 @@ DEF_TRAVERSE_STMT(OMPForDirective, {<br>
return false;<br>
})<br>
<br>
+DEF_TRAVERSE_STMT(OMPSectionsDirective, {<br>
+ if (!TraverseOMPExecutableDirective(S))<br>
+ return false;<br>
+})<br>
+<br>
// OpenMP clauses.<br>
template <typename Derived><br>
bool RecursiveASTVisitor<Derived>::TraverseOMPClause(OMPClause *C) {<br>
<br>
Modified: cfe/trunk/include/clang/AST/StmtOpenMP.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/StmtOpenMP.h?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/StmtOpenMP.h?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/StmtOpenMP.h (original)<br>
+++ cfe/trunk/include/clang/AST/StmtOpenMP.h Wed Jun 25 06:44:49 2014<br>
@@ -365,6 +365,64 @@ public:<br>
}<br>
};<br>
<br>
+/// \brief This represents '#pragma omp sections' directive.<br>
+///<br>
+/// \code<br>
+/// #pragma omp sections private(a,b) reduction(+:c,d)<br>
+/// \endcode<br>
+/// In this example directive '#pragma omp sections' has clauses 'private' with<br>
+/// the variables 'a' and 'b' and 'reduction' with operator '+' and variables<br>
+/// 'c' and 'd'.<br>
+///<br>
+class OMPSectionsDirective : public OMPExecutableDirective {<br>
+ friend class ASTStmtReader;<br>
+ /// \brief Build directive with the given start and end location.<br>
+ ///<br>
+ /// \param StartLoc Starting location of the directive kind.<br>
+ /// \param EndLoc Ending location of the directive.<br>
+ /// \param NumClauses Number of clauses.<br>
+ ///<br>
+ OMPSectionsDirective(SourceLocation StartLoc, SourceLocation EndLoc,<br>
+ unsigned NumClauses)<br>
+ : OMPExecutableDirective(this, OMPSectionsDirectiveClass, OMPD_sections,<br>
+ StartLoc, EndLoc, NumClauses, 1) {}<br>
+<br>
+ /// \brief Build an empty directive.<br>
+ ///<br>
+ /// \param NumClauses Number of clauses.<br>
+ ///<br>
+ explicit OMPSectionsDirective(unsigned NumClauses)<br>
+ : OMPExecutableDirective(this, OMPSectionsDirectiveClass, OMPD_sections,<br>
+ SourceLocation(), SourceLocation(), NumClauses,<br>
+ 1) {}<br>
+<br>
+public:<br>
+ /// \brief Creates directive with a list of \a Clauses.<br>
+ ///<br>
+ /// \param C AST context.<br>
+ /// \param StartLoc Starting location of the directive kind.<br>
+ /// \param EndLoc Ending Location of the directive.<br>
+ /// \param Clauses List of clauses.<br>
+ /// \param AssociatedStmt Statement, associated with the directive.<br>
+ ///<br>
+ static OMPSectionsDirective *<br>
+ Create(const ASTContext &C, SourceLocation StartLoc, SourceLocation EndLoc,<br>
+ ArrayRef<OMPClause *> Clauses, Stmt *AssociatedStmt);<br>
+<br>
+ /// \brief Creates an empty directive with the place for \a NumClauses<br>
+ /// clauses.<br>
+ ///<br>
+ /// \param C AST context.<br>
+ /// \param NumClauses Number of clauses.<br>
+ ///<br>
+ static OMPSectionsDirective *CreateEmpty(const ASTContext &C,<br>
+ unsigned NumClauses, EmptyShell);<br>
+<br>
+ static bool classof(const Stmt *T) {<br>
+ return T->getStmtClass() == OMPSectionsDirectiveClass;<br>
+ }<br>
+};<br>
+<br>
} // end namespace clang<br>
<br>
#endif<br>
<br>
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Wed Jun 25 06:44:49 2014<br>
@@ -7104,6 +7104,8 @@ def err_omp_prohibited_region : Error<<br>
"%select{|; perhaps you forget to enclose 'omp %3' directive into a parallel region?}2">;<br>
def err_omp_prohibited_region_simd : Error<<br>
"OpenMP constructs may not be nested inside a simd region">;<br>
+def err_omp_sections_not_compound_stmt : Error<<br>
+ "the statement for '#pragma omp sections' must be a compound statement">;<br>
} // end of OpenMP category<br>
<br>
let CategoryName = "Related Result Type Issue" in {<br>
<br>
Modified: cfe/trunk/include/clang/Basic/OpenMPKinds.def<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.def?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.def?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/OpenMPKinds.def (original)<br>
+++ cfe/trunk/include/clang/Basic/OpenMPKinds.def Wed Jun 25 06:44:49 2014<br>
@@ -27,6 +27,9 @@<br>
#ifndef OPENMP_FOR_CLAUSE<br>
# define OPENMP_FOR_CLAUSE(Name)<br>
#endif<br>
+#ifndef OPENMP_SECTIONS_CLAUSE<br>
+# define OPENMP_SECTIONS_CLAUSE(Name)<br>
+#endif<br>
#ifndef OPENMP_DEFAULT_KIND<br>
# define OPENMP_DEFAULT_KIND(Name)<br>
#endif<br>
@@ -43,6 +46,7 @@ OPENMP_DIRECTIVE(parallel)<br>
OPENMP_DIRECTIVE(task)<br>
OPENMP_DIRECTIVE(simd)<br>
OPENMP_DIRECTIVE(for)<br>
+OPENMP_DIRECTIVE(sections)<br>
<br>
// OpenMP clauses.<br>
OPENMP_CLAUSE(if, OMPIfClause)<br>
@@ -92,6 +96,13 @@ OPENMP_FOR_CLAUSE(schedule)<br>
OPENMP_FOR_CLAUSE(ordered)<br>
OPENMP_FOR_CLAUSE(nowait)<br>
<br>
+// Clauses allowed for OpenMP directive 'omp sections'.<br>
+OPENMP_SECTIONS_CLAUSE(private)<br>
+OPENMP_SECTIONS_CLAUSE(lastprivate)<br>
+OPENMP_SECTIONS_CLAUSE(firstprivate)<br>
+OPENMP_SECTIONS_CLAUSE(reduction)<br>
+OPENMP_SECTIONS_CLAUSE(nowait)<br>
+<br>
// Static attributes for 'default' clause.<br>
OPENMP_DEFAULT_KIND(none)<br>
OPENMP_DEFAULT_KIND(shared)<br>
@@ -113,6 +124,7 @@ OPENMP_SCHEDULE_KIND(runtime)<br>
#undef OPENMP_DEFAULT_KIND<br>
#undef OPENMP_DIRECTIVE<br>
#undef OPENMP_CLAUSE<br>
+#undef OPENMP_SECTIONS_CLAUSE<br>
#undef OPENMP_PARALLEL_CLAUSE<br>
#undef OPENMP_SIMD_CLAUSE<br>
#undef OPENMP_FOR_CLAUSE<br>
<br>
Modified: cfe/trunk/include/clang/Basic/StmtNodes.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/StmtNodes.td?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/StmtNodes.td?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/StmtNodes.td (original)<br>
+++ cfe/trunk/include/clang/Basic/StmtNodes.td Wed Jun 25 06:44:49 2014<br>
@@ -180,3 +180,4 @@ def OMPExecutableDirective : Stmt<1>;<br>
def OMPParallelDirective : DStmt<OMPExecutableDirective>;<br>
def OMPSimdDirective : DStmt<OMPExecutableDirective>;<br>
def OMPForDirective : DStmt<OMPExecutableDirective>;<br>
+def OMPSectionsDirective : DStmt<OMPExecutableDirective>;<br>
<br>
Modified: cfe/trunk/include/clang/Sema/Sema.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Sema/Sema.h (original)<br>
+++ cfe/trunk/include/clang/Sema/Sema.h Wed Jun 25 06:44:49 2014<br>
@@ -7297,7 +7297,7 @@ public:<br>
SourceLocation Loc,<br>
ArrayRef<Expr *> VarList);<br>
<br>
- // brief Initialization of captured region for OpenMP parallel region.<br>
+ // brief Initialization of captured region for OpenMP region.<br>
void ActOnOpenMPRegionStart(OpenMPDirectiveKind DKind, SourceLocation Loc,<br>
Scope *CurScope);<br>
StmtResult ActOnOpenMPExecutableDirective(OpenMPDirectiveKind Kind,<br>
@@ -7322,6 +7322,11 @@ public:<br>
StmtResult ActOnOpenMPForDirective(ArrayRef<OMPClause *> Clauses, Stmt *AStmt,<br>
SourceLocation StartLoc,<br>
SourceLocation EndLoc);<br>
+ /// \brief Called on well-formed '\#pragma omp sections' after parsing<br>
+ /// of the associated statement.<br>
+ StmtResult ActOnOpenMPSectionsDirective(ArrayRef<OMPClause *> Clauses,<br>
+ Stmt *AStmt, SourceLocation StartLoc,<br>
+ SourceLocation EndLoc);<br>
<br>
OMPClause *ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind,<br>
Expr *Expr,<br>
<br>
Modified: cfe/trunk/include/clang/Serialization/ASTBitCodes.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTBitCodes.h?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTBitCodes.h?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Serialization/ASTBitCodes.h (original)<br>
+++ cfe/trunk/include/clang/Serialization/ASTBitCodes.h Wed Jun 25 06:44:49 2014<br>
@@ -1342,6 +1342,7 @@ namespace clang {<br>
STMT_OMP_PARALLEL_DIRECTIVE,<br>
STMT_OMP_SIMD_DIRECTIVE,<br>
STMT_OMP_FOR_DIRECTIVE,<br>
+ STMT_OMP_SECTIONS_DIRECTIVE,<br>
<br>
// ARC<br>
EXPR_OBJC_BRIDGED_CAST, // ObjCBridgedCastExpr<br>
<br>
Modified: cfe/trunk/lib/AST/Stmt.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Stmt.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Stmt.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/Stmt.cpp (original)<br>
+++ cfe/trunk/lib/AST/Stmt.cpp Wed Jun 25 06:44:49 2014<br>
@@ -1386,3 +1386,27 @@ OMPForDirective *OMPForDirective::Create<br>
return new (Mem) OMPForDirective(CollapsedNum, NumClauses);<br>
}<br>
<br>
+OMPSectionsDirective *OMPSectionsDirective::Create(<br>
+ const ASTContext &C, SourceLocation StartLoc, SourceLocation EndLoc,<br>
+ ArrayRef<OMPClause *> Clauses, Stmt *AssociatedStmt) {<br>
+ unsigned Size = llvm::RoundUpToAlignment(sizeof(OMPSectionsDirective),<br>
+ llvm::alignOf<OMPClause *>());<br>
+ void *Mem =<br>
+ C.Allocate(Size + sizeof(OMPClause *) * Clauses.size() + sizeof(Stmt *));<br>
+ OMPSectionsDirective *Dir =<br>
+ new (Mem) OMPSectionsDirective(StartLoc, EndLoc, Clauses.size());<br>
+ Dir->setClauses(Clauses);<br>
+ Dir->setAssociatedStmt(AssociatedStmt);<br>
+ return Dir;<br>
+}<br>
+<br>
+OMPSectionsDirective *OMPSectionsDirective::CreateEmpty(const ASTContext &C,<br>
+ unsigned NumClauses,<br>
+ EmptyShell) {<br>
+ unsigned Size = llvm::RoundUpToAlignment(sizeof(OMPSectionsDirective),<br>
+ llvm::alignOf<OMPClause *>());<br>
+ void *Mem =<br>
+ C.Allocate(Size + sizeof(OMPClause *) * NumClauses + sizeof(Stmt *));<br>
+ return new (Mem) OMPSectionsDirective(NumClauses);<br>
+}<br>
+<br>
<br>
Modified: cfe/trunk/lib/AST/StmtPrinter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtPrinter.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtPrinter.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/StmtPrinter.cpp (original)<br>
+++ cfe/trunk/lib/AST/StmtPrinter.cpp Wed Jun 25 06:44:49 2014<br>
@@ -787,6 +787,11 @@ void StmtPrinter::VisitOMPForDirective(O<br>
PrintOMPExecutableDirective(Node);<br>
}<br>
<br>
+void StmtPrinter::VisitOMPSectionsDirective(OMPSectionsDirective *Node) {<br>
+ Indent() << "#pragma omp sections ";<br>
+ PrintOMPExecutableDirective(Node);<br>
+}<br>
+<br>
//===----------------------------------------------------------------------===//<br>
// Expr printing methods.<br>
//===----------------------------------------------------------------------===//<br>
<br>
Modified: cfe/trunk/lib/AST/StmtProfile.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtProfile.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtProfile.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/StmtProfile.cpp (original)<br>
+++ cfe/trunk/lib/AST/StmtProfile.cpp Wed Jun 25 06:44:49 2014<br>
@@ -360,6 +360,10 @@ void StmtProfiler::VisitOMPForDirective(<br>
VisitOMPExecutableDirective(S);<br>
}<br>
<br>
+void StmtProfiler::VisitOMPSectionsDirective(const OMPSectionsDirective *S) {<br>
+ VisitOMPExecutableDirective(S);<br>
+}<br>
+<br>
void StmtProfiler::VisitExpr(const Expr *S) {<br>
VisitStmt(S);<br>
}<br>
<br>
Modified: cfe/trunk/lib/Basic/OpenMPKinds.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/OpenMPKinds.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/OpenMPKinds.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Basic/OpenMPKinds.cpp (original)<br>
+++ cfe/trunk/lib/Basic/OpenMPKinds.cpp Wed Jun 25 06:44:49 2014<br>
@@ -191,6 +191,16 @@ bool clang::isAllowedClauseForDirective(<br>
break;<br>
}<br>
break;<br>
+ case OMPD_sections:<br>
+ switch (CKind) {<br>
+#define OPENMP_SECTIONS_CLAUSE(Name) \<br>
+ case OMPC_##Name: \<br>
+ return true;<br>
+#include "clang/Basic/OpenMPKinds.def"<br>
+ default:<br>
+ break;<br>
+ }<br>
+ break;<br>
case OMPD_unknown:<br>
case OMPD_threadprivate:<br>
case OMPD_task:<br>
@@ -204,7 +214,8 @@ bool clang::isOpenMPLoopDirective(OpenMP<br>
}<br>
<br>
bool clang::isOpenMPWorksharingDirective(OpenMPDirectiveKind DKind) {<br>
- return DKind == OMPD_for; // TODO add next directives.<br>
+ return DKind == OMPD_for ||<br>
+ DKind == OMPD_sections; // TODO add next directives.<br>
}<br>
<br>
bool clang::isOpenMPParallelDirective(OpenMPDirectiveKind DKind) {<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CGStmt.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmt.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmt.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGStmt.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGStmt.cpp Wed Jun 25 06:44:49 2014<br>
@@ -182,6 +182,9 @@ void CodeGenFunction::EmitStmt(const Stm<br>
case Stmt::OMPForDirectiveClass:<br>
EmitOMPForDirective(cast<OMPForDirective>(*S));<br>
break;<br>
+ case Stmt::OMPSectionsDirectiveClass:<br>
+ EmitOMPSectionsDirective(cast<OMPSectionsDirective>(*S));<br>
+ break;<br>
}<br>
}<br>
<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp Wed Jun 25 06:44:49 2014<br>
@@ -76,5 +76,10 @@ void CodeGenFunction::EmitOMPSimdDirecti<br>
}<br>
<br>
void CodeGenFunction::EmitOMPForDirective(const OMPForDirective &) {<br>
- llvm_unreachable("Not supported yet.");<br>
+ llvm_unreachable("CodeGen for 'omp for' is not supported yet.");<br>
}<br>
+<br>
+void CodeGenFunction::EmitOMPSectionsDirective(const OMPSectionsDirective &) {<br>
+ llvm_unreachable("CodeGen for 'omp sections' is not supported yet.");<br>
+}<br>
+<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)<br>
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Wed Jun 25 06:44:49 2014<br>
@@ -1903,6 +1903,7 @@ public:<br>
void EmitOMPParallelDirective(const OMPParallelDirective &S);<br>
void EmitOMPSimdDirective(const OMPSimdDirective &S);<br>
void EmitOMPForDirective(const OMPForDirective &S);<br>
+ void EmitOMPSectionsDirective(const OMPSectionsDirective &S);<br>
<br>
//===--------------------------------------------------------------------===//<br>
// LValue Expression Emission<br>
<br>
Modified: cfe/trunk/lib/Parse/ParseOpenMP.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseOpenMP.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseOpenMP.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Parse/ParseOpenMP.cpp (original)<br>
+++ cfe/trunk/lib/Parse/ParseOpenMP.cpp Wed Jun 25 06:44:49 2014<br>
@@ -63,6 +63,7 @@ Parser::DeclGroupPtrTy Parser::ParseOpen<br>
case OMPD_simd:<br>
case OMPD_task:<br>
case OMPD_for:<br>
+ case OMPD_sections:<br>
Diag(Tok, diag::err_omp_unexpected_directive)<br>
<< getOpenMPDirectiveName(DKind);<br>
break;<br>
@@ -77,8 +78,9 @@ Parser::DeclGroupPtrTy Parser::ParseOpen<br>
/// annot_pragma_openmp 'threadprivate' simple-variable-list<br>
/// annot_pragma_openmp_end<br>
///<br>
-/// parallel-directive:<br>
-/// annot_pragma_openmp 'parallel' {clause} annot_pragma_openmp_end<br>
+/// executable-directive:<br>
+/// annot_pragma_openmp 'parallel'|'simd'|'for'|'sections' {clause}<br>
+/// annot_pragma_openmp_end<br>
///<br>
StmtResult Parser::ParseOpenMPDeclarativeOrExecutableDirective() {<br>
assert(Tok.is(tok::annot_pragma_openmp) && "Not an OpenMP directive!");<br>
@@ -116,7 +118,8 @@ StmtResult Parser::ParseOpenMPDeclarativ<br>
break;<br>
case OMPD_parallel:<br>
case OMPD_simd:<br>
- case OMPD_for: {<br>
+ case OMPD_for:<br>
+ case OMPD_sections: {<br>
ConsumeToken();<br>
<br>
if (isOpenMPLoopDirective(DKind))<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaOpenMP.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Wed Jun 25 06:44:49 2014<br>
@@ -910,6 +910,13 @@ void Sema::ActOnOpenMPRegionStart(OpenMP<br>
ActOnCapturedRegionStart(Loc, CurScope, CR_OpenMP, Params);<br>
break;<br>
}<br>
+ case OMPD_sections: {<br>
+ Sema::CapturedParamNameType Params[] = {<br>
+ std::make_pair(StringRef(), QualType()) // __context with shared vars<br>
+ };<br>
+ ActOnCapturedRegionStart(Loc, CurScope, CR_OpenMP, Params);<br>
+ break;<br>
+ }<br>
case OMPD_threadprivate:<br>
case OMPD_task:<br>
llvm_unreachable("OpenMP Directive is not allowed");<br>
@@ -997,6 +1004,10 @@ StmtResult Sema::ActOnOpenMPExecutableDi<br>
case OMPD_for:<br>
Res = ActOnOpenMPForDirective(ClausesWithImplicit, AStmt, StartLoc, EndLoc);<br>
break;<br>
+ case OMPD_sections:<br>
+ Res = ActOnOpenMPSectionsDirective(ClausesWithImplicit, AStmt, StartLoc,<br>
+ EndLoc);<br>
+ break;<br>
case OMPD_threadprivate:<br>
case OMPD_task:<br>
llvm_unreachable("OpenMP Directive is not allowed");<br>
@@ -1567,6 +1578,32 @@ StmtResult Sema::ActOnOpenMPForDirective<br>
Clauses, AStmt);<br>
}<br>
<br>
+StmtResult Sema::ActOnOpenMPSectionsDirective(ArrayRef<OMPClause *> Clauses,<br>
+ Stmt *AStmt,<br>
+ SourceLocation StartLoc,<br>
+ SourceLocation EndLoc) {<br>
+ assert(AStmt && isa<CapturedStmt>(AStmt) && "Captured statement expected");<br>
+ auto BaseStmt = AStmt;<br>
+ while (CapturedStmt *CS = dyn_cast_or_null<CapturedStmt>(BaseStmt))<br>
+ BaseStmt = CS->getCapturedStmt();<br>
+ if (auto C = dyn_cast_or_null<CompoundStmt>(BaseStmt)) {<br>
+ auto S = C->children();<br>
+ if (!S)<br>
+ return StmtError();<br>
+ // All associated statements must be '#pragma omp section' except for<br>
+ // the first one.<br>
+ // TODO<br>
+ } else {<br>
+ Diag(AStmt->getLocStart(), diag::err_omp_sections_not_compound_stmt);<br>
+ return StmtError();<br>
+ }<br>
+<br>
+ getCurFunction()->setHasBranchProtectedScope();<br>
+<br>
+ return OMPSectionsDirective::Create(Context, StartLoc, EndLoc, Clauses,<br>
+ AStmt);<br>
+}<br>
+<br>
OMPClause *Sema::ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind, Expr *Expr,<br>
SourceLocation StartLoc,<br>
SourceLocation LParenLoc,<br>
<br>
Modified: cfe/trunk/lib/Sema/TreeTransform.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/TreeTransform.h?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/TreeTransform.h?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/TreeTransform.h (original)<br>
+++ cfe/trunk/lib/Sema/TreeTransform.h Wed Jun 25 06:44:49 2014<br>
@@ -6429,6 +6429,16 @@ TreeTransform<Derived>::TransformOMPForD<br>
return Res;<br>
}<br>
<br>
+template <typename Derived><br>
+StmtResult<br>
+TreeTransform<Derived>::TransformOMPSectionsDirective(OMPSectionsDirective *D) {<br>
+ DeclarationNameInfo DirName;<br>
+ getDerived().getSema().StartOpenMPDSABlock(OMPD_sections, DirName, nullptr);<br>
+ StmtResult Res = getDerived().TransformOMPExecutableDirective(D);<br>
+ getDerived().getSema().EndOpenMPDSABlock(Res.get());<br>
+ return Res;<br>
+}<br>
+<br>
//===----------------------------------------------------------------------===//<br>
// OpenMP clause transformation<br>
//===----------------------------------------------------------------------===//<br>
<br>
Modified: cfe/trunk/lib/Serialization/ASTReaderStmt.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderStmt.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderStmt.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Serialization/ASTReaderStmt.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/ASTReaderStmt.cpp Wed Jun 25 06:44:49 2014<br>
@@ -1906,6 +1906,13 @@ void ASTStmtReader::VisitOMPForDirective<br>
VisitOMPExecutableDirective(D);<br>
}<br>
<br>
+void ASTStmtReader::VisitOMPSectionsDirective(OMPSectionsDirective *D) {<br>
+ VisitStmt(D);<br>
+ // The NumClauses field was read in ReadStmtFromStream.<br>
+ ++Idx;<br>
+ VisitOMPExecutableDirective(D);<br>
+}<br>
+<br>
//===----------------------------------------------------------------------===//<br>
// ASTReader Implementation<br>
//===----------------------------------------------------------------------===//<br>
@@ -2401,6 +2408,11 @@ Stmt *ASTReader::ReadStmtFromStream(Modu<br>
break;<br>
}<br>
<br>
+ case STMT_OMP_SECTIONS_DIRECTIVE:<br>
+ S = OMPSectionsDirective::CreateEmpty(<br>
+ Context, Record[ASTStmtReader::NumStmtFields], Empty);<br>
+ break;<br>
+<br>
case EXPR_CXX_OPERATOR_CALL:<br>
S = new (Context) CXXOperatorCallExpr(Context, Empty);<br>
break;<br>
<br>
Modified: cfe/trunk/lib/Serialization/ASTWriterStmt.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterStmt.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterStmt.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Serialization/ASTWriterStmt.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/ASTWriterStmt.cpp Wed Jun 25 06:44:49 2014<br>
@@ -1818,6 +1818,13 @@ void ASTStmtWriter::VisitOMPForDirective<br>
Code = serialization::STMT_OMP_FOR_DIRECTIVE;<br>
}<br>
<br>
+void ASTStmtWriter::VisitOMPSectionsDirective(OMPSectionsDirective *D) {<br>
+ VisitStmt(D);<br>
+ Record.push_back(D->getNumClauses());<br>
+ VisitOMPExecutableDirective(D);<br>
+ Code = serialization::STMT_OMP_SECTIONS_DIRECTIVE;<br>
+}<br>
+<br>
//===----------------------------------------------------------------------===//<br>
// ASTWriter Implementation<br>
//===----------------------------------------------------------------------===//<br>
<br>
Modified: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp (original)<br>
+++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp Wed Jun 25 06:44:49 2014<br>
@@ -733,6 +733,7 @@ void ExprEngine::Visit(const Stmt *S, Ex<br>
case Stmt::OMPParallelDirectiveClass:<br>
case Stmt::OMPSimdDirectiveClass:<br>
case Stmt::OMPForDirectiveClass:<br>
+ case Stmt::OMPSectionsDirectiveClass:<br>
llvm_unreachable("Stmt should not be in analyzer evaluation loop");<br>
<br>
case Stmt::ObjCSubscriptRefExprClass:<br>
<br>
Modified: cfe/trunk/test/OpenMP/nesting_of_regions.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/nesting_of_regions.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/nesting_of_regions.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/nesting_of_regions.cpp (original)<br>
+++ cfe/trunk/test/OpenMP/nesting_of_regions.cpp Wed Jun 25 06:44:49 2014<br>
@@ -1,5 +1,7 @@<br>
// RUN: %clang_cc1 -fsyntax-only -fopenmp=libiomp5 -verify %s<br>
<br>
+void bar();<br>
+<br>
template <class T><br>
void foo() {<br>
#pragma omp parallel<br>
@@ -8,6 +10,11 @@ void foo() {<br>
#pragma omp parallel<br>
#pragma omp simd<br>
for (int i = 0; i < 10; ++i);<br>
+#pragma omp parallel<br>
+#pragma omp sections<br>
+ {<br>
+ bar();<br>
+ }<br>
#pragma omp simd<br>
for (int i = 0; i < 10; ++i) {<br>
#pragma omp for // expected-error {{OpenMP constructs may not be nested inside a simd region}}<br>
@@ -23,6 +30,13 @@ void foo() {<br>
#pragma omp parallel // expected-error {{OpenMP constructs may not be nested inside a simd region}}<br>
for (int i = 0; i < 10; ++i);<br>
}<br>
+#pragma omp simd<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp sections // expected-error {{OpenMP constructs may not be nested inside a simd region}}<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
#pragma omp for<br>
for (int i = 0; i < 10; ++i) {<br>
#pragma omp for // expected-error {{region cannot be closely nested inside 'for' region; perhaps you forget to enclose 'omp for' directive into a parallel region?}}<br>
@@ -38,6 +52,35 @@ void foo() {<br>
#pragma omp parallel<br>
for (int i = 0; i < 10; ++i);<br>
}<br>
+#pragma omp for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp sections // expected-error {{region cannot be closely nested inside 'for' region; perhaps you forget to enclose 'omp sections' directive into a parallel region?}}<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
+#pragma omp sections<br>
+ {<br>
+#pragma omp for // expected-error {{region cannot be closely nested inside 'sections' region; perhaps you forget to enclose 'omp for' directive into a parallel region?}}<br>
+ for (int i = 0; i < 10; ++i);<br>
+ }<br>
+#pragma omp sections<br>
+ {<br>
+#pragma omp simd<br>
+ for (int i = 0; i < 10; ++i);<br>
+ }<br>
+#pragma omp sections<br>
+ {<br>
+#pragma omp parallel<br>
+ for (int i = 0; i < 10; ++i);<br>
+ }<br>
+#pragma omp sections<br>
+ {<br>
+#pragma omp sections // expected-error {{region cannot be closely nested inside 'sections' region; perhaps you forget to enclose 'omp sections' directive into a parallel region?}}<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
}<br>
<br>
void foo() {<br>
@@ -47,6 +90,11 @@ void foo() {<br>
#pragma omp parallel<br>
#pragma omp simd<br>
for (int i = 0; i < 10; ++i);<br>
+#pragma omp parallel<br>
+#pragma omp sections<br>
+ {<br>
+ bar();<br>
+ }<br>
#pragma omp simd<br>
for (int i = 0; i < 10; ++i) {<br>
#pragma omp for // expected-error {{OpenMP constructs may not be nested inside a simd region}}<br>
@@ -62,6 +110,13 @@ void foo() {<br>
#pragma omp parallel // expected-error {{OpenMP constructs may not be nested inside a simd region}}<br>
for (int i = 0; i < 10; ++i);<br>
}<br>
+#pragma omp simd<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp sections // expected-error {{OpenMP constructs may not be nested inside a simd region}}<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
#pragma omp for<br>
for (int i = 0; i < 10; ++i) {<br>
#pragma omp for // expected-error {{region cannot be closely nested inside 'for' region; perhaps you forget to enclose 'omp for' directive into a parallel region?}}<br>
@@ -77,6 +132,35 @@ void foo() {<br>
#pragma omp parallel<br>
for (int i = 0; i < 10; ++i);<br>
}<br>
+#pragma omp for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp sections // expected-error {{region cannot be closely nested inside 'for' region; perhaps you forget to enclose 'omp sections' directive into a parallel region?}}<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
+#pragma omp sections<br>
+ {<br>
+#pragma omp for // expected-error {{region cannot be closely nested inside 'sections' region; perhaps you forget to enclose 'omp for' directive into a parallel region?}}<br>
+ for (int i = 0; i < 10; ++i);<br>
+ }<br>
+#pragma omp sections<br>
+ {<br>
+#pragma omp simd<br>
+ for (int i = 0; i < 10; ++i);<br>
+ }<br>
+#pragma omp sections<br>
+ {<br>
+#pragma omp parallel<br>
+ for (int i = 0; i < 10; ++i);<br>
+ }<br>
+#pragma omp sections<br>
+ {<br>
+#pragma omp sections // expected-error {{region cannot be closely nested inside 'sections' region; perhaps you forget to enclose 'omp sections' directive into a parallel region?}}<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
return foo<int>();<br>
}<br>
<br>
<br>
Added: cfe/trunk/test/OpenMP/sections_ast_print.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_ast_print.cpp?rev=211685&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_ast_print.cpp?rev=211685&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/sections_ast_print.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/sections_ast_print.cpp Wed Jun 25 06:44:49 2014<br>
@@ -0,0 +1,46 @@<br>
+// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ast-print %s | FileCheck %s<br>
+// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -emit-pch -o %t %s<br>
+// RUN: %clang_cc1 -fopenmp=libiomp5 -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s<br>
+// expected-no-diagnostics<br>
+<br>
+#ifndef HEADER<br>
+#define HEADER<br>
+<br>
+void foo() {}<br>
+<br>
+template <class T, int N><br>
+T tmain(T argc) {<br>
+ T b = argc, c, d, e, f, g;<br>
+ static T a;<br>
+// CHECK: static T a;<br>
+#pragma omp parallel<br>
+#pragma omp sections private(argc, b), firstprivate(c, d), lastprivate(d, f) reduction (-: g) nowait<br>
+ {<br>
+ foo();<br>
+ }<br>
+ // CHECK-NEXT: #pragma omp parallel<br>
+ // CHECK-NEXT: #pragma omp sections private(argc,b) firstprivate(c,d) lastprivate(d,f) reduction(-: g) nowait<br>
+ // CHECK-NEXT: {<br>
+ // CHECK-NEXT: foo();<br>
+ // CHECK-NEXT: }<br>
+ return T();<br>
+}<br>
+<br>
+int main(int argc, char **argv) {<br>
+ int b = argc, c, d, e, f, g;<br>
+ static int a;<br>
+// CHECK: static int a;<br>
+#pragma omp parallel<br>
+#pragma omp sections private(argc, b), firstprivate(argv, c), lastprivate(d, f) reduction(+:g) nowait<br>
+ {<br>
+ foo();<br>
+ }<br>
+ // CHECK-NEXT: #pragma omp parallel<br>
+ // CHECK-NEXT: #pragma omp sections private(argc,b) firstprivate(argv,c) lastprivate(d,f) reduction(+: g) nowait<br>
+ // CHECK-NEXT: {<br>
+ // CHECK-NEXT: foo();<br>
+ // CHECK-NEXT: }<br>
+ return (tmain<int, 5>(argc) + tmain<char, 1>(argv[0][0]));<br>
+}<br>
+<br>
+#endif<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_ast_print.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_ast_print.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_ast_print.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp?rev=211685&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp?rev=211685&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp Wed Jun 25 06:44:49 2014<br>
@@ -0,0 +1,335 @@<br>
+// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s<br>
+<br>
+void foo() {<br>
+}<br>
+<br>
+bool foobool(int argc) {<br>
+ return argc;<br>
+}<br>
+<br>
+struct S1; // expected-note 2 {{declared here}} expected-note 2 {{forward declaration of 'S1'}}<br>
+extern S1 a;<br>
+class S2 {<br>
+ mutable int a;<br>
+<br>
+public:<br>
+ S2() : a(0) {}<br>
+ S2(S2 &s2) : a(s2.a) {}<br>
+ static float S2s;<br>
+ static const float S2sc;<br>
+};<br>
+const float S2::S2sc = 0;<br>
+const S2 b;<br>
+const S2 ba[5];<br>
+class S3 {<br>
+ int a;<br>
+ S3 &operator=(const S3 &s3);<br>
+<br>
+public:<br>
+ S3() : a(0) {}<br>
+ S3(S3 &s3) : a(s3.a) {}<br>
+};<br>
+const S3 c;<br>
+const S3 ca[5];<br>
+extern const int f;<br>
+class S4 { // expected-note 2 {{'S4' declared here}}<br>
+ int a;<br>
+ S4();<br>
+ S4(const S4 &s4);<br>
+<br>
+public:<br>
+ S4(int v) : a(v) {}<br>
+};<br>
+class S5 { // expected-note 4 {{'S5' declared here}}<br>
+ int a;<br>
+ S5(const S5 &s5) : a(s5.a) {}<br>
+<br>
+public:<br>
+ S5() : a(0) {}<br>
+ S5(int v) : a(v) {}<br>
+};<br>
+class S6 {<br>
+ int a;<br>
+ S6() : a(0) {}<br>
+<br>
+public:<br>
+ S6(const S6 &s6) : a(s6.a) {}<br>
+ S6(int v) : a(v) {}<br>
+};<br>
+<br>
+S3 h;<br>
+#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}}<br>
+<br>
+template <class I, class C><br>
+int foomain(int argc, char **argv) {<br>
+ I e(4); // expected-note {{'e' defined here}}<br>
+ C g(5); // expected-note 2 {{'g' defined here}}<br>
+ int i;<br>
+ int &j = i; // expected-note {{'j' defined here}}<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate // expected-error {{expected '(' after 'firstprivate'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate() // expected-error {{expected expression}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(argc)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(S1) // expected-error {{'S1' does not refer to a value}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(a, b) // expected-error {{firstprivate variable with incomplete type 'S1'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(argv[1]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(e, g) // expected-error 2 {{firstprivate variable must have an accessible, unambiguous copy constructor}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(h) // expected-error {{threadprivate or thread local variable cannot be firstprivate}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections linear(i) // expected-error {{unexpected OpenMP clause 'linear' in directive '#pragma omp sections'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+ {<br>
+ int v = 0;<br>
+ int i; // expected-note {{variable with automatic storage duration is predetermined as private; perhaps you forget to enclose 'omp sections' directive into a parallel or another task region?}}<br>
+#pragma omp sections firstprivate(i) // expected-error {{private variable cannot be firstprivate}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+ v += i;<br>
+ }<br>
+#pragma omp parallel shared(i)<br>
+#pragma omp parallel private(i)<br>
+#pragma omp sections firstprivate(j) // expected-error {{arguments of OpenMP clause 'firstprivate' cannot be of reference type}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(i)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(g) firstprivate(g) // expected-error {{firstprivate variable must have an accessible, unambiguous copy constructor}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel private(i) // expected-note {{defined as private}}<br>
+#pragma omp sections firstprivate(i) // expected-error {{firstprivate variable must be shared}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel reduction(+ : i) // expected-note {{defined as reduction}}<br>
+#pragma omp sections firstprivate(i) // expected-error {{firstprivate variable must be shared}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+ return 0;<br>
+}<br>
+<br>
+int main(int argc, char **argv) {<br>
+ const int d = 5;<br>
+ const int da[5] = {0};<br>
+ S4 e(4); // expected-note {{'e' defined here}}<br>
+ S5 g(5); // expected-note 2 {{'g' defined here}}<br>
+ S3 m;<br>
+ S6 n(2);<br>
+ int i;<br>
+ int &j = i; // expected-note {{'j' defined here}}<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate // expected-error {{expected '(' after 'firstprivate'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate() // expected-error {{expected expression}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(argc)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(S1) // expected-error {{'S1' does not refer to a value}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(a, b, c, d, f) // expected-error {{firstprivate variable with incomplete type 'S1'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(argv[1]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(2 * 2) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(ba) // OK<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(ca) // OK<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(da) // OK<br>
+ {<br>
+ foo();<br>
+ }<br>
+ int xa;<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(xa) // OK<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(S2::S2s) // OK<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(S2::S2sc) // OK<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections safelen(5) // expected-error {{unexpected OpenMP clause 'safelen' in directive '#pragma omp sections'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(e, g) // expected-error 2 {{firstprivate variable must have an accessible, unambiguous copy constructor}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(m) // OK<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(h) // expected-error {{threadprivate or thread local variable cannot be firstprivate}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections private(xa), firstprivate(xa) // expected-error {{private variable cannot be firstprivate}} expected-note {{defined as private}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel shared(xa)<br>
+#pragma omp sections firstprivate(xa) // OK: may be firstprivate<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(j) // expected-error {{arguments of OpenMP clause 'firstprivate' cannot be of reference type}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(g) firstprivate(g) // expected-error {{firstprivate variable must have an accessible, unambiguous copy constructor}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(n) firstprivate(n) // OK<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+ {<br>
+ int v = 0;<br>
+ int i; // expected-note {{variable with automatic storage duration is predetermined as private; perhaps you forget to enclose 'omp sections' directive into a parallel or another task region?}}<br>
+#pragma omp sections firstprivate(i) // expected-error {{private variable cannot be firstprivate}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+ v += i;<br>
+ }<br>
+#pragma omp parallel private(i) // expected-note {{defined as private}}<br>
+#pragma omp sections firstprivate(i) // expected-error {{firstprivate variable must be shared}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel reduction(+ : i) // expected-note {{defined as reduction}}<br>
+#pragma omp sections firstprivate(i) // expected-error {{firstprivate variable must be shared}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+<br>
+ return foomain<S4, S5>(argc, argv); // expected-note {{in instantiation of function template specialization 'foomain<S4, S5>' requested here}}<br>
+}<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp?rev=211685&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp?rev=211685&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp Wed Jun 25 06:44:49 2014<br>
@@ -0,0 +1,309 @@<br>
+// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s<br>
+<br>
+void foo() {<br>
+}<br>
+<br>
+bool foobool(int argc) {<br>
+ return argc;<br>
+}<br>
+<br>
+struct S1; // expected-note 2 {{declared here}} expected-note 2 {{forward declaration of 'S1'}}<br>
+extern S1 a;<br>
+class S2 {<br>
+ mutable int a;<br>
+<br>
+public:<br>
+ S2() : a(0) {}<br>
+ S2(S2 &s2) : a(s2.a) {}<br>
+ static float S2s; // expected-note {{static data member is predetermined as shared}}<br>
+ static const float S2sc;<br>
+};<br>
+const float S2::S2sc = 0; // expected-note {{static data member is predetermined as shared}}<br>
+const S2 b;<br>
+const S2 ba[5];<br>
+class S3 { // expected-note 2 {{'S3' declared here}}<br>
+ int a;<br>
+ S3 &operator=(const S3 &s3);<br>
+<br>
+public:<br>
+ S3() : a(0) {}<br>
+ S3(S3 &s3) : a(s3.a) {}<br>
+};<br>
+const S3 c; // expected-note {{global variable is predetermined as shared}}<br>
+const S3 ca[5]; // expected-note {{global variable is predetermined as shared}}<br>
+extern const int f; // expected-note {{global variable is predetermined as shared}}<br>
+class S4 { // expected-note 3 {{'S4' declared here}}<br>
+ int a;<br>
+ S4();<br>
+ S4(const S4 &s4);<br>
+<br>
+public:<br>
+ S4(int v) : a(v) {}<br>
+};<br>
+class S5 { // expected-note {{'S5' declared here}}<br>
+ int a;<br>
+ S5() : a(0) {}<br>
+<br>
+public:<br>
+ S5(const S5 &s5) : a(s5.a) {}<br>
+ S5(int v) : a(v) {}<br>
+};<br>
+class S6 {<br>
+ int a;<br>
+ S6() : a(0) {}<br>
+<br>
+public:<br>
+ S6(const S6 &s6) : a(s6.a) {}<br>
+ S6(int v) : a(v) {}<br>
+};<br>
+<br>
+S3 h;<br>
+#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}}<br>
+<br>
+template <class I, class C><br>
+int foomain(int argc, char **argv) {<br>
+ I e(4); // expected-note {{'e' defined here}}<br>
+ I g(5); // expected-note {{'g' defined here}}<br>
+ int i;<br>
+ int &j = i; // expected-note {{'j' defined here}}<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate // expected-error {{expected '(' after 'lastprivate'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate() // expected-error {{expected expression}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(argc)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(S1) // expected-error {{'S1' does not refer to a value}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(a, b) // expected-error {{lastprivate variable with incomplete type 'S1'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(argv[1]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(e, g) // expected-error 2 {{lastprivate variable must have an accessible, unambiguous default constructor}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(h) // expected-error {{threadprivate or thread local variable cannot be lastprivate}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections linear(i) // expected-error {{unexpected OpenMP clause 'linear' in directive '#pragma omp sections'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+ {<br>
+ int v = 0;<br>
+ int i; // expected-note {{variable with automatic storage duration is predetermined as private; perhaps you forget to enclose 'omp sections' directive into a parallel or another task region?}}<br>
+#pragma omp sections lastprivate(i) // expected-error {{lastprivate variable must be shared}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+ v += i;<br>
+ }<br>
+#pragma omp parallel shared(i)<br>
+#pragma omp parallel private(i)<br>
+#pragma omp sections lastprivate(j) // expected-error {{arguments of OpenMP clause 'lastprivate' cannot be of reference type}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(i)<br>
+ {<br>
+ foo();<br>
+ }<br>
+ return 0;<br>
+}<br>
+<br>
+int main(int argc, char **argv) {<br>
+ const int d = 5; // expected-note {{constant variable is predetermined as shared}}<br>
+ const int da[5] = {0}; // expected-note {{constant variable is predetermined as shared}}<br>
+ S4 e(4); // expected-note {{'e' defined here}}<br>
+ S5 g(5); // expected-note {{'g' defined here}}<br>
+ S3 m; // expected-note 2 {{'m' defined here}}<br>
+ S6 n(2);<br>
+ int i;<br>
+ int &j = i; // expected-note {{'j' defined here}}<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate // expected-error {{expected '(' after 'lastprivate'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate() // expected-error {{expected expression}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(argc)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(S1) // expected-error {{'S1' does not refer to a value}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(a, b, c, d, f) // expected-error {{lastprivate variable with incomplete type 'S1'}} expected-error 3 {{shared variable cannot be lastprivate}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(argv[1]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(2 * 2) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(ba)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(ca) // expected-error {{shared variable cannot be lastprivate}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(da) // expected-error {{shared variable cannot be lastprivate}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+ int xa;<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(xa) // OK<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(S2::S2s) // expected-error {{shared variable cannot be lastprivate}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(S2::S2sc) // expected-error {{shared variable cannot be lastprivate}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections safelen(5) // expected-error {{unexpected OpenMP clause 'safelen' in directive '#pragma omp sections'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(e, g) // expected-error 2 {{lastprivate variable must have an accessible, unambiguous default constructor}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(m) // expected-error {{lastprivate variable must have an accessible, unambiguous copy assignment operator}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(h) // expected-error {{threadprivate or thread local variable cannot be lastprivate}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections private(xa), lastprivate(xa) // expected-error {{private variable cannot be lastprivate}} expected-note {{defined as private}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(i)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel private(xa) // expected-note {{defined as private}}<br>
+#pragma omp sections lastprivate(xa) // expected-error {{lastprivate variable must be shared}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel reduction(+ : xa) // expected-note {{defined as reduction}}<br>
+#pragma omp sections lastprivate(xa) // expected-error {{lastprivate variable must be shared}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(j) // expected-error {{arguments of OpenMP clause 'lastprivate' cannot be of reference type}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections firstprivate(m) lastprivate(m) // expected-error {{lastprivate variable must have an accessible, unambiguous copy assignment operator}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(n) firstprivate(n) // OK<br>
+ {<br>
+ foo();<br>
+ }<br>
+ return foomain<S4, S5>(argc, argv); // expected-note {{in instantiation of function template specialization 'foomain<S4, S5>' requested here}}<br>
+}<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/sections_misc_messages.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_misc_messages.c?rev=211685&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_misc_messages.c?rev=211685&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/sections_misc_messages.c (added)<br>
+++ cfe/trunk/test/OpenMP/sections_misc_messages.c Wed Jun 25 06:44:49 2014<br>
@@ -0,0 +1,271 @@<br>
+// RUN: %clang_cc1 -fsyntax-only -fopenmp=libiomp5 -verify %s<br>
+<br>
+void foo();<br>
+<br>
+// expected-error@+1 {{unexpected OpenMP directive '#pragma omp sections'}}<br>
+#pragma omp sections<br>
+<br>
+// expected-error@+1 {{unexpected OpenMP directive '#pragma omp sections'}}<br>
+#pragma omp sections foo<br>
+<br>
+void test_no_clause() {<br>
+ int i;<br>
+#pragma omp sections<br>
+ {<br>
+ foo();<br>
+ }<br>
+<br>
+// expected-error@+2 {{the statement for '#pragma omp sections' must be a compound statement}}<br>
+#pragma omp sections<br>
+ ++i;<br>
+}<br>
+<br>
+void test_branch_protected_scope() {<br>
+ int i = 0;<br>
+L1:<br>
+ ++i;<br>
+<br>
+ int x[24];<br>
+<br>
+#pragma omp parallel<br>
+#pragma omp sections<br>
+ {<br>
+ if (i == 5)<br>
+ goto L1; // expected-error {{use of undeclared label 'L1'}}<br>
+ else if (i == 6)<br>
+ return; // expected-error {{cannot return from OpenMP region}}<br>
+ else if (i == 7)<br>
+ goto L2;<br>
+ else if (i == 8) {<br>
+ L2:<br>
+ x[i]++;<br>
+ }<br>
+ }<br>
+<br>
+ if (x[0] == 0)<br>
+ goto L2; // expected-error {{use of undeclared label 'L2'}}<br>
+ else if (x[1] == 1)<br>
+ goto L1;<br>
+}<br>
+<br>
+void test_invalid_clause() {<br>
+ int i;<br>
+#pragma omp parallel<br>
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp sections' are ignored}}<br>
+#pragma omp sections foo bar<br>
+ {<br>
+ foo();<br>
+ }<br>
+}<br>
+<br>
+void test_non_identifiers() {<br>
+ int i, x;<br>
+<br>
+#pragma omp parallel<br>
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp sections' are ignored}}<br>
+#pragma omp sections;<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+2 {{unexpected OpenMP clause 'linear' in directive '#pragma omp sections'}}<br>
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp sections' are ignored}}<br>
+#pragma omp sections linear(x);<br>
+ {<br>
+ foo();<br>
+ }<br>
+<br>
+#pragma omp parallel<br>
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp sections' are ignored}}<br>
+#pragma omp sections private(x);<br>
+ {<br>
+ foo();<br>
+ }<br>
+<br>
+#pragma omp parallel<br>
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp sections' are ignored}}<br>
+#pragma omp sections, private(x);<br>
+ {<br>
+ foo();<br>
+ }<br>
+}<br>
+<br>
+void test_private() {<br>
+ int i;<br>
+#pragma omp parallel<br>
+// expected-error@+2 {{expected expression}}<br>
+// expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}<br>
+#pragma omp sections private(<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}<br>
+// expected-error@+1 2 {{expected expression}}<br>
+#pragma omp sections private(,<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+1 2 {{expected expression}}<br>
+#pragma omp sections private(, )<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp sections private()<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp sections private(int)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+1 {{expected variable name}}<br>
+#pragma omp sections private(0)<br>
+ {<br>
+ foo();<br>
+ }<br>
+<br>
+ int x, y, z;<br>
+#pragma omp parallel<br>
+#pragma omp sections private(x)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections private(x, y)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections private(x, y, z)<br>
+ {<br>
+ foo();<br>
+ }<br>
+}<br>
+<br>
+void test_lastprivate() {<br>
+ int i;<br>
+#pragma omp parallel<br>
+// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp sections lastprivate(<br>
+ {<br>
+ foo();<br>
+ }<br>
+<br>
+#pragma omp parallel<br>
+// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}<br>
+// expected-error@+1 2 {{expected expression}}<br>
+#pragma omp sections lastprivate(,<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+1 2 {{expected expression}}<br>
+#pragma omp sections lastprivate(, )<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp sections lastprivate()<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp sections lastprivate(int)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+1 {{expected variable name}}<br>
+#pragma omp sections lastprivate(0)<br>
+ {<br>
+ foo();<br>
+ }<br>
+<br>
+ int x, y, z;<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(x)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(x, y)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(x, y, z)<br>
+ {<br>
+ foo();<br>
+ }<br>
+}<br>
+<br>
+void test_firstprivate() {<br>
+ int i;<br>
+#pragma omp parallel<br>
+// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp sections firstprivate(<br>
+ {<br>
+ foo();<br>
+ }<br>
+<br>
+#pragma omp parallel<br>
+// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}<br>
+// expected-error@+1 2 {{expected expression}}<br>
+#pragma omp sections firstprivate(,<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+1 2 {{expected expression}}<br>
+#pragma omp sections firstprivate(, )<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp sections firstprivate()<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp sections firstprivate(int)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+// expected-error@+1 {{expected variable name}}<br>
+#pragma omp sections firstprivate(0)<br>
+ {<br>
+ foo();<br>
+ }<br>
+<br>
+ int x, y, z;<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(x) firstprivate(x)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(x, y) firstprivate(x, y)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections lastprivate(x, y, z) firstprivate(x, y, z)<br>
+ {<br>
+ foo();<br>
+ }<br>
+}<br>
+<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_misc_messages.c<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_misc_messages.c<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_misc_messages.c<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/sections_private_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_private_messages.cpp?rev=211685&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_private_messages.cpp?rev=211685&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/sections_private_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/sections_private_messages.cpp Wed Jun 25 06:44:49 2014<br>
@@ -0,0 +1,204 @@<br>
+// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s<br>
+<br>
+void foo() {<br>
+}<br>
+<br>
+bool foobool(int argc) {<br>
+ return argc;<br>
+}<br>
+<br>
+struct S1; // expected-note 2 {{declared here}} expected-note 2 {{forward declaration of 'S1'}}<br>
+extern S1 a;<br>
+class S2 {<br>
+ mutable int a;<br>
+<br>
+public:<br>
+ S2() : a(0) {}<br>
+};<br>
+const S2 b;<br>
+const S2 ba[5];<br>
+class S3 {<br>
+ int a;<br>
+<br>
+public:<br>
+ S3() : a(0) {}<br>
+};<br>
+const S3 ca[5];<br>
+class S4 { // expected-note {{'S4' declared here}}<br>
+ int a;<br>
+ S4();<br>
+<br>
+public:<br>
+ S4(int v) : a(v) {}<br>
+};<br>
+class S5 { // expected-note {{'S5' declared here}}<br>
+ int a;<br>
+ S5() : a(0) {}<br>
+<br>
+public:<br>
+ S5(int v) : a(v) {}<br>
+};<br>
+<br>
+S3 h;<br>
+#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}}<br>
+<br>
+template <class I, class C><br>
+int foomain(I argc, C **argv) {<br>
+ I e(4);<br>
+ I g(5);<br>
+ int i;<br>
+ int &j = i; // expected-note {{'j' defined here}}<br>
+#pragma omp sections private // expected-error {{expected '(' after 'private'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private() // expected-error {{expected expression}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(argc)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(S1) // expected-error {{'S1' does not refer to a value}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(a, b) // expected-error {{private variable with incomplete type 'S1'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(argv[1]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(e, g)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(h) // expected-error {{threadprivate or thread local variable cannot be private}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections shared(i) // expected-error {{unexpected OpenMP clause 'shared' in directive '#pragma omp sections'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+ {<br>
+ int v = 0;<br>
+ int i;<br>
+#pragma omp sections private(i)<br>
+ {<br>
+ foo();<br>
+ }<br>
+ v += i;<br>
+ }<br>
+#pragma omp parallel shared(i)<br>
+#pragma omp parallel private(i)<br>
+#pragma omp sections private(j) // expected-error {{arguments of OpenMP clause 'private' cannot be of reference type}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(i)<br>
+ {<br>
+ foo();<br>
+ }<br>
+ return 0;<br>
+}<br>
+<br>
+int main(int argc, char **argv) {<br>
+ S4 e(4); // expected-note {{'e' defined here}}<br>
+ S5 g(5); // expected-note {{'g' defined here}}<br>
+ int i;<br>
+ int &j = i; // expected-note {{'j' defined here}}<br>
+#pragma omp sections private // expected-error {{expected '(' after 'private'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private() // expected-error {{expected expression}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(argc)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(S1) // expected-error {{'S1' does not refer to a value}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(a, b) // expected-error {{private variable with incomplete type 'S1'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(argv[1]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(e, g) // expected-error 2 {{private variable must have an accessible, unambiguous default constructor}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(h) // expected-error {{threadprivate or thread local variable cannot be private}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections shared(i) // expected-error {{unexpected OpenMP clause 'shared' in directive '#pragma omp sections'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+ {<br>
+ int i;<br>
+#pragma omp sections private(i)<br>
+ {<br>
+ foo();<br>
+ }<br>
+ }<br>
+#pragma omp parallel shared(i)<br>
+#pragma omp parallel private(i)<br>
+#pragma omp sections private(j) // expected-error {{arguments of OpenMP clause 'private' cannot be of reference type}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp sections private(i)<br>
+ {<br>
+ foo();<br>
+ }<br>
+<br>
+ return 0;<br>
+}<br>
+<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_private_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_private_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_private_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/sections_reduction_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_reduction_messages.cpp?rev=211685&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_reduction_messages.cpp?rev=211685&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/sections_reduction_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/sections_reduction_messages.cpp Wed Jun 25 06:44:49 2014<br>
@@ -0,0 +1,413 @@<br>
+// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 -o - %s<br>
+<br>
+void foo() {<br>
+}<br>
+<br>
+bool foobool(int argc) {<br>
+ return argc;<br>
+}<br>
+<br>
+struct S1; // expected-note {{declared here}} expected-note 4 {{forward declaration of 'S1'}}<br>
+extern S1 a;<br>
+class S2 {<br>
+ mutable int a;<br>
+ S2 &operator+=(const S2 &arg) { return (*this); }<br>
+<br>
+public:<br>
+ S2() : a(0) {}<br>
+ S2(S2 &s2) : a(s2.a) {}<br>
+ static float S2s; // expected-note 2 {{static data member is predetermined as shared}}<br>
+ static const float S2sc;<br>
+};<br>
+const float S2::S2sc = 0; // expected-note 2 {{'S2sc' defined here}}<br>
+S2 b; // expected-note 2 {{'b' defined here}}<br>
+const S2 ba[5]; // expected-note 2 {{'ba' defined here}}<br>
+class S3 {<br>
+ int a;<br>
+<br>
+public:<br>
+ S3() : a(0) {}<br>
+ S3(const S3 &s3) : a(s3.a) {}<br>
+ S3 operator+=(const S3 &arg1) { return arg1; }<br>
+};<br>
+int operator+=(const S3 &arg1, const S3 &arg2) { return 5; }<br>
+S3 c; // expected-note 2 {{'c' defined here}}<br>
+const S3 ca[5]; // expected-note 2 {{'ca' defined here}}<br>
+extern const int f; // expected-note 4 {{'f' declared here}}<br>
+class S4 { // expected-note {{'S4' declared here}}<br>
+ int a;<br>
+ S4();<br>
+ S4(const S4 &s4);<br>
+ S4 &operator+=(const S4 &arg) { return (*this); }<br>
+<br>
+public:<br>
+ S4(int v) : a(v) {}<br>
+};<br>
+S4 &operator&=(S4 &arg1, S4 &arg2) { return arg1; }<br>
+class S5 {<br>
+ int a;<br>
+ S5() : a(0) {}<br>
+ S5(const S5 &s5) : a(s5.a) {}<br>
+ S5 &operator+=(const S5 &arg);<br>
+<br>
+public:<br>
+ S5(int v) : a(v) {}<br>
+};<br>
+class S6 {<br>
+ int a;<br>
+<br>
+public:<br>
+ S6() : a(6) {}<br>
+ operator int() { return 6; }<br>
+} o; // expected-note 2 {{'o' defined here}}<br>
+<br>
+S3 h, k;<br>
+#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}}<br>
+<br>
+template <class T> // expected-note {{declared here}}<br>
+T tmain(T argc) { // expected-note 2 {{'argc' defined here}}<br>
+ const T d = T(); // expected-note 4 {{'d' defined here}}<br>
+ const T da[5] = {T()}; // expected-note 2 {{'da' defined here}}<br>
+ T qa[5] = {T()};<br>
+ T i;<br>
+ T &j = i; // expected-note 4 {{'j' defined here}}<br>
+ S3 &p = k; // expected-note 2 {{'p' defined here}}<br>
+ const T &r = da[(int)i]; // expected-note 2 {{'r' defined here}}<br>
+ T &q = qa[(int)i]; // expected-note 2 {{'q' defined here}}<br>
+ T fl; // expected-note {{'fl' defined here}}<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction // expected-error {{expected '(' after 'reduction'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp sections' are ignored}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction( // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(- // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction() // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(*) // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(\) // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(& : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{variable of type 'float' is not valid for specified reduction operation}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{variable of type 'float' is not valid for specified reduction operation}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(|| : argc ? i : argc) // expected-error 2 {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(foo : argc) //expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(&& : argc)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(^ : T) // expected-error {{'T' does not refer to a value}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(+ : a, b, c, d, f) // expected-error {{reduction variable with incomplete type 'S1'}} expected-error 3 {{const-qualified variable cannot be reduction}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(min : a, b, c, d, f) // expected-error {{reduction variable with incomplete type 'S1'}} expected-error 2 {{arguments of OpenMP clause 'reduction' for 'min' or 'max' must be of arithmetic type}} expected-error 3 {{const-qualified variable cannot be reduction}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(max : qa[1]) // expected-error 2 {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(+ : ba) // expected-error {{a reduction variable with array type 'const S2 [5]'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(* : ca) // expected-error {{a reduction variable with array type 'const S3 [5]'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(- : da) // expected-error {{a reduction variable with array type 'const int [5]'}} expected-error {{a reduction variable with array type 'const float [5]'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(^ : fl) // expected-error {{variable of type 'float' is not valid for specified reduction operation}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(&& : S2::S2s) // expected-error {{shared variable cannot be reduction}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(&& : S2::S2sc) // expected-error {{const-qualified variable cannot be reduction}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(+ : h, k) // expected-error {{threadprivate or thread local variable cannot be reduction}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(+ : o) // expected-error {{variable of type 'class S6' is not valid for specified reduction operation}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections private(i), reduction(+ : j), reduction(+ : q) // expected-error 4 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel private(k)<br>
+#pragma omp sections reduction(+ : p), reduction(+ : p) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(+ : p), reduction(+ : p) // expected-error 3 {{variable can appear only once in OpenMP 'reduction' clause}} expected-note 3 {{previously referenced here}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(+ : r) // expected-error 2 {{const-qualified variable cannot be reduction}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel shared(i)<br>
+#pragma omp parallel reduction(min : i)<br>
+#pragma omp sections reduction(max : j) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel private(fl) // expected-note 2 {{defined as private}}<br>
+#pragma omp sections reduction(+ : fl) // expected-error 2 {{reduction variable must be shared}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel reduction(* : fl) // expected-note 2 {{defined as reduction}}<br>
+#pragma omp sections reduction(+ : fl) // expected-error 2 {{reduction variable must be shared}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+<br>
+ return T();<br>
+}<br>
+<br>
+int main(int argc, char **argv) {<br>
+ const int d = 5; // expected-note 2 {{'d' defined here}}<br>
+ const int da[5] = {0}; // expected-note {{'da' defined here}}<br>
+ int qa[5] = {0};<br>
+ S4 e(4); // expected-note {{'e' defined here}}<br>
+ S5 g(5); // expected-note {{'g' defined here}}<br>
+ int i;<br>
+ int &j = i; // expected-note 2 {{'j' defined here}}<br>
+ S3 &p = k; // expected-note 2 {{'p' defined here}}<br>
+ const int &r = da[i]; // expected-note {{'r' defined here}}<br>
+ int &q = qa[i]; // expected-note {{'q' defined here}}<br>
+ float fl; // expected-note {{'fl' defined here}}<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction // expected-error {{expected '(' after 'reduction'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp sections' are ignored}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction( // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(- // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction() // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(*) // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(\) // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(foo : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(|| : argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(~ : argc) // expected-error {{expected unqualified-id}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(&& : argc)<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(^ : S1) // expected-error {{'S1' does not refer to a value}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(+ : a, b, c, d, f) // expected-error {{reduction variable with incomplete type 'S1'}} expected-error 2 {{const-qualified variable cannot be reduction}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(min : a, b, c, d, f) // expected-error {{reduction variable with incomplete type 'S1'}} expected-error 2 {{arguments of OpenMP clause 'reduction' for 'min' or 'max' must be of arithmetic type}} expected-error 2 {{const-qualified variable cannot be reduction}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(max : argv[1]) // expected-error {{expected variable name}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(+ : ba) // expected-error {{a reduction variable with array type 'const S2 [5]'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(* : ca) // expected-error {{a reduction variable with array type 'const S3 [5]'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(- : da) // expected-error {{a reduction variable with array type 'const int [5]'}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(^ : fl) // expected-error {{variable of type 'float' is not valid for specified reduction operation}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(&& : S2::S2s) // expected-error {{shared variable cannot be reduction}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(&& : S2::S2sc) // expected-error {{const-qualified variable cannot be reduction}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(& : e, g) // expected-error {{reduction variable must have an accessible, unambiguous default constructor}} expected-error {{variable of type 'S5' is not valid for specified reduction operation}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(+ : h, k) // expected-error {{threadprivate or thread local variable cannot be reduction}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(+ : o) // expected-error {{variable of type 'class S6' is not valid for specified reduction operation}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections private(i), reduction(+ : j), reduction(+ : q) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel private(k)<br>
+#pragma omp sections reduction(+ : p), reduction(+ : p) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(+ : p), reduction(+ : p) // expected-error {{variable can appear only once in OpenMP 'reduction' clause}} expected-note {{previously referenced here}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel<br>
+#pragma omp sections reduction(+ : r) // expected-error {{const-qualified variable cannot be reduction}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel shared(i)<br>
+#pragma omp parallel reduction(min : i)<br>
+#pragma omp sections reduction(max : j) // expected-error {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel private(fl) // expected-note {{defined as private}}<br>
+#pragma omp sections reduction(+ : fl) // expected-error {{reduction variable must be shared}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+#pragma omp parallel reduction(* : fl) // expected-note {{defined as reduction}}<br>
+#pragma omp sections reduction(+ : fl) // expected-error {{reduction variable must be shared}}<br>
+ {<br>
+ foo();<br>
+ }<br>
+<br>
+ return tmain(argc) + tmain(fl); // expected-note {{in instantiation of function template specialization 'tmain<int>' requested here}} expected-note {{in instantiation of function template specialization 'tmain<float>' requested here}}<br>
+}<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_reduction_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_reduction_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/sections_reduction_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Modified: cfe/trunk/tools/libclang/CIndex.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/libclang/CIndex.cpp (original)<br>
+++ cfe/trunk/tools/libclang/CIndex.cpp Wed Jun 25 06:44:49 2014<br>
@@ -1852,6 +1852,7 @@ public:<br>
void VisitOMPParallelDirective(const OMPParallelDirective *D);<br>
void VisitOMPSimdDirective(const OMPSimdDirective *D);<br>
void VisitOMPForDirective(const OMPForDirective *D);<br>
+ void VisitOMPSectionsDirective(const OMPSectionsDirective *D);<br>
<br>
private:<br>
void AddDeclarationNameInfo(const Stmt *S);<br>
@@ -2287,6 +2288,10 @@ void EnqueueVisitor::VisitOMPForDirectiv<br>
VisitOMPExecutableDirective(D);<br>
}<br>
<br>
+void EnqueueVisitor::VisitOMPSectionsDirective(const OMPSectionsDirective *D) {<br>
+ VisitOMPExecutableDirective(D);<br>
+}<br>
+<br>
void CursorVisitor::EnqueueWorkList(VisitorWorkList &WL, const Stmt *S) {<br>
EnqueueVisitor(WL, MakeCXCursor(S, StmtParent, TU,RegionOfInterest)).Visit(S);<br>
}<br>
@@ -3965,6 +3970,8 @@ CXString clang_getCursorKindSpelling(enu<br>
return cxstring::createRef("OMPSimdDirective");<br>
case CXCursor_OMPForDirective:<br>
return cxstring::createRef("OMPForDirective");<br>
+ case CXCursor_OMPSectionsDirective:<br>
+ return cxstring::createRef("OMPSectionsDirective");<br>
}<br>
<br>
llvm_unreachable("Unhandled CXCursorKind");<br>
<br>
Modified: cfe/trunk/tools/libclang/CXCursor.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CXCursor.cpp?rev=211685&r1=211684&r2=211685&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CXCursor.cpp?rev=211685&r1=211684&r2=211685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/libclang/CXCursor.cpp (original)<br>
+++ cfe/trunk/tools/libclang/CXCursor.cpp Wed Jun 25 06:44:49 2014<br>
@@ -522,6 +522,9 @@ CXCursor cxcursor::MakeCXCursor(const St<br>
case Stmt::OMPForDirectiveClass:<br>
K = CXCursor_OMPForDirective;<br>
break;<br>
+ case Stmt::OMPSectionsDirectiveClass:<br>
+ K = CXCursor_OMPSectionsDirective;<br>
+ break;<br>
}<br>
<br>
CXCursor C = { K, 0, { Parent, S, TU } };<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>