<div dir="ltr"><div>I have reviewed this while reviewing: <br><h2 id=":1vi" class="" tabindex="-1">r212516 - [OPENMP] Parsing and sema analysis for 'omp parallel sections' directive.</h2><span id=":1vj" class=""><table class="" cellpadding="0">
<tbody><tr class=""><td class="" style="background-color:rgb(221,221,221);color:rgb(102,102,102)"><br></td><td class="" 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.<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Jul 7, 2014 at 9:01 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: Mon Jul 7 08:01:15 2014<br>
New Revision: 212453<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=212453&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=212453&view=rev</a><br>
Log:<br>
[OPENMP] Added initial support for 'omp parallel for'.<br>
<br>
Added:<br>
cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_collapse_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_default_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_if_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_loop_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_misc_messages.c (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_num_threads_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_proc_bind_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp (with props)<br>
cfe/trunk/test/OpenMP/parallel_for_schedule_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/OpenMPKinds.h<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/for_firstprivate_messages.cpp<br>
cfe/trunk/test/OpenMP/for_loop_messages.cpp<br>
cfe/trunk/test/OpenMP/nesting_of_regions.cpp<br>
cfe/trunk/test/OpenMP/simd_lastprivate_messages.cpp<br>
cfe/trunk/test/OpenMP/simd_loop_messages.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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang-c/Index.h?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang-c/Index.h (original)<br>
+++ cfe/trunk/include/clang-c/Index.h Mon Jul 7 08:01:15 2014<br>
@@ -2155,9 +2155,13 @@ enum CXCursorKind {<br>
*/<br>
CXCursor_OMPSingleDirective = 237,<br>
<br>
+ /** \brief OpenMP parallel for directive.<br>
+ */<br>
+ CXCursor_OMPParallelForDirective = 238,<br>
+<br>
/** \brief Windows Structured Exception Handling's leave statement.<br>
*/<br>
- CXCursor_SEHLeaveStmt = 238,<br>
+ CXCursor_SEHLeaveStmt = 239,<br>
<br>
CXCursor_LastStmt = CXCursor_SEHLeaveStmt,<br>
<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h (original)<br>
+++ cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h Mon Jul 7 08:01:15 2014<br>
@@ -2311,6 +2311,11 @@ DEF_TRAVERSE_STMT(OMPSingleDirective, {<br>
return false;<br>
})<br>
<br>
+DEF_TRAVERSE_STMT(OMPParallelForDirective, {<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/RecursiveASTVisitor.h?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/RecursiveASTVisitor.h (original)<br>
+++ cfe/trunk/include/clang/AST/RecursiveASTVisitor.h Mon Jul 7 08:01:15 2014<br>
@@ -2333,6 +2333,11 @@ DEF_TRAVERSE_STMT(OMPSingleDirective, {<br>
return false;<br>
})<br>
<br>
+DEF_TRAVERSE_STMT(OMPParallelForDirective, {<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/StmtOpenMP.h?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/StmtOpenMP.h (original)<br>
+++ cfe/trunk/include/clang/AST/StmtOpenMP.h Mon Jul 7 08:01:15 2014<br>
@@ -527,6 +527,78 @@ public:<br>
}<br>
};<br>
<br>
+/// \brief This represents '#pragma omp parallel for' directive.<br>
+///<br>
+/// \code<br>
+/// #pragma omp parallel for private(a,b) reduction(+:c,d)<br>
+/// \endcode<br>
+/// In this example directive '#pragma omp parallel for' has clauses 'private'<br>
+/// with the variables 'a' and 'b' and 'reduction' with operator '+' and<br>
+/// variables 'c' and 'd'.<br>
+///<br>
+class OMPParallelForDirective : public OMPExecutableDirective {<br>
+ friend class ASTStmtReader;<br>
+ /// \brief Number of collapsed loops as specified by 'collapse' clause.<br>
+ unsigned CollapsedNum;<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 CollapsedNum Number of collapsed nested loops.<br>
+ /// \param NumClauses Number of clauses.<br>
+ ///<br>
+ OMPParallelForDirective(SourceLocation StartLoc, SourceLocation EndLoc,<br>
+ unsigned CollapsedNum, unsigned NumClauses)<br>
+ : OMPExecutableDirective(this, OMPParallelForDirectiveClass,<br>
+ OMPD_parallel_for, StartLoc, EndLoc, NumClauses,<br>
+ 1),<br>
+ CollapsedNum(CollapsedNum) {}<br>
+<br>
+ /// \brief Build an empty directive.<br>
+ ///<br>
+ /// \param CollapsedNum Number of collapsed nested loops.<br>
+ /// \param NumClauses Number of clauses.<br>
+ ///<br>
+ explicit OMPParallelForDirective(unsigned CollapsedNum, unsigned NumClauses)<br>
+ : OMPExecutableDirective(this, OMPParallelForDirectiveClass,<br>
+ OMPD_parallel_for, SourceLocation(),<br>
+ SourceLocation(), NumClauses, 1),<br>
+ CollapsedNum(CollapsedNum) {}<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 CollapsedNum Number of collapsed loops.<br>
+ /// \param Clauses List of clauses.<br>
+ /// \param AssociatedStmt Statement, associated with the directive.<br>
+ ///<br>
+ static OMPParallelForDirective *<br>
+ Create(const ASTContext &C, SourceLocation StartLoc, SourceLocation EndLoc,<br>
+ unsigned CollapsedNum, ArrayRef<OMPClause *> Clauses,<br>
+ Stmt *AssociatedStmt);<br>
+<br>
+ /// \brief Creates an empty directive with the place<br>
+ /// for \a NumClauses clauses.<br>
+ ///<br>
+ /// \param C AST context.<br>
+ /// \param CollapsedNum Number of collapsed nested loops.<br>
+ /// \param NumClauses Number of clauses.<br>
+ ///<br>
+ static OMPParallelForDirective *CreateEmpty(const ASTContext &C,<br>
+ unsigned NumClauses,<br>
+ unsigned CollapsedNum,<br>
+ EmptyShell);<br>
+<br>
+ unsigned getCollapsedNumber() const { return CollapsedNum; }<br>
+<br>
+ static bool classof(const Stmt *T) {<br>
+ return T->getStmtClass() == OMPParallelForDirectiveClass;<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Mon Jul 7 08:01:15 2014<br>
@@ -7036,7 +7036,7 @@ def note_omp_predetermined_dsa : Note<<br>
def note_omp_implicit_dsa : Note<<br>
"implicitly determined as %0">;<br>
def err_omp_loop_var_dsa : Error<<br>
- "loop iteration variable may not be %0">;<br>
+ "loop iteration variable in the associated loop of 'omp %1' directive may not be %0, predetermined as %2">;<br>
def err_omp_not_for : Error<<br>
"%select{statement after '#pragma omp %1' must be a for loop|"<br>
"expected %2 for loops after '#pragma omp %1'%select{|, but found only %4}3}0">;<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.def?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/OpenMPKinds.def (original)<br>
+++ cfe/trunk/include/clang/Basic/OpenMPKinds.def Mon Jul 7 08:01:15 2014<br>
@@ -15,6 +15,9 @@<br>
#ifndef OPENMP_DIRECTIVE<br>
# define OPENMP_DIRECTIVE(Name)<br>
#endif<br>
+#ifndef OPENMP_DIRECTIVE_EXT<br>
+#define OPENMP_DIRECTIVE_EXT(Name, Str)<br>
+#endif<br>
#ifndef OPENMP_CLAUSE<br>
# define OPENMP_CLAUSE(Name, Class)<br>
#endif<br>
@@ -33,6 +36,9 @@<br>
#ifndef OPENMP_SINGLE_CLAUSE<br>
# define OPENMP_SINGLE_CLAUSE(Name)<br>
#endif<br>
+#ifndef OPENMP_PARALLEL_FOR_CLAUSE<br>
+# define OPENMP_PARALLEL_FOR_CLAUSE(Name)<br>
+#endif<br>
#ifndef OPENMP_DEFAULT_KIND<br>
# define OPENMP_DEFAULT_KIND(Name)<br>
#endif<br>
@@ -52,6 +58,7 @@ OPENMP_DIRECTIVE(for)<br>
OPENMP_DIRECTIVE(sections)<br>
OPENMP_DIRECTIVE(section)<br>
OPENMP_DIRECTIVE(single)<br>
+OPENMP_DIRECTIVE_EXT(parallel_for, "parallel for")<br>
<br>
// OpenMP clauses.<br>
OPENMP_CLAUSE(if, OMPIfClause)<br>
@@ -131,14 +138,31 @@ OPENMP_SCHEDULE_KIND(guided)<br>
OPENMP_SCHEDULE_KIND(auto)<br>
OPENMP_SCHEDULE_KIND(runtime)<br>
<br>
+// Clauses allowed for OpenMP directive 'parallel for'.<br>
+OPENMP_PARALLEL_FOR_CLAUSE(if)<br>
+OPENMP_PARALLEL_FOR_CLAUSE(num_threads)<br>
+OPENMP_PARALLEL_FOR_CLAUSE(default)<br>
+OPENMP_PARALLEL_FOR_CLAUSE(proc_bind)<br>
+OPENMP_PARALLEL_FOR_CLAUSE(private)<br>
+OPENMP_PARALLEL_FOR_CLAUSE(firstprivate)<br>
+OPENMP_PARALLEL_FOR_CLAUSE(shared)<br>
+OPENMP_PARALLEL_FOR_CLAUSE(reduction)<br>
+OPENMP_PARALLEL_FOR_CLAUSE(copyin)<br>
+OPENMP_PARALLEL_FOR_CLAUSE(lastprivate)<br>
+OPENMP_PARALLEL_FOR_CLAUSE(collapse)<br>
+OPENMP_PARALLEL_FOR_CLAUSE(schedule)<br>
+OPENMP_PARALLEL_FOR_CLAUSE(ordered)<br>
+<br>
#undef OPENMP_SCHEDULE_KIND<br>
#undef OPENMP_PROC_BIND_KIND<br>
#undef OPENMP_DEFAULT_KIND<br>
#undef OPENMP_DIRECTIVE<br>
+#undef OPENMP_DIRECTIVE_EXT<br>
#undef OPENMP_CLAUSE<br>
#undef OPENMP_SINGLE_CLAUSE<br>
#undef OPENMP_SECTIONS_CLAUSE<br>
#undef OPENMP_PARALLEL_CLAUSE<br>
+#undef OPENMP_PARALLEL_FOR_CLAUSE<br>
#undef OPENMP_SIMD_CLAUSE<br>
#undef OPENMP_FOR_CLAUSE<br>
<br>
<br>
Modified: cfe/trunk/include/clang/Basic/OpenMPKinds.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.h?rev=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.h?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/OpenMPKinds.h (original)<br>
+++ cfe/trunk/include/clang/Basic/OpenMPKinds.h Mon Jul 7 08:01:15 2014<br>
@@ -23,6 +23,8 @@ namespace clang {<br>
enum OpenMPDirectiveKind {<br>
#define OPENMP_DIRECTIVE(Name) \<br>
OMPD_##Name,<br>
+#define OPENMP_DIRECTIVE_EXT(Name, Str) \<br>
+ OMPD_##Name,<br>
#include "clang/Basic/OpenMPKinds.def"<br>
OMPD_unknown<br>
};<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/StmtNodes.td?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/StmtNodes.td (original)<br>
+++ cfe/trunk/include/clang/Basic/StmtNodes.td Mon Jul 7 08:01:15 2014<br>
@@ -184,3 +184,4 @@ def OMPForDirective : DStmt<OMPExecutabl<br>
def OMPSectionsDirective : DStmt<OMPExecutableDirective>;<br>
def OMPSectionDirective : DStmt<OMPExecutableDirective>;<br>
def OMPSingleDirective : DStmt<OMPExecutableDirective>;<br>
+def OMPParallelForDirective : 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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Sema/Sema.h (original)<br>
+++ cfe/trunk/include/clang/Sema/Sema.h Mon Jul 7 08:01:15 2014<br>
@@ -7312,15 +7312,16 @@ public:<br>
SourceLocation EndLoc);<br>
/// \brief Called on well-formed '\#pragma omp simd' after parsing<br>
/// of the associated statement.<br>
- StmtResult ActOnOpenMPSimdDirective(ArrayRef<OMPClause *> Clauses,<br>
- Stmt *AStmt,<br>
- SourceLocation StartLoc,<br>
- SourceLocation EndLoc);<br>
+ StmtResult ActOnOpenMPSimdDirective(<br>
+ ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,<br>
+ SourceLocation EndLoc,<br>
+ llvm::DenseMap<VarDecl *, Expr *> &VarsWithImplicitDSA);<br>
/// \brief Called on well-formed '\#pragma omp for' after parsing<br>
/// of the associated statement.<br>
- StmtResult ActOnOpenMPForDirective(ArrayRef<OMPClause *> Clauses, Stmt *AStmt,<br>
- SourceLocation StartLoc,<br>
- SourceLocation EndLoc);<br>
+ StmtResult ActOnOpenMPForDirective(<br>
+ ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,<br>
+ SourceLocation EndLoc,<br>
+ llvm::DenseMap<VarDecl *, Expr *> &VarsWithImplicitDSA);<br>
/// \brief Called on well-formed '\#pragma omp sections' after parsing<br>
/// of the associated statement.<br>
StmtResult ActOnOpenMPSectionsDirective(ArrayRef<OMPClause *> Clauses,<br>
@@ -7335,6 +7336,12 @@ public:<br>
StmtResult ActOnOpenMPSingleDirective(ArrayRef<OMPClause *> Clauses,<br>
Stmt *AStmt, SourceLocation StartLoc,<br>
SourceLocation EndLoc);<br>
+ /// \brief Called on well-formed '\#pragma omp parallel for' after parsing<br>
+ /// of the associated statement.<br>
+ StmtResult ActOnOpenMPParallelForDirective(<br>
+ ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,<br>
+ SourceLocation EndLoc,<br>
+ llvm::DenseMap<VarDecl *, Expr *> &VarsWithImplicitDSA);<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTBitCodes.h?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Serialization/ASTBitCodes.h (original)<br>
+++ cfe/trunk/include/clang/Serialization/ASTBitCodes.h Mon Jul 7 08:01:15 2014<br>
@@ -1346,6 +1346,7 @@ namespace clang {<br>
STMT_OMP_SECTIONS_DIRECTIVE,<br>
STMT_OMP_SECTION_DIRECTIVE,<br>
STMT_OMP_SINGLE_DIRECTIVE,<br>
+ STMT_OMP_PARALLEL_FOR_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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Stmt.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/Stmt.cpp (original)<br>
+++ cfe/trunk/lib/AST/Stmt.cpp Mon Jul 7 08:01:15 2014<br>
@@ -1478,3 +1478,29 @@ OMPSingleDirective *OMPSingleDirective::<br>
return new (Mem) OMPSingleDirective(NumClauses);<br>
}<br>
<br>
+OMPParallelForDirective *<br>
+OMPParallelForDirective::Create(const ASTContext &C, SourceLocation StartLoc,<br>
+ SourceLocation EndLoc, unsigned CollapsedNum,<br>
+ ArrayRef<OMPClause *> Clauses,<br>
+ Stmt *AssociatedStmt) {<br>
+ unsigned Size = llvm::RoundUpToAlignment(sizeof(OMPParallelForDirective),<br>
+ llvm::alignOf<OMPClause *>());<br>
+ void *Mem =<br>
+ C.Allocate(Size + sizeof(OMPClause *) * Clauses.size() + sizeof(Stmt *));<br>
+ OMPParallelForDirective *Dir = new (Mem)<br>
+ OMPParallelForDirective(StartLoc, EndLoc, CollapsedNum, Clauses.size());<br>
+ Dir->setClauses(Clauses);<br>
+ Dir->setAssociatedStmt(AssociatedStmt);<br>
+ return Dir;<br>
+}<br>
+<br>
+OMPParallelForDirective *<br>
+OMPParallelForDirective::CreateEmpty(const ASTContext &C, unsigned NumClauses,<br>
+ unsigned CollapsedNum, EmptyShell) {<br>
+ unsigned Size = llvm::RoundUpToAlignment(sizeof(OMPParallelForDirective),<br>
+ llvm::alignOf<OMPClause *>());<br>
+ void *Mem =<br>
+ C.Allocate(Size + sizeof(OMPClause *) * NumClauses + sizeof(Stmt *));<br>
+ return new (Mem) OMPParallelForDirective(CollapsedNum, 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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtPrinter.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/StmtPrinter.cpp (original)<br>
+++ cfe/trunk/lib/AST/StmtPrinter.cpp Mon Jul 7 08:01:15 2014<br>
@@ -815,6 +815,11 @@ void StmtPrinter::VisitOMPSingleDirectiv<br>
PrintOMPExecutableDirective(Node);<br>
}<br>
<br>
+void StmtPrinter::VisitOMPParallelForDirective(OMPParallelForDirective *Node) {<br>
+ Indent() << "#pragma omp parallel for ";<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtProfile.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/StmtProfile.cpp (original)<br>
+++ cfe/trunk/lib/AST/StmtProfile.cpp Mon Jul 7 08:01:15 2014<br>
@@ -380,6 +380,11 @@ void StmtProfiler::VisitOMPSingleDirecti<br>
VisitOMPExecutableDirective(S);<br>
}<br>
<br>
+void<br>
+StmtProfiler::VisitOMPParallelForDirective(const OMPParallelForDirective *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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/OpenMPKinds.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Basic/OpenMPKinds.cpp (original)<br>
+++ cfe/trunk/lib/Basic/OpenMPKinds.cpp Mon Jul 7 08:01:15 2014<br>
@@ -23,6 +23,7 @@ using namespace clang;<br>
OpenMPDirectiveKind clang::getOpenMPDirectiveKind(StringRef Str) {<br>
return llvm::StringSwitch<OpenMPDirectiveKind>(Str)<br>
#define OPENMP_DIRECTIVE(Name) .Case(#Name, OMPD_##Name)<br>
+#define OPENMP_DIRECTIVE_EXT(Name, Str) .Case(Str, OMPD_##Name)<br>
#include "clang/Basic/OpenMPKinds.def"<br>
.Default(OMPD_unknown);<br>
}<br>
@@ -35,6 +36,9 @@ const char *clang::getOpenMPDirectiveNam<br>
#define OPENMP_DIRECTIVE(Name) \<br>
case OMPD_##Name: \<br>
return #Name;<br>
+#define OPENMP_DIRECTIVE_EXT(Name, Str) \<br>
+ case OMPD_##Name: \<br>
+ return Str;<br>
#include "clang/Basic/OpenMPKinds.def"<br>
break;<br>
}<br>
@@ -213,6 +217,16 @@ bool clang::isAllowedClauseForDirective(<br>
break;<br>
}<br>
break;<br>
+ case OMPD_parallel_for:<br>
+ switch (CKind) {<br>
+#define OPENMP_PARALLEL_FOR_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>
@@ -223,16 +237,19 @@ bool clang::isAllowedClauseForDirective(<br>
}<br>
<br>
bool clang::isOpenMPLoopDirective(OpenMPDirectiveKind DKind) {<br>
- return DKind == OMPD_simd || DKind == OMPD_for; // TODO add next directives.<br>
+ return DKind == OMPD_simd || DKind == OMPD_for ||<br>
+ DKind == OMPD_parallel_for; // TODO add next directives.<br>
}<br>
<br>
bool clang::isOpenMPWorksharingDirective(OpenMPDirectiveKind DKind) {<br>
return DKind == OMPD_for || DKind == OMPD_sections || DKind == OMPD_section ||<br>
- DKind == OMPD_single; // TODO add next directives.<br>
+ DKind == OMPD_single ||<br>
+ DKind == OMPD_parallel_for; // TODO add next directives.<br>
}<br>
<br>
bool clang::isOpenMPParallelDirective(OpenMPDirectiveKind DKind) {<br>
- return DKind == OMPD_parallel; // TODO add next directives.<br>
+ return DKind == OMPD_parallel ||<br>
+ DKind == OMPD_parallel_for; // TODO add next directives.<br>
}<br>
<br>
bool clang::isOpenMPSimdDirective(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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmt.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGStmt.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGStmt.cpp Mon Jul 7 08:01:15 2014<br>
@@ -194,6 +194,9 @@ void CodeGenFunction::EmitStmt(const Stm<br>
case Stmt::OMPSingleDirectiveClass:<br>
EmitOMPSingleDirective(cast<OMPSingleDirective>(*S));<br>
break;<br>
+ case Stmt::OMPParallelForDirectiveClass:<br>
+ EmitOMPParallelForDirective(cast<OMPParallelForDirective>(*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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp Mon Jul 7 08:01:15 2014<br>
@@ -90,3 +90,8 @@ void CodeGenFunction::EmitOMPSingleDirec<br>
llvm_unreachable("CodeGen for 'omp single' is not supported yet.");<br>
}<br>
<br>
+void<br>
+CodeGenFunction::EmitOMPParallelForDirective(const OMPParallelForDirective &) {<br>
+ llvm_unreachable("CodeGen for 'omp parallel for' 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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)<br>
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Mon Jul 7 08:01:15 2014<br>
@@ -1903,6 +1903,7 @@ public:<br>
void EmitOMPSectionsDirective(const OMPSectionsDirective &S);<br>
void EmitOMPSectionDirective(const OMPSectionDirective &S);<br>
void EmitOMPSingleDirective(const OMPSingleDirective &S);<br>
+ void EmitOMPParallelForDirective(const OMPParallelForDirective &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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseOpenMP.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Parse/ParseOpenMP.cpp (original)<br>
+++ cfe/trunk/lib/Parse/ParseOpenMP.cpp Mon Jul 7 08:01:15 2014<br>
@@ -25,6 +25,26 @@ using namespace clang;<br>
// OpenMP declarative directives.<br>
//===----------------------------------------------------------------------===//<br>
<br>
+static OpenMPDirectiveKind ParseOpenMPDirectiveKind(Parser &P) {<br>
+ auto Tok = P.getCurToken();<br>
+ auto DKind =<br>
+ Tok.isAnnotation()<br>
+ ? OMPD_unknown<br>
+ : getOpenMPDirectiveKind(P.getPreprocessor().getSpelling(Tok));<br>
+ if (DKind == OMPD_parallel) {<br>
+ Tok = P.getPreprocessor().LookAhead(0);<br>
+ auto SDKind =<br>
+ Tok.isAnnotation()<br>
+ ? OMPD_unknown<br>
+ : getOpenMPDirectiveKind(P.getPreprocessor().getSpelling(Tok));<br>
+ if (SDKind == OMPD_for) {<br>
+ P.ConsumeToken();<br>
+ DKind = OMPD_parallel_for;<br>
+ }<br>
+ }<br>
+ return DKind;<br>
+}<br>
+<br>
/// \brief Parsing of declarative OpenMP directives.<br>
///<br>
/// threadprivate-directive:<br>
@@ -36,9 +56,7 @@ Parser::DeclGroupPtrTy Parser::ParseOpen<br>
<br>
SourceLocation Loc = ConsumeToken();<br>
SmallVector<Expr *, 5> Identifiers;<br>
- OpenMPDirectiveKind DKind = Tok.isAnnotation()<br>
- ? OMPD_unknown<br>
- : getOpenMPDirectiveKind(PP.getSpelling(Tok));<br>
+ auto DKind = ParseOpenMPDirectiveKind(*this);<br>
<br>
switch (DKind) {<br>
case OMPD_threadprivate:<br>
@@ -66,6 +84,7 @@ Parser::DeclGroupPtrTy Parser::ParseOpen<br>
case OMPD_sections:<br>
case OMPD_section:<br>
case OMPD_single:<br>
+ case OMPD_parallel_for:<br>
Diag(Tok, diag::err_omp_unexpected_directive)<br>
<< getOpenMPDirectiveName(DKind);<br>
break;<br>
@@ -82,7 +101,7 @@ Parser::DeclGroupPtrTy Parser::ParseOpen<br>
///<br>
/// executable-directive:<br>
/// annot_pragma_openmp 'parallel' | 'simd' | 'for' | 'sections' |<br>
-/// 'section' | 'single' {clause} annot_pragma_openmp_end<br>
+/// 'section' | 'single' | 'parallel for' {clause} annot_pragma_openmp_end<br>
///<br>
StmtResult Parser::ParseOpenMPDeclarativeOrExecutableDirective() {<br>
assert(Tok.is(tok::annot_pragma_openmp) && "Not an OpenMP directive!");<br>
@@ -94,9 +113,7 @@ StmtResult Parser::ParseOpenMPDeclarativ<br>
unsigned ScopeFlags =<br>
Scope::FnScope | Scope::DeclScope | Scope::OpenMPDirectiveScope;<br>
SourceLocation Loc = ConsumeToken(), EndLoc;<br>
- OpenMPDirectiveKind DKind = Tok.isAnnotation()<br>
- ? OMPD_unknown<br>
- : getOpenMPDirectiveKind(PP.getSpelling(Tok));<br>
+ auto DKind = ParseOpenMPDirectiveKind(*this);<br>
// Name of critical directive.<br>
DeclarationNameInfo DirName;<br>
StmtResult Directive = StmtError();<br>
@@ -123,7 +140,8 @@ StmtResult Parser::ParseOpenMPDeclarativ<br>
case OMPD_for:<br>
case OMPD_sections:<br>
case OMPD_single:<br>
- case OMPD_section: {<br>
+ case OMPD_section:<br>
+ case OMPD_parallel_for: {<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Mon Jul 7 08:01:15 2014<br>
@@ -835,6 +835,7 @@ class DSAAttrChecker : public StmtVisito<br>
bool ErrorFound;<br>
CapturedStmt *CS;<br>
llvm::SmallVector<Expr *, 8> ImplicitFirstprivate;<br>
+ llvm::DenseMap<VarDecl *, Expr *> VarsWithInheritedDSA;<br>
<br>
public:<br>
void VisitDeclRefExpr(DeclRefExpr *E) {<br>
@@ -858,9 +859,9 @@ public:<br>
// attribute, must have its data-sharing attribute explicitly determined<br>
// by being listed in a data-sharing attribute clause.<br>
if (DVar.CKind == OMPC_unknown && Stack->getDefaultDSA() == DSA_none &&<br>
- (isOpenMPParallelDirective(DKind) || DKind == OMPD_task)) {<br>
- ErrorFound = true;<br>
- SemaRef.Diag(ELoc, diag::err_omp_no_dsa_for_variable) << VD;<br>
+ (isOpenMPParallelDirective(DKind) || DKind == OMPD_task) &&<br>
+ VarsWithInheritedDSA.count(VD) == 0) {<br>
+ VarsWithInheritedDSA[VD] = E;<br>
return;<br>
}<br>
<br>
@@ -900,6 +901,9 @@ public:<br>
<br>
bool isErrorFound() { return ErrorFound; }<br>
ArrayRef<Expr *> getImplicitFirstprivate() { return ImplicitFirstprivate; }<br>
+ llvm::DenseMap<VarDecl *, Expr *> &getVarsWithInheritedDSA() {<br>
+ return VarsWithInheritedDSA;<br>
+ }<br>
<br>
DSAAttrChecker(DSAStackTy *S, Sema &SemaRef, CapturedStmt *CS)<br>
: Stack(S), SemaRef(SemaRef), ErrorFound(false), CS(CS) {}<br>
@@ -960,6 +964,18 @@ void Sema::ActOnOpenMPRegionStart(OpenMP<br>
Params);<br>
break;<br>
}<br>
+ case OMPD_parallel_for: {<br>
+ QualType KmpInt32Ty = Context.getIntTypeForBitwidth(32, 1);<br>
+ QualType KmpInt32PtrTy = Context.getPointerType(KmpInt32Ty);<br>
+ Sema::CapturedParamNameType Params[] = {<br>
+ std::make_pair(".global_tid.", KmpInt32PtrTy),<br>
+ std::make_pair(".bound_tid.", KmpInt32PtrTy),<br>
+ std::make_pair(StringRef(), QualType()) // __context with shared vars<br>
+ };<br>
+ ActOnCapturedRegionStart(DSAStack->getConstructLoc(), CurScope, CR_OpenMP,<br>
+ Params);<br>
+ break;<br>
+ }<br>
case OMPD_threadprivate:<br>
case OMPD_task:<br>
llvm_unreachable("OpenMP Directive is not allowed");<br>
@@ -981,6 +997,7 @@ bool CheckNestingOfRegions(Sema &SemaRef<br>
// | parallel | sections | * |<br>
// | parallel | section | + |<br>
// | parallel | single | * |<br>
+ // | parallel | parallel for | * |<br>
// +------------------+-----------------+------------------------------------+<br>
// | for | parallel | * |<br>
// | for | for | + |<br>
@@ -988,6 +1005,7 @@ bool CheckNestingOfRegions(Sema &SemaRef<br>
// | for | sections | + |<br>
// | for | section | + |<br>
// | for | single | + |<br>
+ // | for | parallel for | * |<br>
// +------------------+-----------------+------------------------------------+<br>
// | simd | parallel | |<br>
// | simd | for | |<br>
@@ -995,6 +1013,7 @@ bool CheckNestingOfRegions(Sema &SemaRef<br>
// | simd | sections | |<br>
// | simd | section | |<br>
// | simd | single | |<br>
+ // | simd | parallel for | |<br>
// +------------------+-----------------+------------------------------------+<br>
// | sections | parallel | * |<br>
// | sections | for | + |<br>
@@ -1002,6 +1021,7 @@ bool CheckNestingOfRegions(Sema &SemaRef<br>
// | sections | sections | + |<br>
// | sections | section | * |<br>
// | sections | single | + |<br>
+ // | sections | parallel for | * |<br>
// +------------------+-----------------+------------------------------------+<br>
// | section | parallel | * |<br>
// | section | for | + |<br>
@@ -1009,6 +1029,7 @@ bool CheckNestingOfRegions(Sema &SemaRef<br>
// | section | sections | + |<br>
// | section | section | + |<br>
// | section | single | + |<br>
+ // | section | parallel for | * |<br>
// +------------------+-----------------+------------------------------------+<br>
// | single | parallel | * |<br>
// | single | for | + |<br>
@@ -1016,6 +1037,15 @@ bool CheckNestingOfRegions(Sema &SemaRef<br>
// | single | sections | + |<br>
// | single | section | + |<br>
// | single | single | + |<br>
+ // | single | parallel for | * |<br>
+ // +------------------+-----------------+------------------------------------+<br>
+ // | parallel for | parallel | * |<br>
+ // | parallel for | for | + |<br>
+ // | parallel for | simd | * |<br>
+ // | parallel for | sections | + |<br>
+ // | parallel for | section | + |<br>
+ // | parallel for | single | + |<br>
+ // | parallel for | parallel for | * |<br>
// +------------------+-----------------+------------------------------------+<br>
if (Stack->getCurScope()) {<br>
auto ParentRegion = Stack->getParentDirective();<br>
@@ -1079,6 +1109,7 @@ StmtResult Sema::ActOnOpenMPExecutableDi<br>
if (DSAChecker.isErrorFound())<br>
return StmtError();<br>
// Generate list of implicitly defined firstprivate variables.<br>
+ auto &VarsWithInheritedDSA = DSAChecker.getVarsWithInheritedDSA();<br>
llvm::SmallVector<OMPClause *, 8> ClausesWithImplicit;<br>
ClausesWithImplicit.append(Clauses.begin(), Clauses.end());<br>
<br>
@@ -1100,11 +1131,12 @@ StmtResult Sema::ActOnOpenMPExecutableDi<br>
EndLoc);<br>
break;<br>
case OMPD_simd:<br>
- Res =<br>
- ActOnOpenMPSimdDirective(ClausesWithImplicit, AStmt, StartLoc, EndLoc);<br>
+ Res = ActOnOpenMPSimdDirective(ClausesWithImplicit, AStmt, StartLoc, EndLoc,<br>
+ VarsWithInheritedDSA);<br>
break;<br>
case OMPD_for:<br>
- Res = ActOnOpenMPForDirective(ClausesWithImplicit, AStmt, StartLoc, EndLoc);<br>
+ Res = ActOnOpenMPForDirective(ClausesWithImplicit, AStmt, StartLoc, EndLoc,<br>
+ VarsWithInheritedDSA);<br>
break;<br>
case OMPD_sections:<br>
Res = ActOnOpenMPSectionsDirective(ClausesWithImplicit, AStmt, StartLoc,<br>
@@ -1119,6 +1151,10 @@ StmtResult Sema::ActOnOpenMPExecutableDi<br>
Res = ActOnOpenMPSingleDirective(ClausesWithImplicit, AStmt, StartLoc,<br>
EndLoc);<br>
break;<br>
+ case OMPD_parallel_for:<br>
+ Res = ActOnOpenMPParallelForDirective(ClausesWithImplicit, AStmt, StartLoc,<br>
+ EndLoc, VarsWithInheritedDSA);<br>
+ break;<br>
case OMPD_threadprivate:<br>
case OMPD_task:<br>
llvm_unreachable("OpenMP Directive is not allowed");<br>
@@ -1126,6 +1162,13 @@ StmtResult Sema::ActOnOpenMPExecutableDi<br>
llvm_unreachable("Unknown OpenMP directive");<br>
}<br>
<br>
+ for (auto P : VarsWithInheritedDSA) {<br>
+ Diag(P.second->getExprLoc(), diag::err_omp_no_dsa_for_variable)<br>
+ << P.first << P.second->getSourceRange();<br>
+ }<br>
+ if (!VarsWithInheritedDSA.empty())<br>
+ return StmtError();<br>
+<br>
if (ErrorFound)<br>
return StmtError();<br>
return Res;<br>
@@ -1512,11 +1555,11 @@ bool OpenMPIterationSpaceChecker::CheckI<br>
<br>
/// \brief Called on a for stmt to check and extract its iteration space<br>
/// for further processing (such as collapsing).<br>
-static bool CheckOpenMPIterationSpace(OpenMPDirectiveKind DKind, Stmt *S,<br>
- Sema &SemaRef, DSAStackTy &DSA,<br>
- unsigned CurrentNestedLoopCount,<br>
- unsigned NestedLoopCount,<br>
- Expr *NestedLoopCountExpr) {<br>
+static bool CheckOpenMPIterationSpace(<br>
+ OpenMPDirectiveKind DKind, Stmt *S, Sema &SemaRef, DSAStackTy &DSA,<br>
+ unsigned CurrentNestedLoopCount, unsigned NestedLoopCount,<br>
+ Expr *NestedLoopCountExpr,<br>
+ llvm::DenseMap<VarDecl *, Expr *> &VarsWithImplicitDSA) {<br>
// OpenMP [2.6, Canonical Loop Form]<br>
// for (init-expr; test-expr; incr-expr) structured-block<br>
auto For = dyn_cast_or_null<ForStmt>(S);<br>
@@ -1560,6 +1603,18 @@ static bool CheckOpenMPIterationSpace(Op<br>
HasErrors = true;<br>
}<br>
<br>
+ // OpenMP, 2.14.1.1 Data-sharing Attribute Rules for Variables Referenced in a<br>
+ // Construct<br>
+ // The loop iteration variable(s) in the associated for-loop(s) of a for or<br>
+ // parallel for construct is (are) private.<br>
+ // The loop iteration variable in the associated for-loop of a simd construct<br>
+ // with just one associated for-loop is linear with a constant-linear-step<br>
+ // that is the increment of the associated for-loop.<br>
+ // Exclude loop var from the list of variables with implicitly defined data<br>
+ // sharing attributes.<br>
+ while (VarsWithImplicitDSA.count(Var) > 0)<br>
+ VarsWithImplicitDSA.erase(Var);<br>
+<br>
// OpenMP [2.14.1.1, Data-sharing Attribute Rules for Variables Referenced in<br>
// a Construct, C/C++].<br>
// The loop iteration variable in the associated for-loop of a simd construct<br>
@@ -1568,18 +1623,25 @@ static bool CheckOpenMPIterationSpace(Op<br>
// The loop iteration variable(s) in the associated for-loop(s) of a for or<br>
// parallel for construct may be listed in a private or lastprivate clause.<br>
DSAStackTy::DSAVarData DVar = DSA.getTopDSA(Var);<br>
+ auto PredeterminedCKind =<br>
+ isOpenMPSimdDirective(DKind)<br>
+ ? ((NestedLoopCount == 1) ? OMPC_linear : OMPC_lastprivate)<br>
+ : OMPC_private;<br>
if (((isOpenMPSimdDirective(DKind) && DVar.CKind != OMPC_unknown &&<br>
- DVar.CKind != OMPC_linear && DVar.CKind != OMPC_lastprivate) ||<br>
+ DVar.CKind != PredeterminedCKind) ||<br>
(isOpenMPWorksharingDirective(DKind) && DVar.CKind != OMPC_unknown &&<br>
DVar.CKind != OMPC_private && DVar.CKind != OMPC_lastprivate)) &&<br>
(DVar.CKind != OMPC_private || DVar.RefExpr != nullptr)) {<br>
SemaRef.Diag(Init->getLocStart(), diag::err_omp_loop_var_dsa)<br>
- << getOpenMPClauseName(DVar.CKind);<br>
+ << getOpenMPClauseName(DVar.CKind) << getOpenMPDirectiveName(DKind)<br>
+ << getOpenMPClauseName(PredeterminedCKind);<br>
ReportOriginalDSA(SemaRef, &DSA, Var, DVar, true);<br>
HasErrors = true;<br>
} else {<br>
- // Make the loop iteration variable private by default.<br>
- DSA.addDSA(Var, nullptr, OMPC_private);<br>
+ // Make the loop iteration variable private (for worksharing constructs),<br>
+ // linear (for simd directives with the only one associated loop) or<br>
+ // lastprivate (for simd directives with several collapsed loops).<br>
+ DSA.addDSA(Var, nullptr, PredeterminedCKind);<br>
}<br>
<br>
assert(isOpenMPLoopDirective(DKind) && "DSA for non-loop vars");<br>
@@ -1624,9 +1686,10 @@ static Stmt *IgnoreContainerStmts(Stmt *<br>
/// \brief Called on a for stmt to check itself and nested loops (if any).<br>
/// \return Returns 0 if one of the collapsed stmts is not canonical for loop,<br>
/// number of collapsed loops otherwise.<br>
-static unsigned CheckOpenMPLoop(OpenMPDirectiveKind DKind,<br>
- Expr *NestedLoopCountExpr, Stmt *AStmt,<br>
- Sema &SemaRef, DSAStackTy &DSA) {<br>
+static unsigned<br>
+CheckOpenMPLoop(OpenMPDirectiveKind DKind, Expr *NestedLoopCountExpr,<br>
+ Stmt *AStmt, Sema &SemaRef, DSAStackTy &DSA,<br>
+ llvm::DenseMap<VarDecl *, Expr *> &VarsWithImplicitDSA) {<br>
unsigned NestedLoopCount = 1;<br>
if (NestedLoopCountExpr) {<br>
// Found 'collapse' clause - calculate collapse number.<br>
@@ -1639,7 +1702,8 @@ static unsigned CheckOpenMPLoop(OpenMPDi<br>
Stmt *CurStmt = IgnoreContainerStmts(AStmt, true);<br>
for (unsigned Cnt = 0; Cnt < NestedLoopCount; ++Cnt) {<br>
if (CheckOpenMPIterationSpace(DKind, CurStmt, SemaRef, DSA, Cnt,<br>
- NestedLoopCount, NestedLoopCountExpr))<br>
+ NestedLoopCount, NestedLoopCountExpr,<br>
+ VarsWithImplicitDSA))<br>
return 0;<br>
// Move on to the next nested for loop, or to the loop body.<br>
CurStmt = IgnoreContainerStmts(cast<ForStmt>(CurStmt)->getBody(), false);<br>
@@ -1661,12 +1725,14 @@ static Expr *GetCollapseNumberExpr(Array<br>
return nullptr;<br>
}<br>
<br>
-StmtResult Sema::ActOnOpenMPSimdDirective(ArrayRef<OMPClause *> Clauses,<br>
- Stmt *AStmt, SourceLocation StartLoc,<br>
- SourceLocation EndLoc) {<br>
+StmtResult Sema::ActOnOpenMPSimdDirective(<br>
+ ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,<br>
+ SourceLocation EndLoc,<br>
+ llvm::DenseMap<VarDecl *, Expr *> &VarsWithImplicitDSA) {<br>
// In presence of clause 'collapse', it will define the nested loops number.<br>
- unsigned NestedLoopCount = CheckOpenMPLoop(<br>
- OMPD_simd, GetCollapseNumberExpr(Clauses), AStmt, *this, *DSAStack);<br>
+ unsigned NestedLoopCount =<br>
+ CheckOpenMPLoop(OMPD_simd, GetCollapseNumberExpr(Clauses), AStmt, *this,<br>
+ *DSAStack, VarsWithImplicitDSA);<br>
if (NestedLoopCount == 0)<br>
return StmtError();<br>
<br>
@@ -1675,12 +1741,14 @@ StmtResult Sema::ActOnOpenMPSimdDirectiv<br>
Clauses, AStmt);<br>
}<br>
<br>
-StmtResult Sema::ActOnOpenMPForDirective(ArrayRef<OMPClause *> Clauses,<br>
- Stmt *AStmt, SourceLocation StartLoc,<br>
- SourceLocation EndLoc) {<br>
+StmtResult Sema::ActOnOpenMPForDirective(<br>
+ ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,<br>
+ SourceLocation EndLoc,<br>
+ llvm::DenseMap<VarDecl *, Expr *> &VarsWithImplicitDSA) {<br>
// In presence of clause 'collapse', it will define the nested loops number.<br>
- unsigned NestedLoopCount = CheckOpenMPLoop(<br>
- OMPD_for, GetCollapseNumberExpr(Clauses), AStmt, *this, *DSAStack);<br>
+ unsigned NestedLoopCount =<br>
+ CheckOpenMPLoop(OMPD_for, GetCollapseNumberExpr(Clauses), AStmt, *this,<br>
+ *DSAStack, VarsWithImplicitDSA);<br>
if (NestedLoopCount == 0)<br>
return StmtError();<br>
<br>
@@ -1741,6 +1809,31 @@ StmtResult Sema::ActOnOpenMPSingleDirect<br>
return OMPSingleDirective::Create(Context, StartLoc, EndLoc, Clauses, AStmt);<br>
}<br>
<br>
+StmtResult Sema::ActOnOpenMPParallelForDirective(<br>
+ ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,<br>
+ SourceLocation EndLoc,<br>
+ llvm::DenseMap<VarDecl *, Expr *> &VarsWithImplicitDSA) {<br>
+ assert(AStmt && isa<CapturedStmt>(AStmt) && "Captured statement expected");<br>
+ CapturedStmt *CS = cast<CapturedStmt>(AStmt);<br>
+ // 1.2.2 OpenMP Language Terminology<br>
+ // Structured block - An executable statement with a single entry at the<br>
+ // top and a single exit at the bottom.<br>
+ // The point of exit cannot be a branch out of the structured block.<br>
+ // longjmp() and throw() must not violate the entry/exit criteria.<br>
+ CS->getCapturedDecl()->setNothrow();<br>
+<br>
+ // In presence of clause 'collapse', it will define the nested loops number.<br>
+ unsigned NestedLoopCount =<br>
+ CheckOpenMPLoop(OMPD_parallel_for, GetCollapseNumberExpr(Clauses), AStmt,<br>
+ *this, *DSAStack, VarsWithImplicitDSA);<br>
+ if (NestedLoopCount == 0)<br>
+ return StmtError();<br>
+<br>
+ getCurFunction()->setHasBranchProtectedScope();<br>
+ return OMPParallelForDirective::Create(Context, StartLoc, EndLoc,<br>
+ NestedLoopCount, Clauses, 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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/TreeTransform.h?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/TreeTransform.h (original)<br>
+++ cfe/trunk/lib/Sema/TreeTransform.h Mon Jul 7 08:01:15 2014<br>
@@ -6483,6 +6483,17 @@ TreeTransform<Derived>::TransformOMPSing<br>
return Res;<br>
}<br>
<br>
+template <typename Derived><br>
+StmtResult TreeTransform<Derived>::TransformOMPParallelForDirective(<br>
+ OMPParallelForDirective *D) {<br>
+ DeclarationNameInfo DirName;<br>
+ getDerived().getSema().StartOpenMPDSABlock(OMPD_parallel_for, DirName,<br>
+ nullptr, D->getLocStart());<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderStmt.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Serialization/ASTReaderStmt.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/ASTReaderStmt.cpp Mon Jul 7 08:01:15 2014<br>
@@ -1943,6 +1943,13 @@ void ASTStmtReader::VisitOMPSingleDirect<br>
VisitOMPExecutableDirective(D);<br>
}<br>
<br>
+void ASTStmtReader::VisitOMPParallelForDirective(OMPParallelForDirective *D) {<br>
+ VisitStmt(D);<br>
+ // Two fields (NumClauses and CollapsedNum) were read in ReadStmtFromStream.<br>
+ Idx += 2;<br>
+ VisitOMPExecutableDirective(D);<br>
+}<br>
+<br>
//===----------------------------------------------------------------------===//<br>
// ASTReader Implementation<br>
//===----------------------------------------------------------------------===//<br>
@@ -2455,6 +2462,14 @@ Stmt *ASTReader::ReadStmtFromStream(Modu<br>
Context, Record[ASTStmtReader::NumStmtFields], Empty);<br>
break;<br>
<br>
+ case STMT_OMP_PARALLEL_FOR_DIRECTIVE: {<br>
+ unsigned NumClauses = Record[ASTStmtReader::NumStmtFields];<br>
+ unsigned CollapsedNum = Record[ASTStmtReader::NumStmtFields + 1];<br>
+ S = OMPParallelForDirective::CreateEmpty(Context, NumClauses,<br>
+ CollapsedNum, Empty);<br>
+ break;<br>
+ }<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterStmt.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Serialization/ASTWriterStmt.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/ASTWriterStmt.cpp Mon Jul 7 08:01:15 2014<br>
@@ -1851,6 +1851,14 @@ void ASTStmtWriter::VisitOMPSingleDirect<br>
Code = serialization::STMT_OMP_SINGLE_DIRECTIVE;<br>
}<br>
<br>
+void ASTStmtWriter::VisitOMPParallelForDirective(OMPParallelForDirective *D) {<br>
+ VisitStmt(D);<br>
+ Record.push_back(D->getNumClauses());<br>
+ Record.push_back(D->getCollapsedNumber());<br>
+ VisitOMPExecutableDirective(D);<br>
+ Code = serialization::STMT_OMP_PARALLEL_FOR_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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp (original)<br>
+++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp Mon Jul 7 08:01:15 2014<br>
@@ -737,6 +737,7 @@ void ExprEngine::Visit(const Stmt *S, Ex<br>
case Stmt::OMPSectionsDirectiveClass:<br>
case Stmt::OMPSectionDirectiveClass:<br>
case Stmt::OMPSingleDirectiveClass:<br>
+ case Stmt::OMPParallelForDirectiveClass:<br>
llvm_unreachable("Stmt should not be in analyzer evaluation loop");<br>
<br>
case Stmt::ObjCSubscriptRefExprClass:<br>
<br>
Modified: cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp?rev=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp (original)<br>
+++ cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -252,7 +252,7 @@ int main(int argc, char **argv) {<br>
foo();<br>
#pragma omp parallel<br>
#pragma omp for firstprivate(i) // expected-note {{defined as firstprivate}}<br>
- for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable may not be firstprivate}}<br>
+ for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable in the associated loop of 'omp for' directive may not be firstprivate, predetermined as private}}<br>
foo();<br>
#pragma omp parallel shared(xa)<br>
#pragma omp for firstprivate(xa) // OK: may be firstprivate<br>
<br>
Modified: cfe/trunk/test/OpenMP/for_loop_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_loop_messages.cpp?rev=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_loop_messages.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/for_loop_messages.cpp (original)<br>
+++ cfe/trunk/test/OpenMP/for_loop_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -279,7 +279,7 @@ int test_iteration_spaces() {<br>
<br>
#pragma omp parallel<br>
// expected-note@+2 {{defined as firstprivate}}<br>
-// expected-error@+2 {{loop iteration variable may not be firstprivate}}<br>
+// expected-error@+2 {{loop iteration variable in the associated loop of 'omp for' directive may not be firstprivate, predetermined as private}}<br>
#pragma omp for firstprivate(ii)<br>
for (ii = 0; ii < 10; ii++)<br>
c[ii] = a[ii];<br>
@@ -287,7 +287,7 @@ int test_iteration_spaces() {<br>
#pragma omp parallel<br>
// expected-error@+3 {{unexpected OpenMP clause 'linear' in directive '#pragma omp for'}}<br>
// expected-note@+2 {{defined as linear}}<br>
-// expected-error@+2 {{loop iteration variable may not be linear}}<br>
+// expected-error@+2 {{loop iteration variable in the associated loop of 'omp for' directive may not be linear, predetermined as private}}<br>
#pragma omp for linear(ii)<br>
for (ii = 0; ii < 10; ii++)<br>
c[ii] = a[ii];<br>
@@ -304,7 +304,7 @@ int test_iteration_spaces() {<br>
<br>
#pragma omp parallel<br>
{<br>
-// expected-error@+2 {{loop iteration variable may not be threadprivate or thread local}}<br>
+// expected-error@+2 {{loop iteration variable in the associated loop of 'omp for' directive may not be threadprivate or thread local, predetermined as private}}<br>
#pragma omp for<br>
for (sii = 0; sii < 10; sii += 1)<br>
c[sii] = a[sii];<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/nesting_of_regions.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/nesting_of_regions.cpp (original)<br>
+++ cfe/trunk/test/OpenMP/nesting_of_regions.cpp Mon Jul 7 08:01:15 2014<br>
@@ -4,6 +4,7 @@ void bar();<br>
<br>
template <class T><br>
void foo() {<br>
+// PARALLEL DIRECTIVE<br>
#pragma omp parallel<br>
#pragma omp for<br>
for (int i = 0; i < 10; ++i)<br>
@@ -25,6 +26,12 @@ void foo() {<br>
#pragma omp parallel<br>
#pragma omp single<br>
bar();<br>
+#pragma omp parallel<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+<br>
+// SIMD DIRECTIVE<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>
@@ -64,6 +71,14 @@ void foo() {<br>
bar();<br>
}<br>
}<br>
+#pragma omp simd<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp parallel for // expected-error {{OpenMP constructs may not be nested inside a simd region}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+<br>
+// FOR DIRECTIVE<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>
@@ -120,6 +135,14 @@ void foo() {<br>
}<br>
}<br>
}<br>
+#pragma omp for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+<br>
+// SECTIONS DIRECTIVE<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>
@@ -177,10 +200,20 @@ void foo() {<br>
}<br>
}<br>
}<br>
+#pragma omp sections<br>
+ {<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+<br>
+// SECTION DIRECTIVE<br>
#pragma omp section // expected-error {{orphaned 'omp section' directives are prohibited, it must be closely nested to a sections region}}<br>
{<br>
bar();<br>
}<br>
+<br>
+// SINGLE DIRECTIVE<br>
#pragma omp single<br>
{<br>
#pragma omp for // expected-error {{region cannot be closely nested inside 'single' region; perhaps you forget to enclose 'omp for' directive into a parallel region?}}<br>
@@ -230,9 +263,80 @@ void foo() {<br>
}<br>
}<br>
}<br>
+#pragma omp single<br>
+ {<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+<br>
+// PARALLEL FOR DIRECTIVE<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp for // expected-error {{region cannot be closely nested inside 'parallel for' region; perhaps you forget to enclose 'omp for' directive into a parallel region?}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp simd<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp parallel<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp sections // expected-error {{region cannot be closely nested inside 'parallel for' region; perhaps you forget to enclose 'omp sections' directive into a parallel region?}}<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp section // expected-error {{'omp section' directive must be closely nested to a sections region, not a parallel for region}}<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp single // expected-error {{region cannot be closely nested inside 'parallel for' region; perhaps you forget to enclose 'omp single' directive into a parallel region?}}<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp parallel<br>
+ {<br>
+#pragma omp single // OK<br>
+ {<br>
+ bar();<br>
+ }<br>
+#pragma omp for // OK<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+#pragma omp sections // OK<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
}<br>
<br>
void foo() {<br>
+// PARALLEL DIRECTIVE<br>
#pragma omp parallel<br>
#pragma omp for<br>
for (int i = 0; i < 10; ++i)<br>
@@ -259,6 +363,12 @@ void foo() {<br>
#pragma omp parallel<br>
#pragma omp single<br>
bar();<br>
+#pragma omp parallel<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+<br>
+// SIMD DIRECTIVE<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>
@@ -296,6 +406,14 @@ void foo() {<br>
#pragma omp single // expected-error {{OpenMP constructs may not be nested inside a simd region}}<br>
bar();<br>
}<br>
+#pragma omp simd<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp parallel for // expected-error {{OpenMP constructs may not be nested inside a simd region}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+<br>
+// FOR DIRECTIVE<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>
@@ -350,6 +468,14 @@ void foo() {<br>
}<br>
}<br>
}<br>
+#pragma omp for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+<br>
+// SECTIONS DIRECTIVE<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>
@@ -404,10 +530,20 @@ void foo() {<br>
}<br>
}<br>
}<br>
+#pragma omp sections<br>
+ {<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+<br>
+// SECTION DIRECTIVE<br>
#pragma omp section // expected-error {{orphaned 'omp section' directives are prohibited, it must be closely nested to a sections region}}<br>
{<br>
bar();<br>
}<br>
+<br>
+// SINGLE DIRECTIVE<br>
#pragma omp single<br>
{<br>
#pragma omp for // expected-error {{region cannot be closely nested inside 'single' region; perhaps you forget to enclose 'omp for' directive into a parallel region?}}<br>
@@ -457,6 +593,76 @@ void foo() {<br>
}<br>
}<br>
}<br>
+#pragma omp single<br>
+ {<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+<br>
+// PARALLEL FOR DIRECTIVE<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp for // expected-error {{region cannot be closely nested inside 'parallel for' region; perhaps you forget to enclose 'omp for' directive into a parallel region?}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp simd<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp parallel<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp sections // expected-error {{region cannot be closely nested inside 'parallel for' region; perhaps you forget to enclose 'omp sections' directive into a parallel region?}}<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp section // expected-error {{'omp section' directive must be closely nested to a sections region, not a parallel for region}}<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp single // expected-error {{region cannot be closely nested inside 'parallel for' region; perhaps you forget to enclose 'omp single' directive into a parallel region?}}<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp parallel<br>
+ {<br>
+#pragma omp single // OK<br>
+ {<br>
+ bar();<br>
+ }<br>
+#pragma omp for // OK<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+#pragma omp sections // OK<br>
+ {<br>
+ bar();<br>
+ }<br>
+ }<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ;<br>
+ }<br>
return foo<int>();<br>
}<br>
<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,64 @@<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, h;<br>
+ static T a;<br>
+// CHECK: static T a;<br>
+ static T g;<br>
+#pragma omp threadprivate(g)<br>
+#pragma omp parallel for schedule(dynamic) default(none) copyin(g)<br>
+ // CHECK: #pragma omp parallel for schedule(dynamic) default(none) copyin(g)<br>
+ for (int i = 0; i < 2; ++i)<br>
+ a = 2;<br>
+// CHECK-NEXT: for (int i = 0; i < 2; ++i)<br>
+// CHECK-NEXT: a = 2;<br>
+#pragma omp parallel for private(argc, b), firstprivate(c, d), lastprivate(d, f) collapse(N) schedule(static, N) ordered if (argc) num_threads(N) default(shared) shared(e) reduction(+ : h)<br>
+ for (int i = 0; i < 10; ++i)<br>
+ for (int j = 0; j < 10; ++j)<br>
+ for (int j = 0; j < 10; ++j)<br>
+ for (int j = 0; j < 10; ++j)<br>
+ for (int j = 0; j < 10; ++j)<br>
+ foo();<br>
+ // CHECK-NEXT: #pragma omp parallel for private(argc,b) firstprivate(c,d) lastprivate(d,f) collapse(N) schedule(static, N) ordered if(argc) num_threads(N) default(shared) shared(e) reduction(+: h)<br>
+ // CHECK-NEXT: for (int i = 0; i < 10; ++i)<br>
+ // CHECK-NEXT: for (int j = 0; j < 10; ++j)<br>
+ // CHECK-NEXT: for (int j = 0; j < 10; ++j)<br>
+ // CHECK-NEXT: for (int j = 0; j < 10; ++j)<br>
+ // CHECK-NEXT: for (int j = 0; j < 10; ++j)<br>
+ // CHECK-NEXT: foo();<br>
+ return T();<br>
+}<br>
+<br>
+int main(int argc, char **argv) {<br>
+ int b = argc, c, d, e, f, h;<br>
+ static int a;<br>
+// CHECK: static int a;<br>
+ static float g;<br>
+#pragma omp threadprivate(g)<br>
+#pragma omp parallel for schedule(guided, argc) default(none) copyin(g)<br>
+ // CHECK: #pragma omp parallel for schedule(guided, argc) default(none) copyin(g)<br>
+ for (int i = 0; i < 2; ++i)<br>
+ a = 2;<br>
+// CHECK-NEXT: for (int i = 0; i < 2; ++i)<br>
+// CHECK-NEXT: a = 2;<br>
+#pragma omp parallel for private(argc, b), firstprivate(argv, c), lastprivate(d, f) collapse(2) schedule(auto) ordered if (argc) num_threads(a) default(shared) shared(e) reduction(+ : h)<br>
+ for (int i = 0; i < 10; ++i)<br>
+ for (int j = 0; j < 10; ++j)<br>
+ foo();<br>
+ // CHECK-NEXT: #pragma omp parallel for private(argc,b) firstprivate(argv,c) lastprivate(d,f) collapse(2) schedule(auto) ordered if(argc) num_threads(a) default(shared) shared(e) reduction(+: h)<br>
+ // CHECK-NEXT: for (int i = 0; i < 10; ++i)<br>
+ // CHECK-NEXT: for (int j = 0; j < 10; ++j)<br>
+ // CHECK-NEXT: foo();<br>
+ return (tmain<int, 5>(argc) + tmain<char, 1>(argv[0][0]));<br>
+}<br>
+<br>
+#endif<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_collapse_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_collapse_messages.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_collapse_messages.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_collapse_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_collapse_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,83 @@<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 {{declared here}}<br>
+<br>
+template <class T, typename S, int N, int ST> // expected-note {{declared here}}<br>
+T tmain(T argc, S **argv) { //expected-note 2 {{declared here}}<br>
+ #pragma omp parallel for collapse // expected-error {{expected '(' after 'collapse'}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for collapse () // expected-error {{expected expression}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}}<br>
+ // expected-error@+2 2 {{expression is not an integral constant expression}}<br>
+ // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}}<br>
+ #pragma omp parallel for collapse (argc<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ // expected-error@+1 2 {{argument to 'collapse' clause must be a positive integer value}}<br>
+ #pragma omp parallel for collapse (ST // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for collapse (1)) // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp parallel for', but found only 1}}<br>
+ // expected-error@+3 2 {{directive '#pragma omp parallel for' cannot contain more than one 'collapse' clause}}<br>
+ // expected-error@+2 2 {{argument to 'collapse' clause must be a positive integer value}}<br>
+ // expected-error@+1 2 {{expression is not an integral constant expression}}<br>
+ #pragma omp parallel for collapse (foobool(argc)), collapse (true), collapse (-5)<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for collapse (S) // expected-error {{'S' does not refer to a value}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ // expected-error@+1 2 {{expression is not an integral constant expression}}<br>
+ #pragma omp parallel for collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for collapse (1)<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for collapse (N) // expected-error {{argument to 'collapse' clause must be a positive integer value}}<br>
+ for (T i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for collapse (2) // expected-note {{as specified in 'collapse' clause}}<br>
+ foo(); // expected-error {{expected 2 for loops after '#pragma omp parallel for'}}<br>
+ return argc;<br>
+}<br>
+<br>
+int main(int argc, char **argv) {<br>
+ #pragma omp parallel for collapse // expected-error {{expected '(' after 'collapse'}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for collapse () // expected-error {{expected expression}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for collapse (4 // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-note {{as specified in 'collapse' clause}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp parallel for', but found only 1}}<br>
+ #pragma omp parallel for collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}} expected-note {{as specified in 'collapse' clause}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp parallel for', but found only 1}}<br>
+ #pragma omp parallel for collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{expression is not an integral constant expression}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ // expected-error@+3 {{expression is not an integral constant expression}}<br>
+ // expected-error@+2 2 {{directive '#pragma omp parallel for' cannot contain more than one 'collapse' clause}}<br>
+ // expected-error@+1 2 {{argument to 'collapse' clause must be a positive integer value}}<br>
+ #pragma omp parallel for collapse (foobool(argc)), collapse (true), collapse (-5)<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for collapse (S1) // expected-error {{'S1' does not refer to a value}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ // expected-error@+1 {{expression is not an integral constant expression}}<br>
+ #pragma omp parallel for collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ // expected-error@+3 {{statement after '#pragma omp parallel for' must be a for loop}}<br>
+ // expected-note@+1 {{in instantiation of function template specialization 'tmain<int, char, -1, -2>' requested here}}<br>
+ #pragma omp parallel for collapse(collapse(tmain<int, char, -1, -2>(argc, argv) // expected-error 2 {{expected ')'}} expected-note 2 {{to match this '('}}<br>
+ foo();<br>
+ #pragma omp parallel for collapse (2) // expected-note {{as specified in 'collapse' clause}}<br>
+ foo(); // expected-error {{expected 2 for loops after '#pragma omp parallel for'}}<br>
+ // expected-note@+1 {{in instantiation of function template specialization 'tmain<int, char, 1, 0>' requested here}}<br>
+ return tmain<int, char, 1, 0>(argc, argv);<br>
+}<br>
+<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_collapse_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_collapse_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_collapse_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,93 @@<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}}<br>
+class S2 {<br>
+ mutable int a;<br>
+<br>
+public:<br>
+ S2() : a(0) {}<br>
+ S2 &operator=(S2 &s2) { return *this; }<br>
+};<br>
+class S3 {<br>
+ int a;<br>
+<br>
+public:<br>
+ S3() : a(0) {}<br>
+ S3 &operator=(S3 &s3) { return *this; }<br>
+};<br>
+class S4 { // expected-note {{'S4' declared here}}<br>
+ int a;<br>
+ S4();<br>
+ S4 &operator=(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>
+ S5 &operator=(const S5 &s5) { return *this; }<br>
+<br>
+public:<br>
+ S5(int v) : a(v) {}<br>
+};<br>
+template <class T><br>
+class ST {<br>
+public:<br>
+ static T s;<br>
+};<br>
+<br>
+S2 k;<br>
+S3 h;<br>
+S4 l(3); // expected-note {{'l' defined here}}<br>
+S5 m(4); // expected-note {{'m' defined here}}<br>
+#pragma omp threadprivate(h, k, l, m)<br>
+<br>
+int main(int argc, char **argv) {<br>
+ int i;<br>
+#pragma omp parallel for copyin // expected-error {{expected '(' after 'copyin'}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for copyin( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for copyin() // expected-error {{expected expression}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for copyin(k // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for copyin(h, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for copyin(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for copyin(l) // expected-error {{copyin variable must have an accessible, unambiguous copy assignment operator}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for copyin(S1) // expected-error {{'S1' does not refer to a value}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for copyin(argv[1]) // expected-error {{expected variable name}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for copyin(i) // expected-error {{copyin variable must be threadprivate}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for copyin(m) // expected-error {{copyin variable must have an accessible, unambiguous copy assignment operator}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for copyin(ST < int > ::s) // expected-error {{copyin variable must be threadprivate}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+<br>
+ return 0;<br>
+}<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_default_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_default_messages.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_default_messages.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_default_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_default_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,36 @@<br>
+// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 -o - %s<br>
+<br>
+void foo();<br>
+<br>
+int main(int argc, char **argv) {<br>
+ int i;<br>
+#pragma omp parallel for default // expected-error {{expected '(' after 'default'}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for default( // expected-error {{expected 'none' or 'shared' in OpenMP clause 'default'}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for default() // expected-error {{expected 'none' or 'shared' in OpenMP clause 'default'}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for default(none // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) // expected-error {{variable 'argc' must have explicitly specified data sharing attributes}}<br>
+ foo();<br>
+#pragma omp parallel for default(shared), default(shared) // expected-error {{directive '#pragma omp parallel for' cannot contain more than one 'default' clause}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for default(x) // expected-error {{expected 'none' or 'shared' in OpenMP clause 'default'}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+<br>
+#pragma omp parallel for default(none)<br>
+ for (i = 0; i < argc; ++i) // expected-error {{variable 'argc' must have explicitly specified data sharing attributes}}<br>
+ foo();<br>
+<br>
+#pragma omp parallel default(none)<br>
+#pragma omp parallel for default(shared)<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+<br>
+ return 0;<br>
+}<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_default_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_default_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_default_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,252 @@<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 for firstprivate // expected-error {{expected '(' after 'firstprivate'}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for firstprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for firstprivate() // expected-error {{expected expression}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for firstprivate(argc)<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for firstprivate(S1) // expected-error {{'S1' does not refer to a value}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for firstprivate(a, b) // expected-error {{firstprivate variable with incomplete type 'S1'}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for firstprivate(argv[1]) // expected-error {{expected variable name}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for firstprivate(e, g) // expected-error 2 {{firstprivate variable must have an accessible, unambiguous copy constructor}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for firstprivate(h) // expected-error {{threadprivate or thread local variable cannot be firstprivate}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for linear(i) // expected-error {{unexpected OpenMP clause 'linear' in directive '#pragma omp parallel for'}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel<br>
+ {<br>
+ int v = 0;<br>
+ int i;<br>
+#pragma omp parallel for firstprivate(i)<br>
+ for (int k = 0; k < argc; ++k) {<br>
+ i = k;<br>
+ v += i;<br>
+ }<br>
+ }<br>
+#pragma omp parallel shared(i)<br>
+#pragma omp parallel private(i)<br>
+#pragma omp parallel for firstprivate(j) // expected-error {{arguments of OpenMP clause 'firstprivate' cannot be of reference type}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for firstprivate(i)<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for lastprivate(g) firstprivate(g) // expected-error {{firstprivate variable must have an accessible, unambiguous copy constructor}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel private(i)<br>
+#pragma omp parallel for firstprivate(i) // expected-note {{defined as firstprivate}}<br>
+ for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable in the associated loop of 'omp parallel for' directive may not be firstprivate, predetermined as private}}<br>
+ foo();<br>
+#pragma omp parallel reduction(+ : i)<br>
+#pragma omp parallel for firstprivate(i) // expected-note {{defined as firstprivate}}<br>
+ for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable in the associated loop of 'omp parallel for' directive may not be firstprivate, predetermined as private}}<br>
+ foo();<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 for firstprivate // expected-error {{expected '(' after 'firstprivate'}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate() // expected-error {{expected expression}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(argc)<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(S1) // expected-error {{'S1' does not refer to a value}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(a, b, c, d, f) // expected-error {{firstprivate variable with incomplete type 'S1'}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(argv[1]) // expected-error {{expected variable name}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(2 * 2) // expected-error {{expected variable name}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(ba) // OK<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(ca) // OK<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(da) // OK<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+ int xa;<br>
+#pragma omp parallel for firstprivate(xa) // OK<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(S2::S2s) // OK<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(S2::S2sc) // OK<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for safelen(5) // expected-error {{unexpected OpenMP clause 'safelen' in directive '#pragma omp parallel for'}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(e, g) // expected-error 2 {{firstprivate variable must have an accessible, unambiguous copy constructor}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(m) // OK<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(h) // expected-error {{threadprivate or thread local variable cannot be firstprivate}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for private(xa), firstprivate(xa) // expected-error {{private variable cannot be firstprivate}} expected-note {{defined as private}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(i) // expected-note {{defined as firstprivate}}<br>
+ for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable in the associated loop of 'omp parallel for' directive may not be firstprivate, predetermined as private}}<br>
+ foo();<br>
+#pragma omp parallel shared(xa)<br>
+#pragma omp parallel for firstprivate(xa) // OK: may be firstprivate<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(j) // expected-error {{arguments of OpenMP clause 'firstprivate' cannot be of reference type}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(g) firstprivate(g) // expected-error {{firstprivate variable must have an accessible, unambiguous copy constructor}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(n) firstprivate(n) // OK<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel<br>
+ {<br>
+ int v = 0;<br>
+ int i;<br>
+#pragma omp parallel for firstprivate(i)<br>
+ for (int k = 0; k < argc; ++k) {<br>
+ i = k;<br>
+ v += i;<br>
+ }<br>
+ }<br>
+#pragma omp parallel private(i)<br>
+#pragma omp parallel for firstprivate(i) // expected-note {{defined as firstprivate}}<br>
+ for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable in the associated loop of 'omp parallel for' directive may not be firstprivate, predetermined as private}}<br>
+ foo();<br>
+#pragma omp parallel reduction(+ : i)<br>
+#pragma omp parallel for firstprivate(i) // expected-note {{defined as firstprivate}}<br>
+ for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable in the associated loop of 'omp parallel for' directive may not be firstprivate, predetermined as private}}<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/parallel_for_firstprivate_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_if_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_if_messages.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_if_messages.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_if_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_if_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,69 @@<br>
+// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 %s<br>
+<br>
+void foo() {<br>
+}<br>
+<br>
+bool foobool(int argc) {<br>
+ return argc;<br>
+}<br>
+<br>
+struct S1; // expected-note {{declared here}}<br>
+<br>
+template <class T, class S> // expected-note {{declared here}}<br>
+int tmain(T argc, S **argv) {<br>
+ T i;<br>
+ #pragma omp parallel for if // expected-error {{expected '(' after 'if'}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if () // expected-error {{expected expression}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (argc)) // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (argc > 0 ? argv[1] : argv[2])<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (foobool(argc)), if (true) // expected-error {{directive '#pragma omp parallel for' cannot contain more than one 'if' clause}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (S) // expected-error {{'S' does not refer to a value}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (argc argc) // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if(argc)<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+<br>
+ return 0;<br>
+}<br>
+<br>
+int main(int argc, char **argv) {<br>
+ int i;<br>
+ #pragma omp parallel for if // expected-error {{expected '(' after 'if'}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if () // expected-error {{expected expression}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (argc)) // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (argc > 0 ? argv[1] : argv[2])<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (foobool(argc)), if (true) // expected-error {{directive '#pragma omp parallel for' cannot contain more than one 'if' clause}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (S1) // expected-error {{'S1' does not refer to a value}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (argc argc) // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if (1 0) // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for if(if(tmain(argc, argv) // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+<br>
+ return tmain(argc, argv);<br>
+}<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_if_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_if_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_if_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,226 @@<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 for lastprivate // expected-error {{expected '(' after 'lastprivate'}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for lastprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for lastprivate() // expected-error {{expected expression}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for lastprivate(argc)<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for lastprivate(S1) // expected-error {{'S1' does not refer to a value}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for lastprivate(a, b) // expected-error {{lastprivate variable with incomplete type 'S1'}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for lastprivate(argv[1]) // expected-error {{expected variable name}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for lastprivate(e, g) // expected-error 2 {{lastprivate variable must have an accessible, unambiguous default constructor}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for lastprivate(h) // expected-error {{threadprivate or thread local variable cannot be lastprivate}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for linear(i) // expected-error {{unexpected OpenMP clause 'linear' in directive '#pragma omp parallel for'}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel<br>
+ {<br>
+ int v = 0;<br>
+ int i;<br>
+#pragma omp parallel for lastprivate(i)<br>
+ for (int k = 0; k < argc; ++k) {<br>
+ i = k;<br>
+ v += i;<br>
+ }<br>
+ }<br>
+#pragma omp parallel shared(i)<br>
+#pragma omp parallel private(i)<br>
+#pragma omp parallel for lastprivate(j) // expected-error {{arguments of OpenMP clause 'lastprivate' cannot be of reference type}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for lastprivate(i)<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<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 for lastprivate // expected-error {{expected '(' after 'lastprivate'}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate() // expected-error {{expected expression}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(argc)<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(S1) // expected-error {{'S1' does not refer to a value}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(a, b, c, d, f) // expected-error {{lastprivate variable with incomplete type 'S1'}} expected-error 3 {{shared variable cannot be lastprivate}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(argv[1]) // expected-error {{expected variable name}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(2 * 2) // expected-error {{expected variable name}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(ba)<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(ca) // expected-error {{shared variable cannot be lastprivate}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(da) // expected-error {{shared variable cannot be lastprivate}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+ int xa;<br>
+#pragma omp parallel for lastprivate(xa) // OK<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(S2::S2s) // expected-error {{shared variable cannot be lastprivate}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(S2::S2sc) // expected-error {{shared variable cannot be lastprivate}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for safelen(5) // expected-error {{unexpected OpenMP clause 'safelen' in directive '#pragma omp parallel for'}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(e, g) // expected-error 2 {{lastprivate variable must have an accessible, unambiguous default constructor}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(m) // expected-error {{lastprivate variable must have an accessible, unambiguous copy assignment operator}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(h) // expected-error {{threadprivate or thread local variable cannot be lastprivate}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for private(xa), lastprivate(xa) // expected-error {{private variable cannot be lastprivate}} expected-note {{defined as private}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(i)<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel private(xa)<br>
+#pragma omp parallel for lastprivate(xa)<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel reduction(+ : xa)<br>
+#pragma omp parallel for lastprivate(xa)<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(j) // expected-error {{arguments of OpenMP clause 'lastprivate' cannot be of reference type}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for firstprivate(m) lastprivate(m) // expected-error {{lastprivate variable must have an accessible, unambiguous copy assignment operator}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for lastprivate(n) firstprivate(n) // OK<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<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/parallel_for_lastprivate_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_loop_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_loop_messages.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_loop_messages.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_loop_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_loop_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,593 @@<br>
+// RUN: %clang_cc1 -fsyntax-only -fopenmp=libiomp5 -x c++ -std=c++11 -fexceptions -fcxx-exceptions -verify %s<br>
+<br>
+class S {<br>
+ int a;<br>
+ S() : a(0) {}<br>
+<br>
+public:<br>
+ S(int v) : a(v) {}<br>
+ S(const S &s) : a(s.a) {}<br>
+};<br>
+<br>
+static int sii;<br>
+#pragma omp threadprivate(sii) // expected-note {{defined as threadprivate or thread local}}<br>
+<br>
+int test_iteration_spaces() {<br>
+ const int N = 100;<br>
+ float a[N], b[N], c[N];<br>
+ int ii, jj, kk;<br>
+ float fii;<br>
+ double dii;<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; i += 1) {<br>
+ c[i] = a[i] + b[i];<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (char i = 0; i < 10; i++) {<br>
+ c[i] = a[i] + b[i];<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (char i = 0; i < 10; i += '\1') {<br>
+ c[i] = a[i] + b[i];<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (long long i = 0; i < 10; i++) {<br>
+ c[i] = a[i] + b[i];<br>
+ }<br>
+// expected-error@+2 {{expression must have integral or unscoped enumeration type, not 'double'}}<br>
+#pragma omp parallel for<br>
+ for (long long i = 0; i < 10; i += 1.5) {<br>
+ c[i] = a[i] + b[i];<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (long long i = 0; i < 'z'; i += 1u) {<br>
+ c[i] = a[i] + b[i];<br>
+ }<br>
+// expected-error@+2 {{variable must be of integer or random access iterator type}}<br>
+#pragma omp parallel for<br>
+ for (float fi = 0; fi < 10.0; fi++) {<br>
+ c[(int)fi] = a[(int)fi] + b[(int)fi];<br>
+ }<br>
+// expected-error@+2 {{variable must be of integer or random access iterator type}}<br>
+#pragma omp parallel for<br>
+ for (double fi = 0; fi < 10.0; fi++) {<br>
+ c[(int)fi] = a[(int)fi] + b[(int)fi];<br>
+ }<br>
+// expected-error@+2 {{variable must be of integer or random access iterator type}}<br>
+#pragma omp parallel for<br>
+ for (int &ref = ii; ref < 10; ref++) {<br>
+ }<br>
+// expected-error@+2 {{initialization clause of OpenMP for loop must be of the form 'var = init' or 'T var = init'}}<br>
+#pragma omp parallel for<br>
+ for (int i; i < 10; i++)<br>
+ c[i] = a[i];<br>
+<br>
+// expected-error@+2 {{initialization clause of OpenMP for loop must be of the form 'var = init' or 'T var = init'}}<br>
+#pragma omp parallel for<br>
+ for (int i = 0, j = 0; i < 10; ++i)<br>
+ c[i] = a[i];<br>
+<br>
+// expected-error@+2 {{initialization clause of OpenMP for loop must be of the form 'var = init' or 'T var = init'}}<br>
+#pragma omp parallel for<br>
+ for (; ii < 10; ++ii)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-warning@+3 {{expression result unused}}<br>
+// expected-error@+2 {{initialization clause of OpenMP for loop must be of the form 'var = init' or 'T var = init'}}<br>
+#pragma omp parallel for<br>
+ for (ii + 1; ii < 10; ++ii)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-error@+2 {{initialization clause of OpenMP for loop must be of the form 'var = init' or 'T var = init'}}<br>
+#pragma omp parallel for<br>
+ for (c[ii] = 0; ii < 10; ++ii)<br>
+ c[ii] = a[ii];<br>
+<br>
+// Ok to skip parenthesises.<br>
+#pragma omp parallel for<br>
+ for (((ii)) = 0; ii < 10; ++ii)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-error@+2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}}<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i; i++)<br>
+ c[i] = a[i];<br>
+<br>
+// expected-error@+3 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}}<br>
+// expected-error@+2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'i'}}<br>
+#pragma omp parallel for<br>
+ for (int i = 0; jj < kk; ii++)<br>
+ c[i] = a[i];<br>
+<br>
+// expected-error@+2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}}<br>
+#pragma omp parallel for<br>
+ for (int i = 0; !!i; i++)<br>
+ c[i] = a[i];<br>
+<br>
+// expected-error@+2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}}<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i != 1; i++)<br>
+ c[i] = a[i];<br>
+<br>
+// expected-error@+2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}}<br>
+#pragma omp parallel for<br>
+ for (int i = 0;; i++)<br>
+ c[i] = a[i];<br>
+<br>
+// Ok.<br>
+#pragma omp parallel for<br>
+ for (int i = 11; i > 10; i--)<br>
+ c[i] = a[i];<br>
+<br>
+// Ok.<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i)<br>
+ c[i] = a[i];<br>
+<br>
+// Ok.<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10; ++ii)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-error@+2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10; ++jj)<br>
+ c[ii] = a[jj];<br>
+<br>
+// expected-error@+2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10; ++++ii)<br>
+ c[ii] = a[ii];<br>
+<br>
+// Ok but undefined behavior (in general, cannot check that incr<br>
+// is really loop-invariant).<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10; ii = ii + ii)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-error@+2 {{expression must have integral or unscoped enumeration type, not 'float'}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10; ii = ii + 1.0f)<br>
+ c[ii] = a[ii];<br>
+<br>
+// Ok - step was converted to integer type.<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10; ii = ii + (int)1.1f)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-error@+2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10; jj = ii + 2)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-warning@+3 {{relational comparison result unused}}<br>
+// expected-error@+2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii<10; jj> kk + 2)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-error@+2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10;)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-warning@+3 {{expression result unused}}<br>
+// expected-error@+2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10; !ii)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-error@+2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10; ii ? ++ii : ++jj)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-error@+2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10; ii = ii < 10)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-note@+3 {{loop step is expected to be positive due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10; ii = ii + 0)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-note@+3 {{loop step is expected to be positive due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10; ii = ii + (int)(0.8 - 0.45))<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-note@+3 {{loop step is expected to be positive due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; (ii) < 10; ii -= 25)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-note@+3 {{loop step is expected to be positive due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; (ii < 10); ii -= 0)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-note@+3 {{loop step is expected to be negative due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'ii' to decrease on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii > 10; (ii += 0))<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-note@+3 {{loop step is expected to be positive due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; ii < 10; (ii) = (1 - 1) + (ii))<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-note@+3 {{loop step is expected to be negative due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'ii' to decrease on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for ((ii = 0); ii > 10; (ii -= 0))<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-note@+3 {{loop step is expected to be positive due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (ii = 0; (ii < 10); (ii -= 0))<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-note@+2 {{defined as firstprivate}}<br>
+// expected-error@+2 {{loop iteration variable in the associated loop of 'omp parallel for' directive may not be firstprivate, predetermined as private}}<br>
+#pragma omp parallel for firstprivate(ii)<br>
+ for (ii = 0; ii < 10; ii++)<br>
+ c[ii] = a[ii];<br>
+<br>
+// expected-error@+3 {{unexpected OpenMP clause 'linear' in directive '#pragma omp parallel for'}}<br>
+// expected-note@+2 {{defined as linear}}<br>
+// expected-error@+2 {{loop iteration variable in the associated loop of 'omp parallel for' directive may not be linear, predetermined as private}}<br>
+#pragma omp parallel for linear(ii)<br>
+ for (ii = 0; ii < 10; ii++)<br>
+ c[ii] = a[ii];<br>
+<br>
+#pragma omp parallel for private(ii)<br>
+ for (ii = 0; ii < 10; ii++)<br>
+ c[ii] = a[ii];<br>
+<br>
+#pragma omp parallel for lastprivate(ii)<br>
+ for (ii = 0; ii < 10; ii++)<br>
+ c[ii] = a[ii];<br>
+<br>
+ {<br>
+// expected-error@+2 {{loop iteration variable in the associated loop of 'omp parallel for' directive may not be threadprivate or thread local, predetermined as private}}<br>
+#pragma omp parallel for<br>
+ for (sii = 0; sii < 10; sii += 1)<br>
+ c[sii] = a[sii];<br>
+ }<br>
+<br>
+// expected-error@+2 {{statement after '#pragma omp parallel for' must be a for loop}}<br>
+#pragma omp parallel for<br>
+ for (auto &item : a) {<br>
+ item = item + 1;<br>
+ }<br>
+<br>
+// expected-note@+3 {{loop step is expected to be positive due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'i' to increase on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (unsigned i = 9; i < 10; i--) {<br>
+ c[i] = a[i] + b[i];<br>
+ }<br>
+<br>
+ int(*lb)[4] = nullptr;<br>
+#pragma omp parallel for<br>
+ for (int(*p)[4] = lb; p < lb + 8; ++p) {<br>
+ }<br>
+<br>
+// expected-warning@+2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}<br>
+#pragma omp parallel for<br>
+ for (int a{0}; a < 10; ++a) {<br>
+ }<br>
+<br>
+ return 0;<br>
+}<br>
+<br>
+// Iterators allowed in openmp for-loops.<br>
+namespace std {<br>
+struct random_access_iterator_tag {};<br>
+template <class Iter><br>
+struct iterator_traits {<br>
+ typedef typename Iter::difference_type difference_type;<br>
+ typedef typename Iter::iterator_category iterator_category;<br>
+};<br>
+template <class Iter><br>
+typename iterator_traits<Iter>::difference_type<br>
+distance(Iter first, Iter last) { return first - last; }<br>
+}<br>
+class Iter0 {<br>
+public:<br>
+ Iter0() {}<br>
+ Iter0(const Iter0 &) {}<br>
+ Iter0 operator++() { return *this; }<br>
+ Iter0 operator--() { return *this; }<br>
+ bool operator<(Iter0 a) { return true; }<br>
+};<br>
+int operator-(Iter0 a, Iter0 b) { return 0; }<br>
+class Iter1 {<br>
+public:<br>
+ Iter1(float f = 0.0f, double d = 0.0) {}<br>
+ Iter1(const Iter1 &) {}<br>
+ Iter1 operator++() { return *this; }<br>
+ Iter1 operator--() { return *this; }<br>
+ bool operator<(Iter1 a) { return true; }<br>
+ bool operator>=(Iter1 a) { return false; }<br>
+};<br>
+class GoodIter {<br>
+public:<br>
+ GoodIter() {}<br>
+ GoodIter(const GoodIter &) {}<br>
+ GoodIter(int fst, int snd) {}<br>
+ GoodIter &operator=(const GoodIter &that) { return *this; }<br>
+ GoodIter &operator=(const Iter0 &that) { return *this; }<br>
+ GoodIter &operator+=(int x) { return *this; }<br>
+ explicit GoodIter(void *) {}<br>
+ GoodIter operator++() { return *this; }<br>
+ GoodIter operator--() { return *this; }<br>
+ bool operator!() { return true; }<br>
+ bool operator<(GoodIter a) { return true; }<br>
+ bool operator<=(GoodIter a) { return true; }<br>
+ bool operator>=(GoodIter a) { return false; }<br>
+ typedef int difference_type;<br>
+ typedef std::random_access_iterator_tag iterator_category;<br>
+};<br>
+int operator-(GoodIter a, GoodIter b) { return 0; }<br>
+GoodIter operator-(GoodIter a) { return a; }<br>
+GoodIter operator-(GoodIter a, int v) { return GoodIter(); }<br>
+GoodIter operator+(GoodIter a, int v) { return GoodIter(); }<br>
+GoodIter operator-(int v, GoodIter a) { return GoodIter(); }<br>
+GoodIter operator+(int v, GoodIter a) { return GoodIter(); }<br>
+<br>
+int test_with_random_access_iterator() {<br>
+ GoodIter begin, end;<br>
+ Iter0 begin0, end0;<br>
+#pragma omp parallel for<br>
+ for (GoodIter I = begin; I < end; ++I)<br>
+ ++I;<br>
+// expected-error@+2 {{variable must be of integer or random access iterator type}}<br>
+#pragma omp parallel for<br>
+ for (GoodIter &I = begin; I < end; ++I)<br>
+ ++I;<br>
+#pragma omp parallel for<br>
+ for (GoodIter I = begin; I >= end; --I)<br>
+ ++I;<br>
+// expected-warning@+2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}<br>
+#pragma omp parallel for<br>
+ for (GoodIter I(begin); I < end; ++I)<br>
+ ++I;<br>
+// expected-warning@+2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}<br>
+#pragma omp parallel for<br>
+ for (GoodIter I(nullptr); I < end; ++I)<br>
+ ++I;<br>
+// expected-warning@+2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}<br>
+#pragma omp parallel for<br>
+ for (GoodIter I(0); I < end; ++I)<br>
+ ++I;<br>
+// expected-warning@+2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}<br>
+#pragma omp parallel for<br>
+ for (GoodIter I(1, 2); I < end; ++I)<br>
+ ++I;<br>
+#pragma omp parallel for<br>
+ for (begin = GoodIter(0); begin < end; ++begin)<br>
+ ++begin;<br>
+#pragma omp parallel for<br>
+ for (begin = begin0; begin < end; ++begin)<br>
+ ++begin;<br>
+// expected-error@+2 {{initialization clause of OpenMP for loop must be of the form 'var = init' or 'T var = init'}}<br>
+#pragma omp parallel for<br>
+ for (++begin; begin < end; ++begin)<br>
+ ++begin;<br>
+#pragma omp parallel for<br>
+ for (begin = end; begin < end; ++begin)<br>
+ ++begin;<br>
+// expected-error@+2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'I'}}<br>
+#pragma omp parallel for<br>
+ for (GoodIter I = begin; I - I; ++I)<br>
+ ++I;<br>
+// expected-error@+2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'I'}}<br>
+#pragma omp parallel for<br>
+ for (GoodIter I = begin; begin < end; ++I)<br>
+ ++I;<br>
+// expected-error@+2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'I'}}<br>
+#pragma omp parallel for<br>
+ for (GoodIter I = begin; !I; ++I)<br>
+ ++I;<br>
+// expected-note@+3 {{loop step is expected to be negative due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (GoodIter I = begin; I >= end; I = I + 1)<br>
+ ++I;<br>
+#pragma omp parallel for<br>
+ for (GoodIter I = begin; I >= end; I = I - 1)<br>
+ ++I;<br>
+// expected-error@+2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'I'}}<br>
+#pragma omp parallel for<br>
+ for (GoodIter I = begin; I >= end; I = -I)<br>
+ ++I;<br>
+// expected-note@+3 {{loop step is expected to be negative due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (GoodIter I = begin; I >= end; I = 2 + I)<br>
+ ++I;<br>
+// expected-error@+2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'I'}}<br>
+#pragma omp parallel for<br>
+ for (GoodIter I = begin; I >= end; I = 2 - I)<br>
+ ++I;<br>
+#pragma omp parallel for<br>
+ for (Iter0 I = begin0; I < end0; ++I)<br>
+ ++I;<br>
+// Initializer is constructor without params.<br>
+// expected-warning@+2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}<br>
+#pragma omp parallel for<br>
+ for (Iter0 I; I < end0; ++I)<br>
+ ++I;<br>
+ Iter1 begin1, end1;<br>
+#pragma omp parallel for<br>
+ for (Iter1 I = begin1; I < end1; ++I)<br>
+ ++I;<br>
+// expected-note@+3 {{loop step is expected to be negative due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (Iter1 I = begin1; I >= end1; ++I)<br>
+ ++I;<br>
+// Initializer is constructor with all default params.<br>
+// expected-warning@+2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}<br>
+#pragma omp parallel for<br>
+ for (Iter1 I; I < end1; ++I) {<br>
+ }<br>
+ return 0;<br>
+}<br>
+<br>
+template <typename IT, int ST><br>
+class TC {<br>
+public:<br>
+ int dotest_lt(IT begin, IT end) {<br>
+// expected-note@+3 {{loop step is expected to be positive due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'I' to increase on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (IT I = begin; I < end; I = I + ST) {<br>
+ ++I;<br>
+ }<br>
+// expected-note@+3 {{loop step is expected to be positive due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'I' to increase on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (IT I = begin; I <= end; I += ST) {<br>
+ ++I;<br>
+ }<br>
+#pragma omp parallel for<br>
+ for (IT I = begin; I < end; ++I) {<br>
+ ++I;<br>
+ }<br>
+ }<br>
+<br>
+ static IT step() {<br>
+ return IT(ST);<br>
+ }<br>
+};<br>
+template <typename IT, int ST = 0><br>
+int dotest_gt(IT begin, IT end) {<br>
+// expected-note@+3 2 {{loop step is expected to be negative due to this condition}}<br>
+// expected-error@+2 2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (IT I = begin; I >= end; I = I + ST) {<br>
+ ++I;<br>
+ }<br>
+// expected-note@+3 2 {{loop step is expected to be negative due to this condition}}<br>
+// expected-error@+2 2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (IT I = begin; I >= end; I += ST) {<br>
+ ++I;<br>
+ }<br>
+<br>
+// expected-note@+3 {{loop step is expected to be negative due to this condition}}<br>
+// expected-error@+2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}}<br>
+#pragma omp parallel for<br>
+ for (IT I = begin; I >= end; ++I) {<br>
+ ++I;<br>
+ }<br>
+<br>
+#pragma omp parallel for<br>
+ for (IT I = begin; I < end; I += TC<int, ST>::step()) {<br>
+ ++I;<br>
+ }<br>
+}<br>
+<br>
+void test_with_template() {<br>
+ GoodIter begin, end;<br>
+ TC<GoodIter, 100> t1;<br>
+ TC<GoodIter, -100> t2;<br>
+ t1.dotest_lt(begin, end);<br>
+ t2.dotest_lt(begin, end); // expected-note {{in instantiation of member function 'TC<GoodIter, -100>::dotest_lt' requested here}}<br>
+ dotest_gt(begin, end); // expected-note {{in instantiation of function template specialization 'dotest_gt<GoodIter, 0>' requested here}}<br>
+ dotest_gt<unsigned, -10>(0, 100); // expected-note {{in instantiation of function template specialization 'dotest_gt<unsigned int, -10>' requested here}}<br>
+}<br>
+<br>
+void test_loop_break() {<br>
+ const int N = 100;<br>
+ float a[N], b[N], c[N];<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; i++) {<br>
+ c[i] = a[i] + b[i];<br>
+ for (int j = 0; j < 10; ++j) {<br>
+ if (a[i] > b[j])<br>
+ break; // OK in nested loop<br>
+ }<br>
+ switch (i) {<br>
+ case 1:<br>
+ b[i]++;<br>
+ break;<br>
+ default:<br>
+ break;<br>
+ }<br>
+ if (c[i] > 10)<br>
+ break; // expected-error {{'break' statement cannot be used in OpenMP for loop}}<br>
+<br>
+ if (c[i] > 11)<br>
+ break; // expected-error {{'break' statement cannot be used in OpenMP for loop}}<br>
+ }<br>
+<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; i++) {<br>
+ for (int j = 0; j < 10; j++) {<br>
+ c[i] = a[i] + b[i];<br>
+ if (c[i] > 10) {<br>
+ if (c[i] < 20) {<br>
+ break; // OK<br>
+ }<br>
+ }<br>
+ }<br>
+ }<br>
+}<br>
+<br>
+void test_loop_eh() {<br>
+ const int N = 100;<br>
+ float a[N], b[N], c[N];<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; i++) {<br>
+ c[i] = a[i] + b[i];<br>
+ try {<br>
+ for (int j = 0; j < 10; ++j) {<br>
+ if (a[i] > b[j])<br>
+ throw a[i];<br>
+ }<br>
+ throw a[i];<br>
+ } catch (float f) {<br>
+ if (f > 0.1)<br>
+ throw a[i];<br>
+ return; // expected-error {{cannot return from OpenMP region}}<br>
+ }<br>
+ switch (i) {<br>
+ case 1:<br>
+ b[i]++;<br>
+ break;<br>
+ default:<br>
+ break;<br>
+ }<br>
+ for (int j = 0; j < 10; j++) {<br>
+ if (c[i] > 10)<br>
+ throw c[i];<br>
+ }<br>
+ }<br>
+ if (c[9] > 10)<br>
+ throw c[9]; // OK<br>
+<br>
+#pragma omp parallel for<br>
+ for (int i = 0; i < 10; ++i) {<br>
+ struct S {<br>
+ void g() { throw 0; }<br>
+ };<br>
+ }<br>
+}<br>
+<br>
+void test_loop_firstprivate_lastprivate() {<br>
+ S s(4);<br>
+#pragma omp parallel for lastprivate(s) firstprivate(s)<br>
+ for (int i = 0; i < 16; ++i)<br>
+ ;<br>
+}<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_loop_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_loop_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_loop_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_messages.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_messages.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,70 @@<br>
+// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 -std=c++11 -o - %s<br>
+<br>
+void foo() {<br>
+}<br>
+<br>
+#pragma omp parallel for // expected-error {{unexpected OpenMP directive '#pragma omp parallel for'}}<br>
+<br>
+int main(int argc, char **argv) {<br>
+ #pragma omp parallel for { // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for(int i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for ( // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for(int i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for [ // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for(int i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for ] // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for(int i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for ) // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for(int i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for } // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for(int i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for<br>
+ for(int i = 0; i < argc; ++i) foo();<br>
+ // expected-warning@+1 {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ #pragma omp parallel for unknown()<br>
+ for(int i = 0; i < argc; ++i) foo();<br>
+ L1:<br>
+ for(int i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for<br>
+ for(int i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for<br>
+ for(int i = 0; i < argc; ++i)<br>
+ {<br>
+ goto L1; // expected-error {{use of undeclared label 'L1'}}<br>
+ argc++;<br>
+ }<br>
+<br>
+ for (int i = 0; i < 10; ++i) {<br>
+ switch(argc) {<br>
+ case (0):<br>
+ #pragma omp parallel for<br>
+ for(int i = 0; i < argc; ++i)<br>
+ {<br>
+ foo();<br>
+ break; // expected-error {{'break' statement cannot be used in OpenMP for loop}}<br>
+ continue;<br>
+ }<br>
+ default:<br>
+ break;<br>
+ }<br>
+ }<br>
+ #pragma omp parallel for default(none)<br>
+ for (int i = 0; i < 10; ++i)<br>
+ ++argc; // expected-error {{variable 'argc' must have explicitly specified data sharing attributes}}<br>
+<br>
+ goto L2; // expected-error {{use of undeclared label 'L2'}}<br>
+ #pragma omp parallel for<br>
+ for(int i = 0; i < argc; ++i) L2:foo();<br>
+ #pragma omp parallel for<br>
+ for(int i = 0; i < argc; ++i)<br>
+ {<br>
+ return 1; // expected-error {{cannot return from OpenMP region}}<br>
+ }<br>
+<br>
+ [[]] // expected-error {{an attribute list cannot appear here}}<br>
+ #pragma omp parallel for<br>
+ for (int n = 0; n < 100; ++n) {}<br>
+<br>
+ return 0;<br>
+}<br>
+<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_misc_messages.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_misc_messages.c?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_misc_messages.c?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_misc_messages.c (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_misc_messages.c Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,309 @@<br>
+// RUN: %clang_cc1 -fsyntax-only -fopenmp=libiomp5 -verify %s<br>
+<br>
+// expected-error@+1 {{unexpected OpenMP directive '#pragma omp parallel for'}}<br>
+#pragma omp parallel for<br>
+<br>
+// expected-error@+1 {{unexpected OpenMP directive '#pragma omp parallel for'}}<br>
+#pragma omp parallel for foo<br>
+<br>
+void test_no_clause() {<br>
+ int i;<br>
+#pragma omp parallel for<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+<br>
+// expected-error@+2 {{statement after '#pragma omp parallel for' must be a for loop}}<br>
+#pragma omp parallel for<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 for<br>
+ for (i = 0; i < 16; ++i) {<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>
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+#pragma omp parallel for foo bar<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+}<br>
+<br>
+void test_non_identifiers() {<br>
+ int i, x;<br>
+<br>
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+#pragma omp parallel for;<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+2 {{unexpected OpenMP clause 'linear' in directive '#pragma omp parallel for'}}<br>
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+#pragma omp parallel for linear(x);<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+<br>
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+#pragma omp parallel for private(x);<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+<br>
+// expected-warning@+1 {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+#pragma omp parallel for, private(x);<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+}<br>
+<br>
+extern int foo();<br>
+<br>
+void test_collapse() {<br>
+ int i;<br>
+// expected-error@+1 {{expected '('}}<br>
+#pragma omp parallel for collapse<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}<br>
+#pragma omp parallel for collapse(<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp parallel for collapse()<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}<br>
+#pragma omp parallel for collapse(,<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}<br>
+#pragma omp parallel for collapse(, )<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-warning@+2 {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+// expected-error@+1 {{expected '('}}<br>
+#pragma omp parallel for collapse 4)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+2 {{expected ')'}}<br>
+// expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}<br>
+#pragma omp parallel for collapse(4<br>
+ for (i = 0; i < 16; ++i)<br>
+ ; // expected-error {{expected 4 for loops after '#pragma omp parallel for', but found only 1}}<br>
+// expected-error@+2 {{expected ')'}}<br>
+// expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}<br>
+#pragma omp parallel for collapse(4,<br>
+ for (i = 0; i < 16; ++i)<br>
+ ; // expected-error {{expected 4 for loops after '#pragma omp parallel for', but found only 1}}<br>
+// expected-error@+2 {{expected ')'}}<br>
+// expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}<br>
+#pragma omp parallel for collapse(4, )<br>
+ for (i = 0; i < 16; ++i)<br>
+ ; // expected-error {{expected 4 for loops after '#pragma omp parallel for', but found only 1}}<br>
+// expected-note@+1 {{as specified in 'collapse' clause}}<br>
+#pragma omp parallel for collapse(4)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ; // expected-error {{expected 4 for loops after '#pragma omp parallel for', but found only 1}}<br>
+// expected-error@+2 {{expected ')'}}<br>
+// expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}<br>
+#pragma omp parallel for collapse(4 4)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ; // expected-error {{expected 4 for loops after '#pragma omp parallel for', but found only 1}}<br>
+// expected-error@+2 {{expected ')'}}<br>
+// expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}<br>
+#pragma omp parallel for collapse(4, , 4)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ; // expected-error {{expected 4 for loops after '#pragma omp parallel for', but found only 1}}<br>
+#pragma omp parallel for collapse(4)<br>
+ for (int i1 = 0; i1 < 16; ++i1)<br>
+ for (int i2 = 0; i2 < 16; ++i2)<br>
+ for (int i3 = 0; i3 < 16; ++i3)<br>
+ for (int i4 = 0; i4 < 16; ++i4)<br>
+ foo();<br>
+// expected-error@+2 {{expected ')'}}<br>
+// expected-note@+1 {{to match this '('}} expected-note@+1 {{as specified in 'collapse' clause}}<br>
+#pragma omp parallel for collapse(4, 8)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ; // expected-error {{expected 4 for loops after '#pragma omp parallel for', but found only 1}}<br>
+// expected-error@+1 {{expression is not an integer constant expression}}<br>
+#pragma omp parallel for collapse(2.5)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expression is not an integer constant expression}}<br>
+#pragma omp parallel for collapse(foo())<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{argument to 'collapse' clause must be a positive integer value}}<br>
+#pragma omp parallel for collapse(-5)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{argument to 'collapse' clause must be a positive integer value}}<br>
+#pragma omp parallel for collapse(0)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{argument to 'collapse' clause must be a positive integer value}}<br>
+#pragma omp parallel for collapse(5 - 5)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+}<br>
+<br>
+void test_private() {<br>
+ int i;<br>
+// expected-error@+2 {{expected expression}}<br>
+// expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}<br>
+#pragma omp parallel for private(<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}<br>
+// expected-error@+1 2 {{expected expression}}<br>
+#pragma omp parallel for private(,<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 2 {{expected expression}}<br>
+#pragma omp parallel for private(, )<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp parallel for private()<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp parallel for private(int)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expected variable name}}<br>
+#pragma omp parallel for private(0)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+<br>
+ int x, y, z;<br>
+#pragma omp parallel for private(x)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+#pragma omp parallel for private(x, y)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+#pragma omp parallel for private(x, y, z)<br>
+ for (i = 0; i < 16; ++i) {<br>
+ x = y * i + z;<br>
+ }<br>
+}<br>
+<br>
+void test_lastprivate() {<br>
+ int i;<br>
+// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp parallel for lastprivate(<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+<br>
+// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}<br>
+// expected-error@+1 2 {{expected expression}}<br>
+#pragma omp parallel for lastprivate(,<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 2 {{expected expression}}<br>
+#pragma omp parallel for lastprivate(, )<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp parallel for lastprivate()<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp parallel for lastprivate(int)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expected variable name}}<br>
+#pragma omp parallel for lastprivate(0)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+<br>
+ int x, y, z;<br>
+#pragma omp parallel for lastprivate(x)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+#pragma omp parallel for lastprivate(x, y)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+#pragma omp parallel for lastprivate(x, y, z)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+}<br>
+<br>
+void test_firstprivate() {<br>
+ int i;<br>
+// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp parallel for firstprivate(<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+<br>
+// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}<br>
+// expected-error@+1 2 {{expected expression}}<br>
+#pragma omp parallel for firstprivate(,<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 2 {{expected expression}}<br>
+#pragma omp parallel for firstprivate(, )<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp parallel for firstprivate()<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expected expression}}<br>
+#pragma omp parallel for firstprivate(int)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+// expected-error@+1 {{expected variable name}}<br>
+#pragma omp parallel for firstprivate(0)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+<br>
+ int x, y, z;<br>
+#pragma omp parallel for lastprivate(x) firstprivate(x)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+#pragma omp parallel for lastprivate(x, y) firstprivate(x, y)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+#pragma omp parallel for lastprivate(x, y, z) firstprivate(x, y, z)<br>
+ for (i = 0; i < 16; ++i)<br>
+ ;<br>
+}<br>
+<br>
+void test_loop_messages() {<br>
+ float a[100], b[100], c[100];<br>
+// expected-error@+2 {{variable must be of integer or pointer type}}<br>
+#pragma omp parallel for<br>
+ for (float fi = 0; fi < 10.0; fi++) {<br>
+ c[(int)fi] = a[(int)fi] + b[(int)fi];<br>
+ }<br>
+// expected-error@+2 {{variable must be of integer or pointer type}}<br>
+#pragma omp parallel for<br>
+ for (double fi = 0; fi < 10.0; fi++) {<br>
+ c[(int)fi] = a[(int)fi] + b[(int)fi];<br>
+ }<br>
+}<br>
+<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_misc_messages.c<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_misc_messages.c<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_misc_messages.c<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_num_threads_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_num_threads_messages.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_num_threads_messages.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_num_threads_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_num_threads_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,65 @@<br>
+// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 %s<br>
+<br>
+void foo() {<br>
+}<br>
+<br>
+bool foobool(int argc) {<br>
+ return argc;<br>
+}<br>
+<br>
+struct S1; // expected-note {{declared here}}<br>
+<br>
+template <class T, typename S, int N> // expected-note {{declared here}}<br>
+T tmain(T argc, S **argv) {<br>
+ T i;<br>
+ #pragma omp parallel for num_threads // expected-error {{expected '(' after 'num_threads'}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads () // expected-error {{expected expression}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (argc)) // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads ((argc > 0) ? argv[1] : argv[2]) // expected-error 2 {{expression must have integral or unscoped enumeration type, not 'char *'}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (foobool(argc)), num_threads (true), num_threads (-5) // expected-error 2 {{directive '#pragma omp parallel for' cannot contain more than one 'num_threads' clause}} expected-error {{argument to 'num_threads' clause must be a positive integer value}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (S) // expected-error {{'S' does not refer to a value}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error 2 {{expression must have integral or unscoped enumeration type, not 'char *'}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (argc)<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (N) // expected-error {{argument to 'num_threads' clause must be a positive integer value}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+<br>
+ return argc;<br>
+}<br>
+<br>
+int main(int argc, char **argv) {<br>
+ int i;<br>
+ #pragma omp parallel for num_threads // expected-error {{expected '(' after 'num_threads'}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads () // expected-error {{expected expression}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (argc)) // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (argc > 0 ? argv[1] : argv[2]) // expected-error {{integral }}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (foobool(argc)), num_threads (true), num_threads (-5) // expected-error 2 {{directive '#pragma omp parallel for' cannot contain more than one 'num_threads' clause}} expected-error {{argument to 'num_threads' clause must be a positive integer value}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (S1) // expected-error {{'S1' does not refer to a value}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{expression must have integral or unscoped enumeration type, not 'char *'}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+ #pragma omp parallel for num_threads (num_threads(tmain<int, char, -1>(argc, argv) // expected-error 2 {{expected ')'}} expected-note 2 {{to match this '('}} expected-note {{in instantiation of function template specialization 'tmain<int, char, -1>' requested here}}<br>
+ for (i = 0; i < argc; ++i) foo();<br>
+<br>
+ return tmain<int, char, 3>(argc, argv); // expected-note {{in instantiation of function template specialization 'tmain<int, char, 3>' requested here}}<br>
+}<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_num_threads_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_num_threads_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_num_threads_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,173 @@<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 parallel for private // expected-error {{expected '(' after 'private'}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private() // expected-error {{expected expression}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(argc)<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(S1) // expected-error {{'S1' does not refer to a value}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(a, b) // expected-error {{private variable with incomplete type 'S1'}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(argv[1]) // expected-error {{expected variable name}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(e, g)<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(h) // expected-error {{threadprivate or thread local variable cannot be private}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for nowait // expected-error {{unexpected OpenMP clause 'nowait' in directive '#pragma omp parallel for'}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel<br>
+ {<br>
+ int v = 0;<br>
+ int i;<br>
+#pragma omp parallel for private(i)<br>
+ for (int k = 0; k < argc; ++k) {<br>
+ i = k;<br>
+ v += i;<br>
+ }<br>
+ }<br>
+#pragma omp parallel shared(i)<br>
+#pragma omp parallel private(i)<br>
+#pragma omp parallel for private(j) // expected-error {{arguments of OpenMP clause 'private' cannot be of reference type}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(i)<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<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 parallel for private // expected-error {{expected '(' after 'private'}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private() // expected-error {{expected expression}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(argc)<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(S1) // expected-error {{'S1' does not refer to a value}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(a, b) // expected-error {{private variable with incomplete type 'S1'}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(argv[1]) // expected-error {{expected variable name}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(e, g) // expected-error 2 {{private variable must have an accessible, unambiguous default constructor}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(h) // expected-error {{threadprivate or thread local variable cannot be private}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for nowait // expected-error {{unexpected OpenMP clause 'nowait' in directive '#pragma omp parallel for'}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel<br>
+ {<br>
+ int i;<br>
+#pragma omp parallel for private(i)<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+ }<br>
+#pragma omp parallel shared(i)<br>
+#pragma omp parallel private(i)<br>
+#pragma omp parallel for private(j) // expected-error {{arguments of OpenMP clause 'private' cannot be of reference type}}<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+#pragma omp parallel for private(i)<br>
+ for (int k = 0; k < argc; ++k)<br>
+ ++k;<br>
+<br>
+ return 0;<br>
+}<br>
+<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_proc_bind_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_proc_bind_messages.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_proc_bind_messages.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_proc_bind_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_proc_bind_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,35 @@<br>
+// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 -o - %s<br>
+<br>
+void foo();<br>
+<br>
+int main(int argc, char **argv) {<br>
+ int i;<br>
+#pragma omp parallel for proc_bind // expected-error {{expected '(' after 'proc_bind'}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for proc_bind( // expected-error {{expected 'master', 'close' or 'spread' in OpenMP clause 'proc_bind'}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for proc_bind() // expected-error {{expected 'master', 'close' or 'spread' in OpenMP clause 'proc_bind'}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for proc_bind(master // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for proc_bind(close), proc_bind(spread) // expected-error {{directive '#pragma omp parallel for' cannot contain more than one 'proc_bind' clause}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+#pragma omp parallel for proc_bind(x) // expected-error {{expected 'master', 'close' or 'spread' in OpenMP clause 'proc_bind'}}<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+<br>
+#pragma omp parallel for proc_bind(master)<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+<br>
+#pragma omp parallel proc_bind(close)<br>
+#pragma omp parallel for proc_bind(spread)<br>
+ for (i = 0; i < argc; ++i)<br>
+ foo();<br>
+ return 0;<br>
+}<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_proc_bind_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_proc_bind_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_proc_bind_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,295 @@<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 for reduction // expected-error {{expected '(' after 'reduction'}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction( // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(- // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction() // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(*) // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(\) // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(& : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{variable of type 'float' is not valid for specified reduction operation}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for 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>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(|| : argc ? i : argc) // expected-error 2 {{expected variable name}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(foo : argc) //expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(&& : argc)<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(^ : T) // expected-error {{'T' does not refer to a value}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(+ : a, b, c, d, f) // expected-error {{reduction variable with incomplete type 'S1'}} expected-error 3 {{const-qualified variable cannot be reduction}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for 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>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(max : qa[1]) // expected-error 2 {{expected variable name}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(+ : ba) // expected-error {{a reduction variable with array type 'const S2 [5]'}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(* : ca) // expected-error {{a reduction variable with array type 'const S3 [5]'}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for 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>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(^ : fl) // expected-error {{variable of type 'float' is not valid for specified reduction operation}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(&& : S2::S2s) // expected-error {{shared variable cannot be reduction}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(&& : S2::S2sc) // expected-error {{const-qualified variable cannot be reduction}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(+ : h, k) // expected-error {{threadprivate or thread local variable cannot be reduction}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(+ : o) // expected-error {{variable of type 'class S6' is not valid for specified reduction operation}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for private(i), reduction(+ : j), reduction(+ : q) // expected-error 4 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel private(k)<br>
+#pragma omp parallel for reduction(+ : p), reduction(+ : p) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(+ : p), reduction(+ : p) // expected-error 3 {{variable can appear only once in OpenMP 'reduction' clause}} expected-note 3 {{previously referenced here}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(+ : r) // expected-error 2 {{const-qualified variable cannot be reduction}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel shared(i)<br>
+#pragma omp parallel reduction(min : i)<br>
+#pragma omp parallel for reduction(max : j) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel private(fl)<br>
+#pragma omp parallel for reduction(+ : fl)<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel reduction(* : fl)<br>
+#pragma omp parallel for reduction(+ : fl)<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<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 for reduction // expected-error {{expected '(' after 'reduction'}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction( // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(- // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction() // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(*) // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(\) // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(foo : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(|| : argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(~ : argc) // expected-error {{expected unqualified-id}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(&& : argc)<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(^ : S1) // expected-error {{'S1' does not refer to a value}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(+ : a, b, c, d, f) // expected-error {{reduction variable with incomplete type 'S1'}} expected-error 2 {{const-qualified variable cannot be reduction}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for 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>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(max : argv[1]) // expected-error {{expected variable name}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(+ : ba) // expected-error {{a reduction variable with array type 'const S2 [5]'}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(* : ca) // expected-error {{a reduction variable with array type 'const S3 [5]'}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(- : da) // expected-error {{a reduction variable with array type 'const int [5]'}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(^ : fl) // expected-error {{variable of type 'float' is not valid for specified reduction operation}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(&& : S2::S2s) // expected-error {{shared variable cannot be reduction}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(&& : S2::S2sc) // expected-error {{const-qualified variable cannot be reduction}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for 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>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(+ : h, k) // expected-error {{threadprivate or thread local variable cannot be reduction}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(+ : o) // expected-error {{variable of type 'class S6' is not valid for specified reduction operation}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for private(i), reduction(+ : j), reduction(+ : q) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel private(k)<br>
+#pragma omp parallel for reduction(+ : p), reduction(+ : p) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(+ : p), reduction(+ : p) // expected-error {{variable can appear only once in OpenMP 'reduction' clause}} expected-note {{previously referenced here}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel for reduction(+ : r) // expected-error {{const-qualified variable cannot be reduction}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel shared(i)<br>
+#pragma omp parallel reduction(min : i)<br>
+#pragma omp parallel for reduction(max : j) // expected-error {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel private(fl)<br>
+#pragma omp parallel for reduction(+ : fl)<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<br>
+#pragma omp parallel reduction(* : fl)<br>
+#pragma omp parallel for reduction(+ : fl)<br>
+ for (int i = 0; i < 10; ++i)<br>
+ foo();<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/parallel_for_reduction_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Added: cfe/trunk/test/OpenMP/parallel_for_schedule_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_schedule_messages.cpp?rev=212453&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_schedule_messages.cpp?rev=212453&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/parallel_for_schedule_messages.cpp (added)<br>
+++ cfe/trunk/test/OpenMP/parallel_for_schedule_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -0,0 +1,91 @@<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 {{declared here}}<br>
+<br>
+template <class T, typename S, int N, int ST> // expected-note {{declared here}}<br>
+T tmain(T argc, S **argv) {<br>
+ #pragma omp parallel for schedule // expected-error {{expected '(' after 'schedule'}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for schedule ( // expected-error {{expected 'static', 'dynamic', 'guided', 'auto' or 'runtime' in OpenMP clause 'schedule'}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for schedule () // expected-error {{expected 'static', 'dynamic', 'guided', 'auto' or 'runtime' in OpenMP clause 'schedule'}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for schedule (auto // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for schedule (auto_dynamic // expected-error {{expected 'static', 'dynamic', 'guided', 'auto' or 'runtime' in OpenMP clause 'schedule'}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for schedule (auto, // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for schedule (runtime, 3) // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ // expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}<br>
+ #pragma omp parallel for schedule (guided argc<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ // expected-error@+1 2 {{argument to 'schedule' clause must be a positive integer value}}<br>
+ #pragma omp parallel for schedule (static, ST // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for schedule (dynamic, 1)) // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for schedule (guided, (ST > 0) ? 1 + ST : 2)<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ // expected-error@+2 2 {{directive '#pragma omp parallel for' cannot contain more than one 'schedule' clause}}<br>
+ // expected-error@+1 {{argument to 'schedule' clause must be a positive integer value}}<br>
+ #pragma omp parallel for schedule (static, foobool(argc)), schedule (dynamic, true), schedule (guided, -5)<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for schedule (static, S) // expected-error {{'S' does not refer to a value}} expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ // expected-error@+1 2 {{expression must have integral or unscoped enumeration type, not 'char *'}}<br>
+ #pragma omp parallel for schedule (guided, argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for schedule (dynamic, 1)<br>
+ for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ #pragma omp parallel for schedule (static, N) // expected-error {{argument to 'schedule' clause must be a positive integer value}}<br>
+ for (T i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];<br>
+ return argc;<br>
+}<br>
+<br>
+int main(int argc, char **argv) {<br>
+ #pragma omp parallel for schedule // expected-error {{expected '(' after 'schedule'}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for schedule ( // expected-error {{expected 'static', 'dynamic', 'guided', 'auto' or 'runtime' in OpenMP clause 'schedule'}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for schedule () // expected-error {{expected 'static', 'dynamic', 'guided', 'auto' or 'runtime' in OpenMP clause 'schedule'}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for schedule (auto // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for schedule (auto_dynamic // expected-error {{expected 'static', 'dynamic', 'guided', 'auto' or 'runtime' in OpenMP clause 'schedule'}} expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for schedule (auto, // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for schedule (runtime, 3) // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for schedule (guided, 4 // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for schedule (static, 2+2)) // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for schedule (dynamic, foobool(1) > 0 ? 1 : 2)<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ // expected-error@+2 2 {{directive '#pragma omp parallel for' cannot contain more than one 'schedule' clause}}<br>
+ // expected-error@+1 {{argument to 'schedule' clause must be a positive integer value}}<br>
+ #pragma omp parallel for schedule (guided, foobool(argc)), schedule (static, true), schedule (dynamic, -5)<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ #pragma omp parallel for schedule (guided, S1) // expected-error {{'S1' does not refer to a value}} expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ // expected-error@+1 {{expression must have integral or unscoped enumeration type, not 'char *'}}<br>
+ #pragma omp parallel for schedule (static, argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];<br>
+ // expected-error@+3 {{statement after '#pragma omp parallel for' must be a for loop}}<br>
+ // expected-note@+1 {{in instantiation of function template specialization 'tmain<int, char, -1, -2>' requested here}}<br>
+ #pragma omp parallel for schedule(dynamic, schedule(tmain<int, char, -1, -2>(argc, argv) // expected-error {{expected ')'}} expected-note {{to match this '('}}<br>
+ foo();<br>
+ // expected-note@+1 {{in instantiation of function template specialization 'tmain<int, char, 1, 0>' requested here}}<br>
+ return tmain<int, char, 1, 0>(argc, argv);<br>
+}<br>
+<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_schedule_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:eol-style = native<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_schedule_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:keywords = Author Date Id Rev URL<br>
<br>
Propchange: cfe/trunk/test/OpenMP/parallel_for_schedule_messages.cpp<br>
------------------------------------------------------------------------------<br>
svn:mime-type = text/plain<br>
<br>
Modified: cfe/trunk/test/OpenMP/simd_lastprivate_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/simd_lastprivate_messages.cpp?rev=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/simd_lastprivate_messages.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/simd_lastprivate_messages.cpp (original)<br>
+++ cfe/trunk/test/OpenMP/simd_lastprivate_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -193,8 +193,8 @@ int main(int argc, char **argv) {<br>
#pragma omp simd private(xa), lastprivate(xa) // expected-error {{private variable cannot be lastprivate}} expected-note {{defined as private}}<br>
for (i = 0; i < argc; ++i)<br>
foo();<br>
-#pragma omp simd lastprivate(i)<br>
- for (i = 0; i < argc; ++i)<br>
+#pragma omp simd lastprivate(i) // expected-note {{defined as lastprivate}}<br>
+ for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable in the associated loop of 'omp simd' directive may not be lastprivate, predetermined as linear}}<br>
foo();<br>
#pragma omp parallel private(xa)<br>
#pragma omp simd lastprivate(xa) // OK: may be lastprivate<br>
<br>
Modified: cfe/trunk/test/OpenMP/simd_loop_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/simd_loop_messages.cpp?rev=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/simd_loop_messages.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/simd_loop_messages.cpp (original)<br>
+++ cfe/trunk/test/OpenMP/simd_loop_messages.cpp Mon Jul 7 08:01:15 2014<br>
@@ -227,14 +227,14 @@ int test_iteration_spaces() {<br>
c[ii] = a[ii];<br>
<br>
// expected-note@+2 {{defined as private}}<br>
- // expected-error@+2 {{loop iteration variable may not be private}}<br>
+ // expected-error@+2 {{loop iteration variable in the associated loop of 'omp simd' directive may not be private, predetermined as linear}}<br>
#pragma omp simd private(ii)<br>
for (ii = 0; ii < 10; ii++)<br>
c[ii] = a[ii];<br>
<br>
// expected-error@+3 {{unexpected OpenMP clause 'shared' in directive '#pragma omp simd'}}<br>
// expected-note@+2 {{defined as shared}}<br>
- // expected-error@+2 {{loop iteration variable may not be shared}}<br>
+ // expected-error@+2 {{loop iteration variable in the associated loop of 'omp simd' directive may not be shared, predetermined as linear}}<br>
#pragma omp simd shared(ii)<br>
for (ii = 0; ii < 10; ii++)<br>
c[ii] = a[ii];<br>
@@ -243,14 +243,15 @@ int test_iteration_spaces() {<br>
for (ii = 0; ii < 10; ii++)<br>
c[ii] = a[ii];<br>
<br>
- #pragma omp simd lastprivate(ii)<br>
+ #pragma omp simd lastprivate(ii) linear(jj) collapse(2) // expected-note {{defined as linear}}<br>
for (ii = 0; ii < 10; ii++)<br>
- c[ii] = a[ii];<br>
+ for (jj = 0; jj < 10; jj++) // expected-error {{loop iteration variable in the associated loop of 'omp simd' directive may not be linear, predetermined as lastprivate}}<br>
+ c[ii] = a[jj];<br>
<br>
<br>
#pragma omp parallel<br>
{<br>
- // expected-error@+2 {{loop iteration variable may not be threadprivate or thread local}}<br>
+ // expected-error@+2 {{loop iteration variable in the associated loop of 'omp simd' directive may not be threadprivate or thread local, predetermined as linear}}<br>
#pragma omp simd<br>
for (sii = 0; sii < 10; sii+=1)<br>
c[sii] = a[sii];<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/libclang/CIndex.cpp (original)<br>
+++ cfe/trunk/tools/libclang/CIndex.cpp Mon Jul 7 08:01:15 2014<br>
@@ -1860,6 +1860,7 @@ public:<br>
void VisitOMPSectionsDirective(const OMPSectionsDirective *D);<br>
void VisitOMPSectionDirective(const OMPSectionDirective *D);<br>
void VisitOMPSingleDirective(const OMPSingleDirective *D);<br>
+ void VisitOMPParallelForDirective(const OMPParallelForDirective *D);<br>
<br>
private:<br>
void AddDeclarationNameInfo(const Stmt *S);<br>
@@ -2311,6 +2312,11 @@ void EnqueueVisitor::VisitOMPSingleDirec<br>
VisitOMPExecutableDirective(D);<br>
}<br>
<br>
+void<br>
+EnqueueVisitor::VisitOMPParallelForDirective(const OMPParallelForDirective *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>
@@ -3996,6 +4002,8 @@ CXString clang_getCursorKindSpelling(enu<br>
return cxstring::createRef("OMPSectionDirective");<br>
case CXCursor_OMPSingleDirective:<br>
return cxstring::createRef("OMPSingleDirective");<br>
+ case CXCursor_OMPParallelForDirective:<br>
+ return cxstring::createRef("OMPParallelForDirective");<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=212453&r1=212452&r2=212453&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CXCursor.cpp?rev=212453&r1=212452&r2=212453&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/libclang/CXCursor.cpp (original)<br>
+++ cfe/trunk/tools/libclang/CXCursor.cpp Mon Jul 7 08:01:15 2014<br>
@@ -535,6 +535,9 @@ CXCursor cxcursor::MakeCXCursor(const St<br>
case Stmt::OMPSingleDirectiveClass:<br>
K = CXCursor_OMPSingleDirective;<br>
break;<br>
+ case Stmt::OMPParallelForDirectiveClass:<br>
+ K = CXCursor_OMPParallelForDirective;<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>