r211113 - Revert "[OPENMP] Initial support for '#pragma omp for'."
Rafael Espindola
rafael.espindola at gmail.com
Tue Jun 17 10:20:53 PDT 2014
Author: rafael
Date: Tue Jun 17 12:20:53 2014
New Revision: 211113
URL: http://llvm.org/viewvc/llvm-project?rev=211113&view=rev
Log:
Revert "[OPENMP] Initial support for '#pragma omp for'."
This reverts commit r211096. Looks like it broke the msvc build:
SemaOpenMP.cpp(140) : error C4519: default template arguments are only allowed on a class template
Removed:
cfe/trunk/test/OpenMP/for_ast_print.cpp
cfe/trunk/test/OpenMP/for_collapse_messages.cpp
cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp
cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp
cfe/trunk/test/OpenMP/for_loop_messages.cpp
cfe/trunk/test/OpenMP/for_misc_messages.c
cfe/trunk/test/OpenMP/for_private_messages.cpp
cfe/trunk/test/OpenMP/for_reduction_messages.cpp
Modified:
cfe/trunk/include/clang-c/Index.h
cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h
cfe/trunk/include/clang/AST/RecursiveASTVisitor.h
cfe/trunk/include/clang/AST/StmtOpenMP.h
cfe/trunk/include/clang/Basic/OpenMPKinds.def
cfe/trunk/include/clang/Basic/OpenMPKinds.h
cfe/trunk/include/clang/Basic/StmtNodes.td
cfe/trunk/include/clang/Sema/Sema.h
cfe/trunk/include/clang/Serialization/ASTBitCodes.h
cfe/trunk/lib/AST/Stmt.cpp
cfe/trunk/lib/AST/StmtPrinter.cpp
cfe/trunk/lib/AST/StmtProfile.cpp
cfe/trunk/lib/Basic/OpenMPKinds.cpp
cfe/trunk/lib/CodeGen/CGStmt.cpp
cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp
cfe/trunk/lib/CodeGen/CodeGenFunction.h
cfe/trunk/lib/Parse/ParseOpenMP.cpp
cfe/trunk/lib/Sema/SemaOpenMP.cpp
cfe/trunk/lib/Sema/TreeTransform.h
cfe/trunk/lib/Serialization/ASTReaderStmt.cpp
cfe/trunk/lib/Serialization/ASTWriterStmt.cpp
cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp
cfe/trunk/test/OpenMP/parallel_reduction_messages.cpp
cfe/trunk/test/OpenMP/simd_loop_messages.cpp
cfe/trunk/tools/libclang/CIndex.cpp
cfe/trunk/tools/libclang/CXCursor.cpp
Modified: cfe/trunk/include/clang-c/Index.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang-c/Index.h?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/include/clang-c/Index.h (original)
+++ cfe/trunk/include/clang-c/Index.h Tue Jun 17 12:20:53 2014
@@ -2139,11 +2139,7 @@ enum CXCursorKind {
*/
CXCursor_OMPSimdDirective = 233,
- /** \brief OpenMP for directive.
- */
- CXCursor_OMPForDirective = 234,
-
- CXCursor_LastStmt = CXCursor_OMPForDirective,
+ CXCursor_LastStmt = CXCursor_OMPSimdDirective,
/**
* \brief Cursor that represents the translation unit itself.
Modified: cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h (original)
+++ cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h Tue Jun 17 12:20:53 2014
@@ -2285,11 +2285,6 @@ DEF_TRAVERSE_STMT(OMPSimdDirective, {
return false;
})
-DEF_TRAVERSE_STMT(OMPForDirective, {
- if (!TraverseOMPExecutableDirective(S))
- return false;
-})
-
// OpenMP clauses.
template <typename Derived>
bool RecursiveASTVisitor<Derived>::TraverseOMPClause(OMPClause *C) {
Modified: cfe/trunk/include/clang/AST/RecursiveASTVisitor.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/RecursiveASTVisitor.h?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/RecursiveASTVisitor.h (original)
+++ cfe/trunk/include/clang/AST/RecursiveASTVisitor.h Tue Jun 17 12:20:53 2014
@@ -2307,11 +2307,6 @@ DEF_TRAVERSE_STMT(OMPSimdDirective, {
return false;
})
-DEF_TRAVERSE_STMT(OMPForDirective, {
- if (!TraverseOMPExecutableDirective(S))
- return false;
-})
-
// OpenMP clauses.
template <typename Derived>
bool RecursiveASTVisitor<Derived>::TraverseOMPClause(OMPClause *C) {
Modified: cfe/trunk/include/clang/AST/StmtOpenMP.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/StmtOpenMP.h?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/StmtOpenMP.h (original)
+++ cfe/trunk/include/clang/AST/StmtOpenMP.h Tue Jun 17 12:20:53 2014
@@ -255,74 +255,6 @@ public:
}
};
-/// \brief This represents '#pragma omp for' directive.
-///
-/// \code
-/// #pragma omp for private(a,b) reduction(+:c,d)
-/// \endcode
-/// In this example directive '#pragma omp for' has clauses 'private' with the
-/// variables 'a' and 'b' and 'reduction' with operator '+' and variables 'c'
-/// and 'd'.
-///
-class OMPForDirective : public OMPExecutableDirective {
- friend class ASTStmtReader;
- /// \brief Number of collapsed loops as specified by 'collapse' clause.
- unsigned CollapsedNum;
- /// \brief Build directive with the given start and end location.
- ///
- /// \param StartLoc Starting location of the directive kind.
- /// \param EndLoc Ending location of the directive.
- /// \param CollapsedNum Number of collapsed nested loops.
- /// \param NumClauses Number of clauses.
- ///
- OMPForDirective(SourceLocation StartLoc, SourceLocation EndLoc,
- unsigned CollapsedNum, unsigned NumClauses)
- : OMPExecutableDirective(this, OMPForDirectiveClass, OMPD_for, StartLoc,
- EndLoc, NumClauses, 1),
- CollapsedNum(CollapsedNum) {}
-
- /// \brief Build an empty directive.
- ///
- /// \param CollapsedNum Number of collapsed nested loops.
- /// \param NumClauses Number of clauses.
- ///
- explicit OMPForDirective(unsigned CollapsedNum, unsigned NumClauses)
- : OMPExecutableDirective(this, OMPForDirectiveClass, OMPD_for,
- SourceLocation(), SourceLocation(), NumClauses,
- 1),
- CollapsedNum(CollapsedNum) {}
-
-public:
- /// \brief Creates directive with a list of \a Clauses.
- ///
- /// \param C AST context.
- /// \param StartLoc Starting location of the directive kind.
- /// \param EndLoc Ending Location of the directive.
- /// \param Clauses List of clauses.
- /// \param AssociatedStmt Statement, associated with the directive.
- ///
- static OMPForDirective *Create(const ASTContext &C, SourceLocation StartLoc,
- SourceLocation EndLoc,
- ArrayRef<OMPClause *> Clauses,
- Stmt *AssociatedStmt);
-
- /// \brief Creates an empty directive with the place
- /// for \a NumClauses clauses.
- ///
- /// \param C AST context.
- /// \param CollapsedNum Number of collapsed nested loops.
- /// \param NumClauses Number of clauses.
- ///
- static OMPForDirective *CreateEmpty(const ASTContext &C, unsigned NumClauses,
- unsigned CollapsedNum, EmptyShell);
-
- unsigned getCollapsedNumber() const { return CollapsedNum; }
-
- static bool classof(const Stmt *T) {
- return T->getStmtClass() == OMPForDirectiveClass;
- }
-};
-
} // end namespace clang
#endif
Modified: cfe/trunk/include/clang/Basic/OpenMPKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.def?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/OpenMPKinds.def (original)
+++ cfe/trunk/include/clang/Basic/OpenMPKinds.def Tue Jun 17 12:20:53 2014
@@ -24,9 +24,6 @@
#ifndef OPENMP_SIMD_CLAUSE
# define OPENMP_SIMD_CLAUSE(Name)
#endif
-#ifndef OPENMP_FOR_CLAUSE
-# define OPENMP_FOR_CLAUSE(Name)
-#endif
#ifndef OPENMP_DEFAULT_KIND
# define OPENMP_DEFAULT_KIND(Name)
#endif
@@ -39,7 +36,6 @@ OPENMP_DIRECTIVE(threadprivate)
OPENMP_DIRECTIVE(parallel)
OPENMP_DIRECTIVE(task)
OPENMP_DIRECTIVE(simd)
-OPENMP_DIRECTIVE(for)
// OpenMP clauses.
OPENMP_CLAUSE(if, OMPIfClause)
@@ -76,13 +72,6 @@ OPENMP_SIMD_CLAUSE(aligned)
OPENMP_SIMD_CLAUSE(safelen)
OPENMP_SIMD_CLAUSE(collapse)
-// TODO more clauses allowed for directive 'omp for'.
-OPENMP_FOR_CLAUSE(private)
-OPENMP_FOR_CLAUSE(lastprivate)
-OPENMP_FOR_CLAUSE(firstprivate)
-OPENMP_FOR_CLAUSE(reduction)
-OPENMP_FOR_CLAUSE(collapse)
-
// Static attributes for 'default' clause.
OPENMP_DEFAULT_KIND(none)
OPENMP_DEFAULT_KIND(shared)
@@ -98,5 +87,4 @@ OPENMP_PROC_BIND_KIND(spread)
#undef OPENMP_CLAUSE
#undef OPENMP_PARALLEL_CLAUSE
#undef OPENMP_SIMD_CLAUSE
-#undef OPENMP_FOR_CLAUSE
Modified: cfe/trunk/include/clang/Basic/OpenMPKinds.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.h?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/OpenMPKinds.h (original)
+++ cfe/trunk/include/clang/Basic/OpenMPKinds.h Tue Jun 17 12:20:53 2014
@@ -64,43 +64,6 @@ const char *getOpenMPSimpleClauseTypeNam
bool isAllowedClauseForDirective(OpenMPDirectiveKind DKind,
OpenMPClauseKind CKind);
-/// \brief Checks if the specified directive is a directive with an associated
-/// loop construct.
-/// \param DKind Specified directive.
-/// \return true - the directive is a loop-associated directive like 'omp simd'
-/// or 'omp for' directive, otherwise - false.
-bool isOpenMPLoopDirective(OpenMPDirectiveKind DKind);
-
-/// \brief Checks if the specified directive is a worksharing directive.
-/// \param DKind Specified directive.
-/// \return true - the directive is a worksharing directive like 'omp for',
-/// otherwise - false.
-bool isOpenMPWorksharingDirective(OpenMPDirectiveKind DKind);
-
-/// \brief Checks if the specified directive is a parallel-kind directive.
-/// \param DKind Specified directive.
-/// \return true - the directive is a parallel-like directive like 'omp
-/// parallel', otherwise - false.
-bool isOpenMPParallelDirective(OpenMPDirectiveKind DKind);
-
-/// \brief Checks if the specified directive is a simd directive.
-/// \param DKind Specified directive.
-/// \return true - the directive is a simd directive like 'omp simd',
-/// otherwise - false.
-bool isOpenMPSimdDirective(OpenMPDirectiveKind DKind);
-
-/// \brief Checks if the specified clause is one of private clauses like
-/// 'private', 'firstprivate', 'reduction' etc..
-/// \param Kind Clause kind.
-/// \return true - the clause is a private clause, otherwise - false.
-bool isOpenMPPrivate(OpenMPClauseKind Kind);
-
-/// \brief Checks if the specified clause is one of threadprivate clauses like
-/// 'threadprivate', 'copyin' or 'copyprivate'.
-/// \param Kind Clause kind.
-/// \return true - the clause is a threadprivate clause, otherwise - false.
-bool isOpenMPThreadPrivate(OpenMPClauseKind Kind);
-
}
#endif
Modified: cfe/trunk/include/clang/Basic/StmtNodes.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/StmtNodes.td?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/StmtNodes.td (original)
+++ cfe/trunk/include/clang/Basic/StmtNodes.td Tue Jun 17 12:20:53 2014
@@ -179,4 +179,3 @@ def AsTypeExpr : DStmt<Expr>;
def OMPExecutableDirective : Stmt<1>;
def OMPParallelDirective : DStmt<OMPExecutableDirective>;
def OMPSimdDirective : DStmt<OMPExecutableDirective>;
-def OMPForDirective : DStmt<OMPExecutableDirective>;
Modified: cfe/trunk/include/clang/Sema/Sema.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/include/clang/Sema/Sema.h (original)
+++ cfe/trunk/include/clang/Sema/Sema.h Tue Jun 17 12:20:53 2014
@@ -7312,11 +7312,6 @@ public:
Stmt *AStmt,
SourceLocation StartLoc,
SourceLocation EndLoc);
- /// \brief Called on well-formed '\#pragma omp for' after parsing
- /// of the associated statement.
- StmtResult ActOnOpenMPForDirective(ArrayRef<OMPClause *> Clauses, Stmt *AStmt,
- SourceLocation StartLoc,
- SourceLocation EndLoc);
OMPClause *ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind,
Expr *Expr,
Modified: cfe/trunk/include/clang/Serialization/ASTBitCodes.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTBitCodes.h?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/include/clang/Serialization/ASTBitCodes.h (original)
+++ cfe/trunk/include/clang/Serialization/ASTBitCodes.h Tue Jun 17 12:20:53 2014
@@ -1341,7 +1341,6 @@ namespace clang {
// OpenMP drectives
STMT_OMP_PARALLEL_DIRECTIVE,
STMT_OMP_SIMD_DIRECTIVE,
- STMT_OMP_FOR_DIRECTIVE,
// ARC
EXPR_OBJC_BRIDGED_CAST, // ObjCBridgedCastExpr
Modified: cfe/trunk/lib/AST/Stmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Stmt.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/lib/AST/Stmt.cpp (original)
+++ cfe/trunk/lib/AST/Stmt.cpp Tue Jun 17 12:20:53 2014
@@ -1361,30 +1361,3 @@ OMPSimdDirective *OMPSimdDirective::Crea
return new (Mem) OMPSimdDirective(CollapsedNum, NumClauses);
}
-OMPForDirective *OMPForDirective::Create(const ASTContext &C,
- SourceLocation StartLoc,
- SourceLocation EndLoc,
- ArrayRef<OMPClause *> Clauses,
- Stmt *AssociatedStmt) {
- unsigned Size = llvm::RoundUpToAlignment(sizeof(OMPForDirective),
- llvm::alignOf<OMPClause *>());
- void *Mem =
- C.Allocate(Size + sizeof(OMPClause *) * Clauses.size() + sizeof(Stmt *));
- OMPForDirective *Dir =
- new (Mem) OMPForDirective(StartLoc, EndLoc, 1, Clauses.size());
- Dir->setClauses(Clauses);
- Dir->setAssociatedStmt(AssociatedStmt);
- return Dir;
-}
-
-OMPForDirective *OMPForDirective::CreateEmpty(const ASTContext &C,
- unsigned NumClauses,
- unsigned CollapsedNum,
- EmptyShell) {
- unsigned Size = llvm::RoundUpToAlignment(sizeof(OMPForDirective),
- llvm::alignOf<OMPClause *>());
- void *Mem =
- C.Allocate(Size + sizeof(OMPClause *) * NumClauses + sizeof(Stmt *));
- return new (Mem) OMPForDirective(CollapsedNum, NumClauses);
-}
-
Modified: cfe/trunk/lib/AST/StmtPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtPrinter.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/lib/AST/StmtPrinter.cpp (original)
+++ cfe/trunk/lib/AST/StmtPrinter.cpp Tue Jun 17 12:20:53 2014
@@ -764,11 +764,6 @@ void StmtPrinter::VisitOMPSimdDirective(
PrintOMPExecutableDirective(Node);
}
-void StmtPrinter::VisitOMPForDirective(OMPForDirective *Node) {
- Indent() << "#pragma omp for ";
- PrintOMPExecutableDirective(Node);
-}
-
//===----------------------------------------------------------------------===//
// Expr printing methods.
//===----------------------------------------------------------------------===//
Modified: cfe/trunk/lib/AST/StmtProfile.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtProfile.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/lib/AST/StmtProfile.cpp (original)
+++ cfe/trunk/lib/AST/StmtProfile.cpp Tue Jun 17 12:20:53 2014
@@ -347,10 +347,6 @@ void StmtProfiler::VisitOMPSimdDirective
VisitOMPExecutableDirective(S);
}
-void StmtProfiler::VisitOMPForDirective(const OMPForDirective *S) {
- VisitOMPExecutableDirective(S);
-}
-
void StmtProfiler::VisitExpr(const Expr *S) {
VisitStmt(S);
}
Modified: cfe/trunk/lib/Basic/OpenMPKinds.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/OpenMPKinds.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/OpenMPKinds.cpp (original)
+++ cfe/trunk/lib/Basic/OpenMPKinds.cpp Tue Jun 17 12:20:53 2014
@@ -160,15 +160,6 @@ bool clang::isAllowedClauseForDirective(
break;
}
break;
- case OMPD_for:
- switch (CKind) {
-#define OPENMP_FOR_CLAUSE(Name) \
- case OMPC_##Name: return true;
-#include "clang/Basic/OpenMPKinds.def"
- default:
- break;
- }
- break;
case OMPD_unknown:
case OMPD_threadprivate:
case OMPD_task:
@@ -176,31 +167,3 @@ bool clang::isAllowedClauseForDirective(
}
return false;
}
-
-bool clang::isOpenMPLoopDirective(OpenMPDirectiveKind DKind) {
- return DKind == OMPD_simd || DKind == OMPD_for; // TODO add next directives.
-}
-
-bool clang::isOpenMPWorksharingDirective(OpenMPDirectiveKind DKind) {
- return DKind == OMPD_for; // TODO add next directives.
-}
-
-bool clang::isOpenMPParallelDirective(OpenMPDirectiveKind DKind) {
- return DKind == OMPD_parallel; // TODO add next directives.
-}
-
-bool clang::isOpenMPSimdDirective(OpenMPDirectiveKind DKind) {
- return DKind == OMPD_simd; // TODO || DKind == OMPD_for_simd || ...
-}
-
-bool clang::isOpenMPPrivate(OpenMPClauseKind Kind) {
- return Kind == OMPC_private || Kind == OMPC_firstprivate ||
- Kind == OMPC_lastprivate || Kind == OMPC_linear ||
- Kind == OMPC_reduction; // TODO add next clauses like 'reduction'.
-}
-
-bool clang::isOpenMPThreadPrivate(OpenMPClauseKind Kind) {
- return Kind == OMPC_threadprivate ||
- Kind == OMPC_copyin; // TODO add next clauses like 'copyprivate'.
-}
-
Modified: cfe/trunk/lib/CodeGen/CGStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmt.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGStmt.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGStmt.cpp Tue Jun 17 12:20:53 2014
@@ -179,9 +179,6 @@ void CodeGenFunction::EmitStmt(const Stm
case Stmt::OMPSimdDirectiveClass:
EmitOMPSimdDirective(cast<OMPSimdDirective>(*S));
break;
- case Stmt::OMPForDirectiveClass:
- EmitOMPForDirective(cast<OMPForDirective>(*S));
- break;
}
}
Modified: cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp Tue Jun 17 12:20:53 2014
@@ -76,6 +76,3 @@ void CodeGenFunction::EmitOMPSimdDirecti
EmitStmt(Body);
}
-void CodeGenFunction::EmitOMPForDirective(const OMPForDirective &) {
- llvm_unreachable("Not supported yet.");
-}
Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Tue Jun 17 12:20:53 2014
@@ -1902,7 +1902,6 @@ public:
void EmitOMPParallelDirective(const OMPParallelDirective &S);
void EmitOMPSimdDirective(const OMPSimdDirective &S);
- void EmitOMPForDirective(const OMPForDirective &S);
//===--------------------------------------------------------------------===//
// LValue Expression Emission
Modified: cfe/trunk/lib/Parse/ParseOpenMP.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseOpenMP.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseOpenMP.cpp (original)
+++ cfe/trunk/lib/Parse/ParseOpenMP.cpp Tue Jun 17 12:20:53 2014
@@ -62,7 +62,6 @@ Parser::DeclGroupPtrTy Parser::ParseOpen
case OMPD_parallel:
case OMPD_simd:
case OMPD_task:
- case OMPD_for:
Diag(Tok, diag::err_omp_unexpected_directive)
<< getOpenMPDirectiveName(DKind);
break;
@@ -115,15 +114,9 @@ StmtResult Parser::ParseOpenMPDeclarativ
SkipUntil(tok::annot_pragma_openmp_end);
break;
case OMPD_parallel:
- case OMPD_simd:
- case OMPD_for: {
+ case OMPD_simd: {
ConsumeToken();
- if (isOpenMPLoopDirective(DKind))
- ScopeFlags |= Scope::OpenMPLoopDirectiveScope;
- if (isOpenMPSimdDirective(DKind))
- ScopeFlags |= Scope::OpenMPSimdDirectiveScope;
- ParseScope OMPDirectiveScope(this, ScopeFlags);
Actions.StartOpenMPDSABlock(DKind, DirName, Actions.getCurScope());
while (Tok.isNot(tok::annot_pragma_openmp_end)) {
@@ -149,6 +142,10 @@ StmtResult Parser::ParseOpenMPDeclarativ
StmtResult AssociatedStmt;
bool CreateDirective = true;
+ if (DKind == OMPD_simd)
+ ScopeFlags |=
+ Scope::OpenMPLoopDirectiveScope | Scope::OpenMPSimdDirectiveScope;
+ ParseScope OMPDirectiveScope(this, ScopeFlags);
{
// The body is a block scope like in Lambdas and Blocks.
Sema::CompoundScopeRAII CompoundScope(Actions);
Modified: cfe/trunk/lib/Sema/SemaOpenMP.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Tue Jun 17 12:20:53 2014
@@ -39,22 +39,6 @@ enum DefaultDataSharingAttributes {
DSA_none = 1 << 0, /// \brief Default data sharing attribute 'none'.
DSA_shared = 1 << 1 /// \brief Default data sharing attribute 'shared'.
};
-template <class T> struct MatchesAny {
- MatchesAny(ArrayRef<T> Arr) : Arr(Arr) {}
- bool operator()(T Kind) {
- for (auto KindEl : Arr)
- if (KindEl == Kind)
- return true;
- return false;
- }
-
-private:
- ArrayRef<T> Arr;
-};
-template <class T> struct MatchesAlways {
- MatchesAlways() {}
- bool operator()(T) { return true; }
-};
/// \brief Stack for tracking declarations used in OpenMP directives and
/// clauses and their data-sharing attributes.
@@ -131,20 +115,14 @@ public:
DSAVarData getTopDSA(VarDecl *D);
/// \brief Returns data-sharing attributes for the specified declaration.
DSAVarData getImplicitDSA(VarDecl *D);
- /// \brief Checks if the specified variables has data-sharing attributes which
- /// match specified \a CPred predicate in any directive which matches \a DPred
- /// predicate.
- template <class ClausesPredicate,
- class DirectivesPredicate = MatchesAlways<OpenMPDirectiveKind>>
- DSAVarData hasDSA(VarDecl *D, ClausesPredicate CPred,
- DirectivesPredicate DPred = DirectivesPredicate());
- /// \brief Checks if the specified variables has data-sharing attributes which
- /// match specified \a CPred predicate in any innermost directive which
- /// matches \a DPred predicate.
- template <class ClausesPredicate,
- class DirectivesPredicate = MatchesAlways<OpenMPDirectiveKind>>
- DSAVarData hasInnermostDSA(VarDecl *D, ClausesPredicate CPred,
- DirectivesPredicate DPred = DirectivesPredicate());
+ /// \brief Checks if the specified variables has \a CKind data-sharing
+ /// attribute in \a DKind directive.
+ DSAVarData hasDSA(VarDecl *D, OpenMPClauseKind CKind,
+ OpenMPDirectiveKind DKind = OMPD_unknown);
+ /// \brief Checks if the specified variables has \a CKind data-sharing
+ /// attribute in an innermost \a DKind directive.
+ DSAVarData hasInnermostDSA(VarDecl *D, OpenMPClauseKind CKind,
+ OpenMPDirectiveKind DKind);
/// \brief Returns currently analyzed directive.
OpenMPDirectiveKind getCurrentDirective() const {
@@ -160,10 +138,10 @@ public:
return Stack.back().DefaultAttr;
}
- /// \brief Checks if the specified variable is a threadprivate.
+ /// \brief Checks if the spewcified variable is threadprivate.
bool isThreadPrivate(VarDecl *D) {
DSAVarData DVar = getTopDSA(D);
- return isOpenMPThreadPrivate(DVar.CKind);
+ return (DVar.CKind == OMPC_threadprivate || DVar.CKind == OMPC_copyin);
}
Scope *getCurScope() const { return Stack.back().CurScope; }
@@ -198,10 +176,12 @@ DSAStackTy::DSAVarData DSAStackTy::getDS
// in a Construct, C/C++, predetermined, p.1]
// Variables with automatic storage duration that are declared in a scope
// inside the construct are private.
- if (isOpenMPLocal(D, Iter) && D->isLocalVarDecl() &&
- (D->getStorageClass() == SC_Auto || D->getStorageClass() == SC_None)) {
- DVar.CKind = OMPC_private;
- return DVar;
+ if (DVar.DKind != OMPD_parallel) {
+ if (isOpenMPLocal(D, Iter) && D->isLocalVarDecl() &&
+ (D->getStorageClass() == SC_Auto || D->getStorageClass() == SC_None)) {
+ DVar.CKind = OMPC_private;
+ return DVar;
+ }
}
// Explicitly specified attributes and local variables with predetermined
@@ -299,7 +279,7 @@ void DSAStackTy::addDSA(VarDecl *D, Decl
bool DSAStackTy::isOpenMPLocal(VarDecl *D, StackTy::reverse_iterator Iter) {
if (Stack.size() > 2) {
- reverse_iterator I = Iter, E = std::prev(Stack.rend());
+ reverse_iterator I = Iter, E = Stack.rend() - 1;
Scope *TopScope = nullptr;
while (I != E && I->Directive != OMPD_parallel) {
++I;
@@ -347,12 +327,12 @@ DSAStackTy::DSAVarData DSAStackTy::getTo
// OpenMP [2.9.1.1, Data-sharing Attribute Rules for Variables Referenced
// in a Construct, C/C++, predetermined, p.4]
- // Static data members are shared.
+ // Static data memebers are shared.
if (D->isStaticDataMember()) {
// Variables with const-qualified type having no mutable member may be
- // listed in a firstprivate clause, even if they are static data members.
- DSAVarData DVarTemp =
- hasDSA(D, MatchesAny<OpenMPClauseKind>(OMPC_firstprivate));
+ // listed
+ // in a firstprivate clause, even if they are static data members.
+ DSAVarData DVarTemp = hasDSA(D, OMPC_firstprivate);
if (DVarTemp.CKind == OMPC_firstprivate && DVarTemp.RefExpr)
return DVar;
@@ -376,8 +356,7 @@ DSAStackTy::DSAVarData DSAStackTy::getTo
!(Actions.getLangOpts().CPlusPlus && RD && RD->hasMutableFields())) {
// Variables with const-qualified type having no mutable member may be
// listed in a firstprivate clause, even if they are static data members.
- DSAVarData DVarTemp =
- hasDSA(D, MatchesAny<OpenMPClauseKind>(OMPC_firstprivate));
+ DSAVarData DVarTemp = hasDSA(D, OMPC_firstprivate);
if (DVarTemp.CKind == OMPC_firstprivate && DVarTemp.RefExpr)
return DVar;
@@ -408,30 +387,29 @@ DSAStackTy::DSAVarData DSAStackTy::getIm
return getDSA(std::next(Stack.rbegin()), D);
}
-template <class ClausesPredicate, class DirectivesPredicate>
-DSAStackTy::DSAVarData DSAStackTy::hasDSA(VarDecl *D, ClausesPredicate CPred,
- DirectivesPredicate DPred) {
+DSAStackTy::DSAVarData DSAStackTy::hasDSA(VarDecl *D, OpenMPClauseKind CKind,
+ OpenMPDirectiveKind DKind) {
for (StackTy::reverse_iterator I = std::next(Stack.rbegin()),
E = std::prev(Stack.rend());
I != E; ++I) {
- if (!DPred(I->Directive))
+ if (DKind != OMPD_unknown && DKind != I->Directive)
continue;
DSAVarData DVar = getDSA(I, D);
- if (CPred(DVar.CKind))
+ if (DVar.CKind == CKind)
return DVar;
}
return DSAVarData();
}
-template <class ClausesPredicate, class DirectivesPredicate>
DSAStackTy::DSAVarData DSAStackTy::hasInnermostDSA(VarDecl *D,
- ClausesPredicate CPred,
- DirectivesPredicate DPred) {
+ OpenMPClauseKind CKind,
+ OpenMPDirectiveKind DKind) {
+ assert(DKind != OMPD_unknown && "Directive must be specified explicitly");
for (auto I = Stack.rbegin(), EE = std::prev(Stack.rend()); I != EE; ++I) {
- if (!DPred(I->Directive))
+ if (DKind != I->Directive)
continue;
DSAVarData DVar = getDSA(I, D);
- if (CPred(DVar.CKind))
+ if (DVar.CKind == CKind)
return DVar;
return DSAVarData();
}
@@ -454,54 +432,6 @@ void Sema::StartOpenMPDSABlock(OpenMPDir
}
void Sema::EndOpenMPDSABlock(Stmt *CurDirective) {
- // OpenMP [2.14.3.5, Restrictions, C/C++, p.1]
- // A variable of class type (or array thereof) that appears in a lastprivate
- // clause requires an accessible, unambiguous default constructor for the
- // class type, unless the list item is also specified in a firstprivate
- // clause.
- if (auto D = dyn_cast_or_null<OMPExecutableDirective>(CurDirective)) {
- for (auto C : D->clauses()) {
- if (auto Clause = dyn_cast<OMPLastprivateClause>(C)) {
- for (auto VarRef : Clause->varlists()) {
- if (VarRef->isValueDependent() || VarRef->isTypeDependent())
- continue;
- auto VD = cast<VarDecl>(cast<DeclRefExpr>(VarRef)->getDecl());
- auto DVar = DSAStack->getTopDSA(VD);
- if (DVar.CKind == OMPC_lastprivate) {
- SourceLocation ELoc = VarRef->getExprLoc();
- auto Type = VarRef->getType();
- if (Type->isArrayType())
- Type = QualType(Type->getArrayElementTypeNoTypeQual(), 0);
- CXXRecordDecl *RD =
- getLangOpts().CPlusPlus ? Type->getAsCXXRecordDecl() : 0;
- if (RD) {
- CXXConstructorDecl *CD = LookupDefaultConstructor(RD);
- PartialDiagnostic PD =
- PartialDiagnostic(PartialDiagnostic::NullDiagnostic());
- if (!CD ||
- CheckConstructorAccess(
- ELoc, CD, InitializedEntity::InitializeTemporary(Type),
- CD->getAccess(), PD) == AR_inaccessible ||
- CD->isDeleted()) {
- Diag(ELoc, diag::err_omp_required_method)
- << getOpenMPClauseName(OMPC_lastprivate) << 0;
- bool IsDecl = VD->isThisDeclarationADefinition(Context) ==
- VarDecl::DeclarationOnly;
- Diag(VD->getLocation(), IsDecl ? diag::note_previous_decl
- : diag::note_defined_here)
- << VD;
- Diag(RD->getLocation(), diag::note_previous_decl) << RD;
- continue;
- }
- MarkFunctionReferenced(ELoc, CD);
- DiagnoseUseOfDecl(CD, ELoc);
- }
- }
- }
- }
- }
- }
-
DSAStack->pop();
DiscardCleanupsInEvaluationContext();
PopExpressionEvaluationContext();
@@ -734,8 +664,7 @@ Sema::CheckOMPThreadPrivateDecl(SourceLo
// local storage (it is not supported by runtime).
if (auto Init = VD->getAnyInitializer()) {
LocalVarRefChecker Checker(*this);
- if (Checker.Visit(Init))
- continue;
+ if (Checker.Visit(Init)) continue;
}
Vars.push_back(RefExpr);
@@ -780,7 +709,7 @@ public:
// attribute, must have its data-sharing attribute explicitly determined
// by being listed in a data-sharing attribute clause.
if (DVar.CKind == OMPC_unknown && Stack->getDefaultDSA() == DSA_none &&
- (isOpenMPParallelDirective(DKind) || DKind == OMPD_task)) {
+ (DKind == OMPD_parallel || DKind == OMPD_task)) {
ErrorFound = true;
Actions.Diag(ELoc, diag::err_omp_no_dsa_for_variable) << VD;
return;
@@ -790,8 +719,7 @@ public:
// A list item that appears in a reduction clause of the innermost
// enclosing worksharing or parallel construct may not be accessed in an
// explicit task.
- DVar = Stack->hasInnermostDSA(
- VD, MatchesAny<OpenMPClauseKind>(OMPC_reduction));
+ DVar = Stack->hasInnermostDSA(VD, OMPC_reduction, OMPD_parallel);
if (DKind == OMPD_task && DVar.CKind == OMPC_reduction) {
ErrorFound = true;
Actions.Diag(ELoc, diag::err_omp_reduction_in_task);
@@ -838,23 +766,16 @@ void Sema::ActOnOpenMPRegionStart(OpenMP
QualType KmpInt32Ty = Context.getIntTypeForBitwidth(32, 1);
QualType KmpInt32PtrTy = Context.getPointerType(KmpInt32Ty);
Sema::CapturedParamNameType Params[3] = {
- std::make_pair(".global_tid.", KmpInt32PtrTy),
- std::make_pair(".bound_tid.", KmpInt32PtrTy),
- std::make_pair(StringRef(), QualType()) // __context with shared vars
+ std::make_pair(".global_tid.", KmpInt32PtrTy),
+ std::make_pair(".bound_tid.", KmpInt32PtrTy),
+ std::make_pair(StringRef(), QualType()) // __context with shared vars
};
ActOnCapturedRegionStart(Loc, CurScope, CR_OpenMP, Params);
break;
}
case OMPD_simd: {
Sema::CapturedParamNameType Params[1] = {
- std::make_pair(StringRef(), QualType()) // __context with shared vars
- };
- ActOnCapturedRegionStart(Loc, CurScope, CR_OpenMP, Params);
- break;
- }
- case OMPD_for: {
- Sema::CapturedParamNameType Params[1] = {
- std::make_pair(StringRef(), QualType()) // __context with shared vars
+ std::make_pair(StringRef(), QualType()) // __context with shared vars
};
ActOnCapturedRegionStart(Loc, CurScope, CR_OpenMP, Params);
break;
@@ -906,9 +827,6 @@ StmtResult Sema::ActOnOpenMPExecutableDi
Res =
ActOnOpenMPSimdDirective(ClausesWithImplicit, AStmt, StartLoc, EndLoc);
break;
- case OMPD_for:
- Res = ActOnOpenMPForDirective(ClausesWithImplicit, AStmt, StartLoc, EndLoc);
- break;
case OMPD_threadprivate:
case OMPD_task:
llvm_unreachable("OpenMP Directive is not allowed");
@@ -940,6 +858,10 @@ StmtResult Sema::ActOnOpenMPParallelDire
AStmt);
}
+static bool isSimdDirective(OpenMPDirectiveKind DKind) {
+ return DKind == OMPD_simd; // FIXME: || DKind == OMPD_for_simd || ...
+}
+
namespace {
/// \brief Helper class for checking canonical form of the OpenMP loops and
/// extracting iteration space of each loop in the loop nest, that will be used
@@ -1345,13 +1267,9 @@ static bool CheckOpenMPIterationSpace(Op
// a Construct, C/C++].
// The loop iteration variable(s) in the associated for-loop(s) of a for or
// parallel for construct may be listed in a private or lastprivate clause.
- // The loop iteration variable(s) in the associated for-loop(s) of a for or
- // parallel for construct may be listed in a private or lastprivate clause.
DSAStackTy::DSAVarData DVar = DSA.getTopDSA(Var);
- if (((isOpenMPSimdDirective(DKind) && DVar.CKind != OMPC_unknown &&
- DVar.CKind != OMPC_linear && DVar.CKind != OMPC_lastprivate) ||
- (isOpenMPWorksharingDirective(DKind) && DVar.CKind != OMPC_unknown &&
- DVar.CKind != OMPC_private && DVar.CKind != OMPC_lastprivate)) &&
+ if (isSimdDirective(DKind) && DVar.CKind != OMPC_unknown &&
+ DVar.CKind != OMPC_linear && DVar.CKind != OMPC_lastprivate &&
(DVar.CKind != OMPC_private || DVar.RefExpr != nullptr)) {
// The loop iteration variable in the associated for-loop of a simd
// construct with just one associated for-loop may be listed in a linear
@@ -1371,7 +1289,7 @@ static bool CheckOpenMPIterationSpace(Op
DSA.addDSA(Var, nullptr, OMPC_private);
}
- assert(isOpenMPLoopDirective(DKind) && "DSA for non-simd loop vars");
+ assert(isSimdDirective(DKind) && "DSA for non-simd loop vars");
// Check test-expr.
HasErrors |= ISC.CheckCond(For->getCond());
@@ -1441,18 +1359,6 @@ StmtResult Sema::ActOnOpenMPSimdDirectiv
return OMPSimdDirective::Create(Context, StartLoc, EndLoc, Clauses, AStmt);
}
-StmtResult Sema::ActOnOpenMPForDirective(ArrayRef<OMPClause *> Clauses,
- Stmt *AStmt, SourceLocation StartLoc,
- SourceLocation EndLoc) {
- // In presence of clause 'collapse', it will define the nested loops number.
- // For now, pass default value of 1.
- if (CheckOpenMPLoop(OMPD_for, 1, AStmt, *this, *DSAStack))
- return StmtError();
-
- getCurFunction()->setHasBranchProtectedScope();
- return OMPForDirective::Create(Context, StartLoc, EndLoc, Clauses, AStmt);
-}
-
OMPClause *Sema::ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind, Expr *Expr,
SourceLocation StartLoc,
SourceLocation LParenLoc,
@@ -1854,10 +1760,9 @@ OMPClause *Sema::ActOnOpenMPPrivateClaus
CXXConstructorDecl *CD = LookupDefaultConstructor(RD);
PartialDiagnostic PD =
PartialDiagnostic(PartialDiagnostic::NullDiagnostic());
- if (!CD ||
- CheckConstructorAccess(ELoc, CD,
- InitializedEntity::InitializeTemporary(Type),
- CD->getAccess(), PD) == AR_inaccessible ||
+ if (!CD || CheckConstructorAccess(
+ ELoc, CD, InitializedEntity::InitializeTemporary(Type),
+ CD->getAccess(), PD) == AR_inaccessible ||
CD->isDeleted()) {
Diag(ELoc, diag::err_omp_required_method)
<< getOpenMPClauseName(OMPC_private) << 0;
@@ -1986,10 +1891,9 @@ OMPClause *Sema::ActOnOpenMPFirstprivate
CXXConstructorDecl *CD = LookupCopyingConstructor(RD, 0);
PartialDiagnostic PD =
PartialDiagnostic(PartialDiagnostic::NullDiagnostic());
- if (!CD ||
- CheckConstructorAccess(ELoc, CD,
- InitializedEntity::InitializeTemporary(Type),
- CD->getAccess(), PD) == AR_inaccessible ||
+ if (!CD || CheckConstructorAccess(
+ ELoc, CD, InitializedEntity::InitializeTemporary(Type),
+ CD->getAccess(), PD) == AR_inaccessible ||
CD->isDeleted()) {
Diag(ELoc, diag::err_omp_required_method)
<< getOpenMPClauseName(OMPC_firstprivate) << 1;
@@ -2034,8 +1938,9 @@ OMPClause *Sema::ActOnOpenMPFirstprivate
// A list item that specifies a given variable may not appear in more
// than one clause on the same directive, except that a variable may be
// specified in both firstprivate and lastprivate clauses.
+ // TODO: add processing for lastprivate.
if (DVar.CKind != OMPC_unknown && DVar.CKind != OMPC_firstprivate &&
- DVar.CKind != OMPC_lastprivate && DVar.RefExpr) {
+ DVar.RefExpr) {
Diag(ELoc, diag::err_omp_wrong_dsa)
<< getOpenMPClauseName(DVar.CKind)
<< getOpenMPClauseName(OMPC_firstprivate);
@@ -2065,38 +1970,23 @@ OMPClause *Sema::ActOnOpenMPFirstprivate
continue;
}
- OpenMPDirectiveKind CurrDir = DSAStack->getCurrentDirective();
// OpenMP [2.9.3.4, Restrictions, p.2]
// A list item that is private within a parallel region must not appear
// in a firstprivate clause on a worksharing construct if any of the
// worksharing regions arising from the worksharing construct ever bind
// to any of the parallel regions arising from the parallel construct.
- if (isOpenMPWorksharingDirective(CurrDir)) {
- DVar = DSAStack->getImplicitDSA(VD);
- if (DVar.CKind != OMPC_shared) {
- Diag(ELoc, diag::err_omp_required_access)
- << getOpenMPClauseName(OMPC_firstprivate)
- << getOpenMPClauseName(OMPC_shared);
- if (DVar.RefExpr) {
- Diag(DVar.RefExpr->getExprLoc(), diag::note_omp_explicit_dsa)
- << getOpenMPClauseName(DVar.CKind);
- }
- continue;
- }
- }
// OpenMP [2.9.3.4, Restrictions, p.3]
// A list item that appears in a reduction clause of a parallel construct
// must not appear in a firstprivate clause on a worksharing or task
// construct if any of the worksharing or task regions arising from the
// worksharing or task construct ever bind to any of the parallel regions
// arising from the parallel construct.
- // TODO
// OpenMP [2.9.3.4, Restrictions, p.4]
// A list item that appears in a reduction clause in worksharing
// construct must not appear in a firstprivate clause in a task construct
// encountered during execution of any of the worksharing regions arising
// from the worksharing construct.
- // TODO
+ // TODO:
}
DSAStack->addDSA(VD, DE, OMPC_firstprivate);
@@ -2167,6 +2057,12 @@ OMPClause *Sema::ActOnOpenMPLastprivateC
// Variables with the predetermined data-sharing attributes may not be
// listed in data-sharing attributes clauses, except for the cases
// listed below.
+ // A list item that is private within a parallel region, or that appears in
+ // the reduction clause of a parallel construct, must not appear in a
+ // lastprivate clause on a worksharing construct if any of the
+ // corresponding worksharing regions ever binds to any of the corresponding
+ // parallel regions.
+ // TODO: Check implicit DSA for worksharing directives.
DSAStackTy::DSAVarData DVar = DSAStack->getTopDSA(VD);
if (DVar.CKind != OMPC_unknown && DVar.CKind != OMPC_lastprivate &&
DVar.CKind != OMPC_firstprivate &&
@@ -2183,33 +2079,11 @@ OMPClause *Sema::ActOnOpenMPLastprivateC
continue;
}
- OpenMPDirectiveKind CurrDir = DSAStack->getCurrentDirective();
- // OpenMP [2.14.3.5, Restrictions, p.2]
- // A list item that is private within a parallel region, or that appears in
- // the reduction clause of a parallel construct, must not appear in a
- // lastprivate clause on a worksharing construct if any of the corresponding
- // worksharing regions ever binds to any of the corresponding parallel
- // regions.
- if (isOpenMPWorksharingDirective(CurrDir)) {
- DVar = DSAStack->getImplicitDSA(VD);
- if (DVar.CKind != OMPC_shared) {
- Diag(ELoc, diag::err_omp_required_access)
- << getOpenMPClauseName(OMPC_lastprivate)
- << getOpenMPClauseName(OMPC_shared);
- if (DVar.RefExpr)
- Diag(DVar.RefExpr->getExprLoc(), diag::note_omp_explicit_dsa)
- << getOpenMPClauseName(DVar.CKind);
- else
- Diag(VD->getLocation(), diag::note_omp_predetermined_dsa)
- << getOpenMPClauseName(DVar.CKind);
- continue;
- }
- }
// OpenMP [2.14.3.5, Restrictions, C++, p.1,2]
- // A variable of class type (or array thereof) that appears in a
- // lastprivate clause requires an accessible, unambiguous default
- // constructor for the class type, unless the list item is also specified
- // in a firstprivate clause.
+ // A variable of class type (or array thereof) that appears in a lastprivate
+ // clause requires an accessible, unambiguous default constructor for the
+ // class type, unless the list item is also specified in a firstprivate
+ // clause.
// A variable of class type (or array thereof) that appears in a
// lastprivate clause requires an accessible, unambiguous copy assignment
// operator for the class type.
@@ -2220,29 +2094,49 @@ OMPClause *Sema::ActOnOpenMPLastprivateC
? Type.getNonReferenceType()->getAsCXXRecordDecl()
: nullptr;
if (RD) {
+ // FIXME: If a variable is also specified in a firstprivate clause, we may
+ // not require default constructor. This can be fixed after adding some
+ // directive allowing both firstprivate and lastprivate clauses (and this
+ // should be probably checked after all clauses are processed).
+ CXXConstructorDecl *CD = LookupDefaultConstructor(RD);
+ PartialDiagnostic PD =
+ PartialDiagnostic(PartialDiagnostic::NullDiagnostic());
+ if (!CD || CheckConstructorAccess(
+ ELoc, CD, InitializedEntity::InitializeTemporary(Type),
+ CD->getAccess(), PD) == AR_inaccessible ||
+ CD->isDeleted()) {
+ Diag(ELoc, diag::err_omp_required_method)
+ << getOpenMPClauseName(OMPC_lastprivate) << 0;
+ bool IsDecl = VD->isThisDeclarationADefinition(Context) ==
+ VarDecl::DeclarationOnly;
+ Diag(VD->getLocation(),
+ IsDecl ? diag::note_previous_decl : diag::note_defined_here)
+ << VD;
+ Diag(RD->getLocation(), diag::note_previous_decl) << RD;
+ continue;
+ }
+ MarkFunctionReferenced(ELoc, CD);
+ DiagnoseUseOfDecl(CD, ELoc);
+
CXXMethodDecl *MD = LookupCopyingAssignment(RD, 0, false, 0);
DeclAccessPair FoundDecl = DeclAccessPair::make(MD, MD->getAccess());
- if (MD) {
- if (CheckMemberAccess(ELoc, RD, FoundDecl) == AR_inaccessible ||
- MD->isDeleted()) {
- Diag(ELoc, diag::err_omp_required_method)
- << getOpenMPClauseName(OMPC_lastprivate) << 2;
- bool IsDecl = VD->isThisDeclarationADefinition(Context) ==
- VarDecl::DeclarationOnly;
- Diag(VD->getLocation(),
- IsDecl ? diag::note_previous_decl : diag::note_defined_here)
- << VD;
- Diag(RD->getLocation(), diag::note_previous_decl) << RD;
- continue;
- }
- MarkFunctionReferenced(ELoc, MD);
- DiagnoseUseOfDecl(MD, ELoc);
+ if (!MD || CheckMemberAccess(ELoc, RD, FoundDecl) == AR_inaccessible ||
+ MD->isDeleted()) {
+ Diag(ELoc, diag::err_omp_required_method)
+ << getOpenMPClauseName(OMPC_lastprivate) << 2;
+ bool IsDecl = VD->isThisDeclarationADefinition(Context) ==
+ VarDecl::DeclarationOnly;
+ Diag(VD->getLocation(),
+ IsDecl ? diag::note_previous_decl : diag::note_defined_here)
+ << VD;
+ Diag(RD->getLocation(), diag::note_previous_decl) << RD;
+ continue;
}
+ MarkFunctionReferenced(ELoc, MD);
+ DiagnoseUseOfDecl(MD, ELoc);
CXXDestructorDecl *DD = RD->getDestructor();
if (DD) {
- PartialDiagnostic PD =
- PartialDiagnostic(PartialDiagnostic::NullDiagnostic());
if (CheckDestructorAccess(ELoc, DD, PD) == AR_inaccessible ||
DD->isDeleted()) {
Diag(ELoc, diag::err_omp_required_method)
@@ -2260,8 +2154,7 @@ OMPClause *Sema::ActOnOpenMPLastprivateC
}
}
- if (DVar.CKind != OMPC_firstprivate)
- DSAStack->addDSA(VD, DE, OMPC_lastprivate);
+ DSAStack->addDSA(VD, DE, OMPC_lastprivate);
Vars.push_back(DE);
}
@@ -2346,8 +2239,13 @@ public:
return false;
if (DVar.CKind != OMPC_unknown)
return true;
- DSAStackTy::DSAVarData DVarPrivate = Stack->hasDSA(VD, isOpenMPPrivate);
- if (DVarPrivate.CKind != OMPC_unknown)
+ DSAStackTy::DSAVarData DVarPrivate = Stack->hasDSA(VD, OMPC_private);
+ DSAStackTy::DSAVarData DVarFirstprivate =
+ Stack->hasDSA(VD, OMPC_firstprivate);
+ DSAStackTy::DSAVarData DVarReduction = Stack->hasDSA(VD, OMPC_reduction);
+ if (DVarPrivate.CKind != OMPC_unknown ||
+ DVarFirstprivate.CKind != OMPC_unknown ||
+ DVarReduction.CKind != OMPC_unknown)
return true;
return false;
}
@@ -2589,20 +2487,7 @@ OMPClause *Sema::ActOnOpenMPReductionCla
// A list item that appears in a reduction clause of a worksharing
// construct must be shared in the parallel regions to which any of the
// worksharing regions arising from the worksharing construct bind.
- OpenMPDirectiveKind CurrDir = DSAStack->getCurrentDirective();
- if (isOpenMPWorksharingDirective(CurrDir)) {
- DVar = DSAStack->getImplicitDSA(VD);
- if (DVar.CKind != OMPC_shared) {
- Diag(ELoc, diag::err_omp_required_access)
- << getOpenMPClauseName(OMPC_reduction)
- << getOpenMPClauseName(OMPC_shared);
- if (DVar.RefExpr) {
- Diag(DVar.RefExpr->getExprLoc(), diag::note_omp_explicit_dsa)
- << getOpenMPClauseName(DVar.CKind);
- }
- continue;
- }
- }
+ // TODO Implement it later.
CXXRecordDecl *RD = getLangOpts().CPlusPlus
? Type.getNonReferenceType()->getAsCXXRecordDecl()
@@ -2915,22 +2800,20 @@ OMPClause *Sema::ActOnOpenMPCopyinClause
if (RD) {
CXXMethodDecl *MD = LookupCopyingAssignment(RD, 0, false, 0);
DeclAccessPair FoundDecl = DeclAccessPair::make(MD, MD->getAccess());
- if (MD) {
- if (CheckMemberAccess(ELoc, RD, FoundDecl) == AR_inaccessible ||
- MD->isDeleted()) {
- Diag(ELoc, diag::err_omp_required_method)
- << getOpenMPClauseName(OMPC_copyin) << 2;
- bool IsDecl = VD->isThisDeclarationADefinition(Context) ==
- VarDecl::DeclarationOnly;
- Diag(VD->getLocation(),
- IsDecl ? diag::note_previous_decl : diag::note_defined_here)
- << VD;
- Diag(RD->getLocation(), diag::note_previous_decl) << RD;
- continue;
- }
- MarkFunctionReferenced(ELoc, MD);
- DiagnoseUseOfDecl(MD, ELoc);
+ if (!MD || CheckMemberAccess(ELoc, RD, FoundDecl) == AR_inaccessible ||
+ MD->isDeleted()) {
+ Diag(ELoc, diag::err_omp_required_method)
+ << getOpenMPClauseName(OMPC_copyin) << 2;
+ bool IsDecl = VD->isThisDeclarationADefinition(Context) ==
+ VarDecl::DeclarationOnly;
+ Diag(VD->getLocation(),
+ IsDecl ? diag::note_previous_decl : diag::note_defined_here)
+ << VD;
+ Diag(RD->getLocation(), diag::note_previous_decl) << RD;
+ continue;
}
+ MarkFunctionReferenced(ELoc, MD);
+ DiagnoseUseOfDecl(MD, ELoc);
}
DSAStack->addDSA(VD, DE, OMPC_copyin);
Modified: cfe/trunk/lib/Sema/TreeTransform.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/TreeTransform.h?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/TreeTransform.h (original)
+++ cfe/trunk/lib/Sema/TreeTransform.h Tue Jun 17 12:20:53 2014
@@ -6404,16 +6404,6 @@ TreeTransform<Derived>::TransformOMPSimd
return Res;
}
-template <typename Derived>
-StmtResult
-TreeTransform<Derived>::TransformOMPForDirective(OMPForDirective *D) {
- DeclarationNameInfo DirName;
- getDerived().getSema().StartOpenMPDSABlock(OMPD_for, DirName, nullptr);
- StmtResult Res = getDerived().TransformOMPExecutableDirective(D);
- getDerived().getSema().EndOpenMPDSABlock(Res.get());
- return Res;
-}
-
//===----------------------------------------------------------------------===//
// OpenMP clause transformation
//===----------------------------------------------------------------------===//
Modified: cfe/trunk/lib/Serialization/ASTReaderStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderStmt.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTReaderStmt.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTReaderStmt.cpp Tue Jun 17 12:20:53 2014
@@ -1877,13 +1877,6 @@ void ASTStmtReader::VisitOMPSimdDirectiv
VisitOMPExecutableDirective(D);
}
-void ASTStmtReader::VisitOMPForDirective(OMPForDirective *D) {
- VisitStmt(D);
- // Two fields (NumClauses and CollapsedNum) were read in ReadStmtFromStream.
- Idx += 2;
- VisitOMPExecutableDirective(D);
-}
-
//===----------------------------------------------------------------------===//
// ASTReader Implementation
//===----------------------------------------------------------------------===//
@@ -2371,14 +2364,6 @@ Stmt *ASTReader::ReadStmtFromStream(Modu
break;
}
- case STMT_OMP_FOR_DIRECTIVE: {
- unsigned NumClauses = Record[ASTStmtReader::NumStmtFields];
- unsigned CollapsedNum = Record[ASTStmtReader::NumStmtFields + 1];
- S = OMPForDirective::CreateEmpty(Context, NumClauses, CollapsedNum,
- Empty);
- break;
- }
-
case EXPR_CXX_OPERATOR_CALL:
S = new (Context) CXXOperatorCallExpr(Context, Empty);
break;
Modified: cfe/trunk/lib/Serialization/ASTWriterStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterStmt.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTWriterStmt.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTWriterStmt.cpp Tue Jun 17 12:20:53 2014
@@ -1798,14 +1798,6 @@ void ASTStmtWriter::VisitOMPSimdDirectiv
Code = serialization::STMT_OMP_SIMD_DIRECTIVE;
}
-void ASTStmtWriter::VisitOMPForDirective(OMPForDirective *D) {
- VisitStmt(D);
- Record.push_back(D->getNumClauses());
- Record.push_back(D->getCollapsedNumber());
- VisitOMPExecutableDirective(D);
- Code = serialization::STMT_OMP_FOR_DIRECTIVE;
-}
-
//===----------------------------------------------------------------------===//
// ASTWriter Implementation
//===----------------------------------------------------------------------===//
Modified: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp Tue Jun 17 12:20:53 2014
@@ -732,7 +732,6 @@ void ExprEngine::Visit(const Stmt *S, Ex
case Stmt::CapturedStmtClass:
case Stmt::OMPParallelDirectiveClass:
case Stmt::OMPSimdDirectiveClass:
- case Stmt::OMPForDirectiveClass:
llvm_unreachable("Stmt should not be in analyzer evaluation loop");
case Stmt::ObjCSubscriptRefExprClass:
Removed: cfe/trunk/test/OpenMP/for_ast_print.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_ast_print.cpp?rev=211112&view=auto
==============================================================================
--- cfe/trunk/test/OpenMP/for_ast_print.cpp (original)
+++ cfe/trunk/test/OpenMP/for_ast_print.cpp (removed)
@@ -1,54 +0,0 @@
-// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ast-print %s | FileCheck %s
-// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -emit-pch -o %t %s
-// RUN: %clang_cc1 -fopenmp=libiomp5 -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s
-// expected-no-diagnostics
-
-#ifndef HEADER
-#define HEADER
-
-void foo() {}
-
-template <class T, int N>
-T tmain(T argc) {
- T b = argc, c, d, e, f, g;
- static T a;
-// CHECK: static T a;
-#pragma omp for
-// CHECK-NEXT: #pragma omp for
- for (int i=0; i < 2; ++i) a=2;
-// CHECK-NEXT: for (int i = 0; i < 2; ++i)
-// CHECK-NEXT: a = 2;
-#pragma omp parallel
-#pragma omp for private(argc,b),firstprivate(c, d),lastprivate(d,f) collapse(N)
- for (int i = 0; i < 10; ++i)
- for (int j = 0; j < 10; ++j)foo();
-// CHECK-NEXT: #pragma omp parallel
-// CHECK-NEXT: #pragma omp for private(argc,b) firstprivate(c,d) lastprivate(d,f) collapse(N)
-// CHECK-NEXT: for (int i = 0; i < 10; ++i)
-// CHECK-NEXT: for (int j = 0; j < 10; ++j)
-// CHECK-NEXT: foo();
- return T();
-}
-
-int main(int argc, char **argv) {
- int b = argc, c, d, e, f, g;
- static int a;
-// CHECK: static int a;
-#pragma omp for
-// CHECK-NEXT: #pragma omp for
- for (int i=0; i < 2; ++i)a=2;
-// CHECK-NEXT: for (int i = 0; i < 2; ++i)
-// CHECK-NEXT: a = 2;
-#pragma omp parallel
-#pragma omp for private(argc,b),firstprivate(argv, c),lastprivate(d,f) collapse(2)
- for (int i = 0; i < 10; ++i)
- for (int j = 0; j < 10; ++j)foo();
-// CHECK-NEXT: #pragma omp parallel
-// CHECK-NEXT: #pragma omp for private(argc,b) firstprivate(argv,c) lastprivate(d,f) collapse(2)
-// CHECK-NEXT: for (int i = 0; i < 10; ++i)
-// CHECK-NEXT: for (int j = 0; j < 10; ++j)
-// CHECK-NEXT: foo();
- return (tmain<int, 5>(argc) + tmain<char, 1>(argv[0][0]));
-}
-
-#endif
Removed: cfe/trunk/test/OpenMP/for_collapse_messages.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_collapse_messages.cpp?rev=211112&view=auto
==============================================================================
--- cfe/trunk/test/OpenMP/for_collapse_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/for_collapse_messages.cpp (removed)
@@ -1,79 +0,0 @@
-// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
-
-void foo() {
-}
-
-bool foobool(int argc) {
- return argc;
-}
-
-struct S1; // expected-note {{declared here}}
-
-template <class T, typename S, int N, int ST> // expected-note {{declared here}}
-T tmain(T argc, S **argv) { //expected-note 2 {{declared here}}
- #pragma omp for collapse // expected-error {{expected '(' after 'collapse'}}
- for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
- #pragma omp for collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
- #pragma omp for collapse () // expected-error {{expected expression}}
- for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
- // expected-error at +3 {{expected ')'}} expected-note at +3 {{to match this '('}}
- // expected-error at +2 2 {{expression is not an integral constant expression}}
- // expected-note at +1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}}
- #pragma omp for collapse (argc
- for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
- // expected-error at +1 2 {{argument to 'collapse' clause must be a positive integer value}}
- #pragma omp for collapse (ST // expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
- #pragma omp for collapse (1)) // expected-warning {{extra tokens at the end of '#pragma omp for' are ignored}}
- for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
- #pragma omp for collapse ((ST > 0) ? 1 + ST : 2)
- for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
- // expected-error at +3 2 {{directive '#pragma omp for' cannot contain more than one 'collapse' clause}}
- // expected-error at +2 2 {{argument to 'collapse' clause must be a positive integer value}}
- // expected-error at +1 2 {{expression is not an integral constant expression}}
- #pragma omp for collapse (foobool(argc)), collapse (true), collapse (-5)
- for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
- #pragma omp for collapse (S) // expected-error {{'S' does not refer to a value}}
- for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
- // expected-error at +1 2 {{expression is not an integral constant expression}}
- #pragma omp for collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
- #pragma omp for collapse (1)
- for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
- #pragma omp for collapse (N) // expected-error {{argument to 'collapse' clause must be a positive integer value}}
- for (T i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
- return argc;
-}
-
-int main(int argc, char **argv) {
- #pragma omp for collapse // expected-error {{expected '(' after 'collapse'}}
- for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
- #pragma omp for collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
- #pragma omp for collapse () // expected-error {{expected expression}}
- for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
- #pragma omp for collapse (4 // expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
- #pragma omp for collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp for' are ignored}}
- for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
- #pragma omp for collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{expression is not an integral constant expression}}
- for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
- // expected-error at +3 {{expression is not an integral constant expression}}
- // expected-error at +2 2 {{directive '#pragma omp for' cannot contain more than one 'collapse' clause}}
- // expected-error at +1 2 {{argument to 'collapse' clause must be a positive integer value}}
- #pragma omp for collapse (foobool(argc)), collapse (true), collapse (-5)
- for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
- #pragma omp for collapse (S1) // expected-error {{'S1' does not refer to a value}}
- for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
- // expected-error at +1 {{expression is not an integral constant expression}}
- #pragma omp for collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
- // expected-error at +3 {{statement after '#pragma omp for' must be a for loop}}
- // expected-note at +1 {{in instantiation of function template specialization 'tmain<int, char, -1, -2>' requested here}}
- #pragma omp for collapse(collapse(tmain<int, char, -1, -2>(argc, argv) // expected-error 2 {{expected ')'}} expected-note 2 {{to match this '('}}
- foo();
- // expected-note at +1 {{in instantiation of function template specialization 'tmain<int, char, 1, 0>' requested here}}
- return tmain<int, char, 1, 0>(argc, argv);
-}
-
Removed: cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp?rev=211112&view=auto
==============================================================================
--- cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp (removed)
@@ -1,293 +0,0 @@
-// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
-
-void foo() {
-}
-
-bool foobool(int argc) {
- return argc;
-}
-
-struct S1; // expected-note 2 {{declared here}} expected-note 2 {{forward declaration of 'S1'}}
-extern S1 a;
-class S2 {
- mutable int a;
-
-public:
- S2() : a(0) {}
- S2(S2 &s2) : a(s2.a) {}
- static float S2s;
- static const float S2sc;
-};
-const float S2::S2sc = 0;
-const S2 b;
-const S2 ba[5];
-class S3 {
- int a;
- S3 &operator=(const S3 &s3);
-
-public:
- S3() : a(0) {}
- S3(S3 &s3) : a(s3.a) {}
-};
-const S3 c;
-const S3 ca[5];
-extern const int f;
-class S4 { // expected-note 2 {{'S4' declared here}}
- int a;
- S4();
- S4(const S4 &s4);
-
-public:
- S4(int v) : a(v) {}
-};
-class S5 { // expected-note 4 {{'S5' declared here}}
- int a;
- S5(const S5 &s5) : a(s5.a) {}
-
-public:
- S5() : a(0) {}
- S5(int v) : a(v) {}
-};
-class S6 {
- int a;
- S6() : a(0) {}
-
-public:
- S6(const S6 &s6) : a(s6.a) {}
- S6(int v) : a(v) {}
-};
-
-S3 h;
-#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}}
-
-template <class I, class C>
-int foomain(int argc, char **argv) {
- I e(4); // expected-note {{'e' defined here}}
- C g(5); // expected-note 2 {{'g' defined here}}
- int i;
- int &j = i; // expected-note {{'j' defined here}}
-#pragma omp parallel
-#pragma omp for firstprivate // expected-error {{expected '(' after 'firstprivate'}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for firstprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for firstprivate() // expected-error {{expected expression}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for firstprivate(argc)
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for firstprivate(S1) // expected-error {{'S1' does not refer to a value}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for firstprivate(a, b) // expected-error {{firstprivate variable with incomplete type 'S1'}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for firstprivate(argv[1]) // expected-error {{expected variable name}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for firstprivate(e, g) // expected-error 2 {{firstprivate variable must have an accessible, unambiguous copy constructor}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for firstprivate(h) // expected-error {{threadprivate or thread local variable cannot be firstprivate}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for linear(i) // expected-error {{unexpected OpenMP clause 'linear' in directive '#pragma omp for'}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
- {
- int v = 0;
- int i; // expected-note {{predetermined as private}}
-#pragma omp for firstprivate(i) // expected-error {{private variable cannot be firstprivate}}
- for (int k = 0; k < argc; ++k) {
- i = k;
- v += i;
- }
- }
-#pragma omp parallel shared(i)
-#pragma omp parallel private(i)
-#pragma omp for firstprivate(j) // expected-error {{arguments of OpenMP clause 'firstprivate' cannot be of reference type}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for firstprivate(i)
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for lastprivate(g) firstprivate(g) // expected-error {{firstprivate variable must have an accessible, unambiguous copy constructor}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel private(i) // expected-note {{defined as private}}
-#pragma omp for firstprivate(i) // expected-error {{firstprivate variable must be shared}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel reduction(+ : i) // expected-note {{defined as reduction}}
-#pragma omp for firstprivate(i) // expected-error {{firstprivate variable must be shared}}
- for (i = 0; i < argc; ++i)
- foo();
- return 0;
-}
-
-int main(int argc, char **argv) {
- const int d = 5;
- const int da[5] = {0};
- S4 e(4); // expected-note {{'e' defined here}}
- S5 g(5); // expected-note 2 {{'g' defined here}}
- S3 m;
- S6 n(2);
- int i;
- int &j = i; // expected-note {{'j' defined here}}
-#pragma omp parallel
-#pragma omp for firstprivate // expected-error {{expected '(' after 'firstprivate'}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate() // expected-error {{expected expression}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(argc)
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(S1) // expected-error {{'S1' does not refer to a value}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(a, b, c, d, f) // expected-error {{firstprivate variable with incomplete type 'S1'}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(argv[1]) // expected-error {{expected variable name}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(2 * 2) // expected-error {{expected variable name}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(ba) // OK
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(ca) // OK
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(da) // OK
- for (i = 0; i < argc; ++i)
- foo();
- int xa;
-#pragma omp parallel
-#pragma omp for firstprivate(xa) // OK
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(S2::S2s) // OK
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(S2::S2sc) // OK
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for safelen(5) // expected-error {{unexpected OpenMP clause 'safelen' in directive '#pragma omp for'}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(e, g) // expected-error 2 {{firstprivate variable must have an accessible, unambiguous copy constructor}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(m) // OK
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(h) // expected-error {{threadprivate or thread local variable cannot be firstprivate}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for private(xa), firstprivate(xa) // expected-error {{private variable cannot be firstprivate}} expected-note {{defined as private}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(i) // expected-note {{defined as firstprivate}}
- for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable may not be firstprivate}}
- foo();
-#pragma omp parallel shared(xa)
-#pragma omp for firstprivate(xa) // OK: may be firstprivate
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(j) // expected-error {{arguments of OpenMP clause 'firstprivate' cannot be of reference type}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(g) firstprivate(g) // expected-error {{firstprivate variable must have an accessible, unambiguous copy constructor}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(n) firstprivate(n) // OK
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
- {
- int v = 0;
- int i; // expected-note {{predetermined as private}}
-#pragma omp for firstprivate(i) // expected-error {{private variable cannot be firstprivate}}
- for (int k = 0; k < argc; ++k) {
- i = k;
- v += i;
- }
- }
-#pragma omp parallel private(i) // expected-note {{defined as private}}
-#pragma omp for firstprivate(i) // expected-error {{firstprivate variable must be shared}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel reduction(+ : i) // expected-note {{defined as reduction}}
-#pragma omp for firstprivate(i) // expected-error {{firstprivate variable must be shared}}
- for (i = 0; i < argc; ++i)
- foo();
-
- return foomain<S4, S5>(argc, argv); // expected-note {{in instantiation of function template specialization 'foomain<S4, S5>' requested here}}
-}
Removed: cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp?rev=211112&view=auto
==============================================================================
--- cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp (removed)
@@ -1,266 +0,0 @@
-// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
-
-void foo() {
-}
-
-bool foobool(int argc) {
- return argc;
-}
-
-struct S1; // expected-note 2 {{declared here}} expected-note 2 {{forward declaration of 'S1'}}
-extern S1 a;
-class S2 {
- mutable int a;
-
-public:
- S2() : a(0) {}
- S2(S2 &s2) : a(s2.a) {}
- static float S2s; // expected-note {{predetermined as shared}}
- static const float S2sc;
-};
-const float S2::S2sc = 0; // expected-note {{predetermined as shared}}
-const S2 b;
-const S2 ba[5];
-class S3 { // expected-note 2 {{'S3' declared here}}
- int a;
- S3 &operator=(const S3 &s3);
-
-public:
- S3() : a(0) {}
- S3(S3 &s3) : a(s3.a) {}
-};
-const S3 c; // expected-note {{predetermined as shared}}
-const S3 ca[5]; // expected-note {{predetermined as shared}}
-extern const int f; // expected-note {{predetermined as shared}}
-class S4 { // expected-note 3 {{'S4' declared here}}
- int a;
- S4();
- S4(const S4 &s4);
-
-public:
- S4(int v) : a(v) {}
-};
-class S5 { // expected-note {{'S5' declared here}}
- int a;
- S5() : a(0) {}
-
-public:
- S5(const S5 &s5) : a(s5.a) {}
- S5(int v) : a(v) {}
-};
-class S6 {
- int a;
- S6() : a(0) {}
-
-public:
- S6(const S6 &s6) : a(s6.a) {}
- S6(int v) : a(v) {}
-};
-
-S3 h;
-#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}}
-
-template <class I, class C>
-int foomain(int argc, char **argv) {
- I e(4); // expected-note {{'e' defined here}}
- I g(5); // expected-note {{'g' defined here}}
- int i;
- int &j = i; // expected-note {{'j' defined here}}
-#pragma omp parallel
-#pragma omp for lastprivate // expected-error {{expected '(' after 'lastprivate'}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for lastprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for lastprivate() // expected-error {{expected expression}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for lastprivate(argc)
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for lastprivate(S1) // expected-error {{'S1' does not refer to a value}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for lastprivate(a, b) // expected-error {{lastprivate variable with incomplete type 'S1'}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for lastprivate(argv[1]) // expected-error {{expected variable name}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for lastprivate(e, g) // expected-error 2 {{lastprivate variable must have an accessible, unambiguous default constructor}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for lastprivate(h) // expected-error {{threadprivate or thread local variable cannot be lastprivate}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for linear(i) // expected-error {{unexpected OpenMP clause 'linear' in directive '#pragma omp for'}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
- {
- int v = 0;
- int i; // expected-note {{predetermined as private}}
-#pragma omp for lastprivate(i) // expected-error {{lastprivate variable must be shared}}
- for (int k = 0; k < argc; ++k) {
- i = k;
- v += i;
- }
- }
-#pragma omp parallel shared(i)
-#pragma omp parallel private(i)
-#pragma omp for lastprivate(j) // expected-error {{arguments of OpenMP clause 'lastprivate' cannot be of reference type}}
- for (int k = 0; k < argc; ++k)
- ++k;
-#pragma omp parallel
-#pragma omp for lastprivate(i)
- for (int k = 0; k < argc; ++k)
- ++k;
- return 0;
-}
-
-int main(int argc, char **argv) {
- const int d = 5; // expected-note {{predetermined as shared}}
- const int da[5] = {0}; // expected-note {{predetermined as shared}}
- S4 e(4); // expected-note {{'e' defined here}}
- S5 g(5); // expected-note {{'g' defined here}}
- S3 m; // expected-note 2 {{'m' defined here}}
- S6 n(2);
- int i;
- int &j = i; // expected-note {{'j' defined here}}
-#pragma omp parallel
-#pragma omp for lastprivate // expected-error {{expected '(' after 'lastprivate'}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate() // expected-error {{expected expression}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(argc)
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(S1) // expected-error {{'S1' does not refer to a value}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(a, b, c, d, f) // expected-error {{lastprivate variable with incomplete type 'S1'}} expected-error 3 {{shared variable cannot be lastprivate}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(argv[1]) // expected-error {{expected variable name}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(2 * 2) // expected-error {{expected variable name}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(ba)
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(ca) // expected-error {{shared variable cannot be lastprivate}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(da) // expected-error {{shared variable cannot be lastprivate}}
- for (i = 0; i < argc; ++i)
- foo();
- int xa;
-#pragma omp parallel
-#pragma omp for lastprivate(xa) // OK
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(S2::S2s) // expected-error {{shared variable cannot be lastprivate}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(S2::S2sc) // expected-error {{shared variable cannot be lastprivate}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for safelen(5) // expected-error {{unexpected OpenMP clause 'safelen' in directive '#pragma omp for'}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(e, g) // expected-error 2 {{lastprivate variable must have an accessible, unambiguous default constructor}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(m) // expected-error {{lastprivate variable must have an accessible, unambiguous copy assignment operator}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(h) // expected-error {{threadprivate or thread local variable cannot be lastprivate}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for private(xa), lastprivate(xa) // expected-error {{private variable cannot be lastprivate}} expected-note {{defined as private}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(i)
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel private(xa) // expected-note {{defined as private}}
-#pragma omp for lastprivate(xa) // expected-error {{lastprivate variable must be shared}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel reduction(+ : xa) // expected-note {{defined as reduction}}
-#pragma omp for lastprivate(xa) // expected-error {{lastprivate variable must be shared}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(j) // expected-error {{arguments of OpenMP clause 'lastprivate' cannot be of reference type}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for firstprivate(m) lastprivate(m) // expected-error {{lastprivate variable must have an accessible, unambiguous copy assignment operator}}
- for (i = 0; i < argc; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for lastprivate(n) firstprivate(n) // OK
- for (i = 0; i < argc; ++i)
- foo();
- return foomain<S4, S5>(argc, argv); // expected-note {{in instantiation of function template specialization 'foomain<S4, S5>' requested here}}
-}
Removed: cfe/trunk/test/OpenMP/for_loop_messages.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_loop_messages.cpp?rev=211112&view=auto
==============================================================================
--- cfe/trunk/test/OpenMP/for_loop_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/for_loop_messages.cpp (removed)
@@ -1,680 +0,0 @@
-// RUN: %clang_cc1 -fsyntax-only -fopenmp=libiomp5 -x c++ -std=c++11 -fexceptions -fcxx-exceptions -verify %s
-
-class S {
- int a;
- S() : a(0) {}
-
-public:
- S(int v) : a(v) {}
- S(const S &s) : a(s.a) {}
-};
-
-static int sii;
-#pragma omp threadprivate(sii) // expected-note {{defined as threadprivate or thread local}}
-
-int test_iteration_spaces() {
- const int N = 100;
- float a[N], b[N], c[N];
- int ii, jj, kk;
- float fii;
- double dii;
-#pragma omp parallel
-#pragma omp for
- for (int i = 0; i < 10; i += 1) {
- c[i] = a[i] + b[i];
- }
-#pragma omp parallel
-#pragma omp for
- for (char i = 0; i < 10; i++) {
- c[i] = a[i] + b[i];
- }
-#pragma omp parallel
-#pragma omp for
- for (char i = 0; i < 10; i += '\1') {
- c[i] = a[i] + b[i];
- }
-#pragma omp parallel
-#pragma omp for
- for (long long i = 0; i < 10; i++) {
- c[i] = a[i] + b[i];
- }
-#pragma omp parallel
-// expected-error at +2 {{expression must have integral or unscoped enumeration type, not 'double'}}
-#pragma omp for
- for (long long i = 0; i < 10; i += 1.5) {
- c[i] = a[i] + b[i];
- }
-#pragma omp parallel
-#pragma omp for
- for (long long i = 0; i < 'z'; i += 1u) {
- c[i] = a[i] + b[i];
- }
-#pragma omp parallel
-// expected-error at +2 {{variable must be of integer or random access iterator type}}
-#pragma omp for
- for (float fi = 0; fi < 10.0; fi++) {
- c[(int)fi] = a[(int)fi] + b[(int)fi];
- }
-#pragma omp parallel
-// expected-error at +2 {{variable must be of integer or random access iterator type}}
-#pragma omp for
- for (double fi = 0; fi < 10.0; fi++) {
- c[(int)fi] = a[(int)fi] + b[(int)fi];
- }
-#pragma omp parallel
-// expected-error at +2 {{variable must be of integer or random access iterator type}}
-#pragma omp for
- for (int &ref = ii; ref < 10; ref++) {
- }
-#pragma omp parallel
-// expected-error at +2 {{initialization clause of OpenMP for loop must be of the form 'var = init' or 'T var = init'}}
-#pragma omp for
- for (int i; i < 10; i++)
- c[i] = a[i];
-
-#pragma omp parallel
-// expected-error at +2 {{initialization clause of OpenMP for loop must be of the form 'var = init' or 'T var = init'}}
-#pragma omp for
- for (int i = 0, j = 0; i < 10; ++i)
- c[i] = a[i];
-
-#pragma omp parallel
-// expected-error at +2 {{initialization clause of OpenMP for loop must be of the form 'var = init' or 'T var = init'}}
-#pragma omp for
- for (; ii < 10; ++ii)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-warning at +3 {{expression result unused}}
-// expected-error at +2 {{initialization clause of OpenMP for loop must be of the form 'var = init' or 'T var = init'}}
-#pragma omp for
- for (ii + 1; ii < 10; ++ii)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-error at +2 {{initialization clause of OpenMP for loop must be of the form 'var = init' or 'T var = init'}}
-#pragma omp for
- for (c[ii] = 0; ii < 10; ++ii)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// Ok to skip parenthesises.
-#pragma omp for
- for (((ii)) = 0; ii < 10; ++ii)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-error at +2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}}
-#pragma omp for
- for (int i = 0; i; i++)
- c[i] = a[i];
-
-#pragma omp parallel
-// expected-error at +3 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}}
-// expected-error at +2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'i'}}
-#pragma omp for
- for (int i = 0; jj < kk; ii++)
- c[i] = a[i];
-
-#pragma omp parallel
-// expected-error at +2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}}
-#pragma omp for
- for (int i = 0; !!i; i++)
- c[i] = a[i];
-
-#pragma omp parallel
-// expected-error at +2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}}
-#pragma omp for
- for (int i = 0; i != 1; i++)
- c[i] = a[i];
-
-#pragma omp parallel
-// expected-error at +2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}}
-#pragma omp for
- for (int i = 0;; i++)
- c[i] = a[i];
-
-#pragma omp parallel
-// Ok.
-#pragma omp for
- for (int i = 11; i > 10; i--)
- c[i] = a[i];
-
-#pragma omp parallel
-// Ok.
-#pragma omp for
- for (int i = 0; i < 10; ++i)
- c[i] = a[i];
-
-#pragma omp parallel
-// Ok.
-#pragma omp for
- for (ii = 0; ii < 10; ++ii)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-error at +2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}
-#pragma omp for
- for (ii = 0; ii < 10; ++jj)
- c[ii] = a[jj];
-
-#pragma omp parallel
-// expected-error at +2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}
-#pragma omp for
- for (ii = 0; ii < 10; ++++ii)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// Ok but undefined behavior (in general, cannot check that incr
-// is really loop-invariant).
-#pragma omp for
- for (ii = 0; ii < 10; ii = ii + ii)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-error at +2 {{expression must have integral or unscoped enumeration type, not 'float'}}
-#pragma omp for
- for (ii = 0; ii < 10; ii = ii + 1.0f)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// Ok - step was converted to integer type.
-#pragma omp for
- for (ii = 0; ii < 10; ii = ii + (int)1.1f)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-error at +2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}
-#pragma omp for
- for (ii = 0; ii < 10; jj = ii + 2)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-warning at +3 {{relational comparison result unused}}
-// expected-error at +2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}
-#pragma omp for
- for (ii = 0; ii<10; jj> kk + 2)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-error at +2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}
-#pragma omp for
- for (ii = 0; ii < 10;)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-warning at +3 {{expression result unused}}
-// expected-error at +2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}
-#pragma omp for
- for (ii = 0; ii < 10; !ii)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-error at +2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}
-#pragma omp for
- for (ii = 0; ii < 10; ii ? ++ii : ++jj)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-error at +2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}}
-#pragma omp for
- for (ii = 0; ii < 10; ii = ii < 10)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be positive due to this condition}}
-// expected-error at +2 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}}
-#pragma omp for
- for (ii = 0; ii < 10; ii = ii + 0)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be positive due to this condition}}
-// expected-error at +2 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}}
-#pragma omp for
- for (ii = 0; ii < 10; ii = ii + (int)(0.8 - 0.45))
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be positive due to this condition}}
-// expected-error at +2 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}}
-#pragma omp for
- for (ii = 0; (ii) < 10; ii -= 25)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be positive due to this condition}}
-// expected-error at +2 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}}
-#pragma omp for
- for (ii = 0; (ii < 10); ii -= 0)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be negative due to this condition}}
-// expected-error at +2 {{increment expression must cause 'ii' to decrease on each iteration of OpenMP for loop}}
-#pragma omp for
- for (ii = 0; ii > 10; (ii += 0))
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be positive due to this condition}}
-// expected-error at +2 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}}
-#pragma omp for
- for (ii = 0; ii < 10; (ii) = (1 - 1) + (ii))
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be negative due to this condition}}
-// expected-error at +2 {{increment expression must cause 'ii' to decrease on each iteration of OpenMP for loop}}
-#pragma omp for
- for ((ii = 0); ii > 10; (ii -= 0))
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be positive due to this condition}}
-// expected-error at +2 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}}
-#pragma omp for
- for (ii = 0; (ii < 10); (ii -= 0))
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-note at +2 {{defined as firstprivate}}
-// expected-error at +2 {{loop iteration variable may not be firstprivate}}
-#pragma omp for firstprivate(ii)
- for (ii = 0; ii < 10; ii++)
- c[ii] = a[ii];
-
-#pragma omp parallel
-// expected-error at +3 {{unexpected OpenMP clause 'linear' in directive '#pragma omp for'}}
-// expected-note at +2 {{defined as linear}}
-// expected-error at +2 {{loop iteration variable may not be linear}}
-#pragma omp for linear(ii)
- for (ii = 0; ii < 10; ii++)
- c[ii] = a[ii];
-
-#pragma omp parallel
-#pragma omp for private(ii)
- for (ii = 0; ii < 10; ii++)
- c[ii] = a[ii];
-
-#pragma omp parallel
-#pragma omp for lastprivate(ii)
- for (ii = 0; ii < 10; ii++)
- c[ii] = a[ii];
-
-#pragma omp parallel
- {
-// expected-error at +2 {{loop iteration variable may not be threadprivate or thread local}}
-#pragma omp for
- for (sii = 0; sii < 10; sii += 1)
- c[sii] = a[sii];
- }
-
-#pragma omp parallel
-// expected-error at +2 {{statement after '#pragma omp for' must be a for loop}}
-#pragma omp for
- for (auto &item : a) {
- item = item + 1;
- }
-
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be positive due to this condition}}
-// expected-error at +2 {{increment expression must cause 'i' to increase on each iteration of OpenMP for loop}}
-#pragma omp for
- for (unsigned i = 9; i < 10; i--) {
- c[i] = a[i] + b[i];
- }
-
- int(*lb)[4] = nullptr;
-#pragma omp parallel
-#pragma omp for
- for (int(*p)[4] = lb; p < lb + 8; ++p) {
- }
-
-#pragma omp parallel
-// expected-warning at +2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}
-#pragma omp for
- for (int a{0}; a < 10; ++a) {
- }
-
- return 0;
-}
-
-// Iterators allowed in openmp for-loops.
-namespace std {
-struct random_access_iterator_tag {};
-template <class Iter>
-struct iterator_traits {
- typedef typename Iter::difference_type difference_type;
- typedef typename Iter::iterator_category iterator_category;
-};
-template <class Iter>
-typename iterator_traits<Iter>::difference_type
-distance(Iter first, Iter last) { return first - last; }
-}
-class Iter0 {
-public:
- Iter0() {}
- Iter0(const Iter0 &) {}
- Iter0 operator++() { return *this; }
- Iter0 operator--() { return *this; }
- bool operator<(Iter0 a) { return true; }
-};
-int operator-(Iter0 a, Iter0 b) { return 0; }
-class Iter1 {
-public:
- Iter1(float f = 0.0f, double d = 0.0) {}
- Iter1(const Iter1 &) {}
- Iter1 operator++() { return *this; }
- Iter1 operator--() { return *this; }
- bool operator<(Iter1 a) { return true; }
- bool operator>=(Iter1 a) { return false; }
-};
-class GoodIter {
-public:
- GoodIter() {}
- GoodIter(const GoodIter &) {}
- GoodIter(int fst, int snd) {}
- GoodIter &operator=(const GoodIter &that) { return *this; }
- GoodIter &operator=(const Iter0 &that) { return *this; }
- GoodIter &operator+=(int x) { return *this; }
- explicit GoodIter(void *) {}
- GoodIter operator++() { return *this; }
- GoodIter operator--() { return *this; }
- bool operator!() { return true; }
- bool operator<(GoodIter a) { return true; }
- bool operator<=(GoodIter a) { return true; }
- bool operator>=(GoodIter a) { return false; }
- typedef int difference_type;
- typedef std::random_access_iterator_tag iterator_category;
-};
-int operator-(GoodIter a, GoodIter b) { return 0; }
-GoodIter operator-(GoodIter a) { return a; }
-GoodIter operator-(GoodIter a, int v) { return GoodIter(); }
-GoodIter operator+(GoodIter a, int v) { return GoodIter(); }
-GoodIter operator-(int v, GoodIter a) { return GoodIter(); }
-GoodIter operator+(int v, GoodIter a) { return GoodIter(); }
-
-int test_with_random_access_iterator() {
- GoodIter begin, end;
- Iter0 begin0, end0;
-#pragma omp parallel
-#pragma omp for
- for (GoodIter I = begin; I < end; ++I)
- ++I;
-#pragma omp parallel
-// expected-error at +2 {{variable must be of integer or random access iterator type}}
-#pragma omp for
- for (GoodIter &I = begin; I < end; ++I)
- ++I;
-#pragma omp parallel
-#pragma omp for
- for (GoodIter I = begin; I >= end; --I)
- ++I;
-#pragma omp parallel
-// expected-warning at +2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}
-#pragma omp for
- for (GoodIter I(begin); I < end; ++I)
- ++I;
-#pragma omp parallel
-// expected-warning at +2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}
-#pragma omp for
- for (GoodIter I(nullptr); I < end; ++I)
- ++I;
-#pragma omp parallel
-// expected-warning at +2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}
-#pragma omp for
- for (GoodIter I(0); I < end; ++I)
- ++I;
-#pragma omp parallel
-// expected-warning at +2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}
-#pragma omp for
- for (GoodIter I(1, 2); I < end; ++I)
- ++I;
-#pragma omp parallel
-#pragma omp for
- for (begin = GoodIter(0); begin < end; ++begin)
- ++begin;
-#pragma omp parallel
-#pragma omp for
- for (begin = begin0; begin < end; ++begin)
- ++begin;
-#pragma omp parallel
-// expected-error at +2 {{initialization clause of OpenMP for loop must be of the form 'var = init' or 'T var = init'}}
-#pragma omp for
- for (++begin; begin < end; ++begin)
- ++begin;
-#pragma omp parallel
-#pragma omp for
- for (begin = end; begin < end; ++begin)
- ++begin;
-#pragma omp parallel
-// expected-error at +2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'I'}}
-#pragma omp for
- for (GoodIter I = begin; I - I; ++I)
- ++I;
-#pragma omp parallel
-// expected-error at +2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'I'}}
-#pragma omp for
- for (GoodIter I = begin; begin < end; ++I)
- ++I;
-#pragma omp parallel
-// expected-error at +2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'I'}}
-#pragma omp for
- for (GoodIter I = begin; !I; ++I)
- ++I;
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be negative due to this condition}}
-// expected-error at +2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}}
-#pragma omp for
- for (GoodIter I = begin; I >= end; I = I + 1)
- ++I;
-#pragma omp parallel
-#pragma omp for
- for (GoodIter I = begin; I >= end; I = I - 1)
- ++I;
-#pragma omp parallel
-// expected-error at +2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'I'}}
-#pragma omp for
- for (GoodIter I = begin; I >= end; I = -I)
- ++I;
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be negative due to this condition}}
-// expected-error at +2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}}
-#pragma omp for
- for (GoodIter I = begin; I >= end; I = 2 + I)
- ++I;
-#pragma omp parallel
-// expected-error at +2 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'I'}}
-#pragma omp for
- for (GoodIter I = begin; I >= end; I = 2 - I)
- ++I;
-#pragma omp parallel
-#pragma omp for
- for (Iter0 I = begin0; I < end0; ++I)
- ++I;
-#pragma omp parallel
-// Initializer is constructor without params.
-// expected-warning at +2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}
-#pragma omp for
- for (Iter0 I; I < end0; ++I)
- ++I;
- Iter1 begin1, end1;
-#pragma omp parallel
-#pragma omp for
- for (Iter1 I = begin1; I < end1; ++I)
- ++I;
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be negative due to this condition}}
-// expected-error at +2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}}
-#pragma omp for
- for (Iter1 I = begin1; I >= end1; ++I)
- ++I;
-#pragma omp parallel
-// Initializer is constructor with all default params.
-// expected-warning at +2 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}}
-#pragma omp for
- for (Iter1 I; I < end1; ++I) {
- }
- return 0;
-}
-
-template <typename IT, int ST>
-class TC {
-public:
- int dotest_lt(IT begin, IT end) {
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be positive due to this condition}}
-// expected-error at +2 {{increment expression must cause 'I' to increase on each iteration of OpenMP for loop}}
-#pragma omp for
- for (IT I = begin; I < end; I = I + ST) {
- ++I;
- }
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be positive due to this condition}}
-// expected-error at +2 {{increment expression must cause 'I' to increase on each iteration of OpenMP for loop}}
-#pragma omp for
- for (IT I = begin; I <= end; I += ST) {
- ++I;
- }
-#pragma omp parallel
-#pragma omp for
- for (IT I = begin; I < end; ++I) {
- ++I;
- }
- }
-
- static IT step() {
- return IT(ST);
- }
-};
-template <typename IT, int ST = 0>
-int dotest_gt(IT begin, IT end) {
-#pragma omp parallel
-// expected-note at +3 2 {{loop step is expected to be negative due to this condition}}
-// expected-error at +2 2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}}
-#pragma omp for
- for (IT I = begin; I >= end; I = I + ST) {
- ++I;
- }
-#pragma omp parallel
-// expected-note at +3 2 {{loop step is expected to be negative due to this condition}}
-// expected-error at +2 2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}}
-#pragma omp for
- for (IT I = begin; I >= end; I += ST) {
- ++I;
- }
-
-#pragma omp parallel
-// expected-note at +3 {{loop step is expected to be negative due to this condition}}
-// expected-error at +2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}}
-#pragma omp for
- for (IT I = begin; I >= end; ++I) {
- ++I;
- }
-
-#pragma omp parallel
-#pragma omp for
- for (IT I = begin; I < end; I += TC<int, ST>::step()) {
- ++I;
- }
-}
-
-void test_with_template() {
- GoodIter begin, end;
- TC<GoodIter, 100> t1;
- TC<GoodIter, -100> t2;
- t1.dotest_lt(begin, end);
- t2.dotest_lt(begin, end); // expected-note {{in instantiation of member function 'TC<GoodIter, -100>::dotest_lt' requested here}}
- dotest_gt(begin, end); // expected-note {{in instantiation of function template specialization 'dotest_gt<GoodIter, 0>' requested here}}
- dotest_gt<unsigned, -10>(0, 100); // expected-note {{in instantiation of function template specialization 'dotest_gt<unsigned int, -10>' requested here}}
-}
-
-void test_loop_break() {
- const int N = 100;
- float a[N], b[N], c[N];
-#pragma omp parallel
-#pragma omp for
- for (int i = 0; i < 10; i++) {
- c[i] = a[i] + b[i];
- for (int j = 0; j < 10; ++j) {
- if (a[i] > b[j])
- break; // OK in nested loop
- }
- switch (i) {
- case 1:
- b[i]++;
- break;
- default:
- break;
- }
- if (c[i] > 10)
- break; // expected-error {{'break' statement cannot be used in OpenMP for loop}}
-
- if (c[i] > 11)
- break; // expected-error {{'break' statement cannot be used in OpenMP for loop}}
- }
-
-#pragma omp parallel
-#pragma omp for
- for (int i = 0; i < 10; i++) {
- for (int j = 0; j < 10; j++) {
- c[i] = a[i] + b[i];
- if (c[i] > 10) {
- if (c[i] < 20) {
- break; // OK
- }
- }
- }
- }
-}
-
-void test_loop_eh() {
- const int N = 100;
- float a[N], b[N], c[N];
-#pragma omp parallel
-#pragma omp for
- for (int i = 0; i < 10; i++) {
- c[i] = a[i] + b[i];
- try {
- for (int j = 0; j < 10; ++j) {
- if (a[i] > b[j])
- throw a[i];
- }
- throw a[i];
- } catch (float f) {
- if (f > 0.1)
- throw a[i];
- return; // expected-error {{cannot return from OpenMP region}}
- }
- switch (i) {
- case 1:
- b[i]++;
- break;
- default:
- break;
- }
- for (int j = 0; j < 10; j++) {
- if (c[i] > 10)
- throw c[i];
- }
- }
- if (c[9] > 10)
- throw c[9]; // OK
-
-#pragma omp parallel
-#pragma omp for
- for (int i = 0; i < 10; ++i) {
- struct S {
- void g() { throw 0; }
- };
- }
-}
-
-void test_loop_firstprivate_lastprivate() {
- S s(4);
-#pragma omp parallel
-#pragma omp for lastprivate(s) firstprivate(s)
- for (int i = 0; i < 16; ++i)
- ;
-}
Removed: cfe/trunk/test/OpenMP/for_misc_messages.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_misc_messages.c?rev=211112&view=auto
==============================================================================
--- cfe/trunk/test/OpenMP/for_misc_messages.c (original)
+++ cfe/trunk/test/OpenMP/for_misc_messages.c (removed)
@@ -1,362 +0,0 @@
-// RUN: %clang_cc1 -fsyntax-only -fopenmp=libiomp5 -verify %s
-
-// expected-error at +1 {{unexpected OpenMP directive '#pragma omp for'}}
-#pragma omp for
-
-// expected-error at +1 {{unexpected OpenMP directive '#pragma omp for'}}
-#pragma omp for foo
-
-void test_no_clause() {
- int i;
-#pragma omp for
- for (i = 0; i < 16; ++i)
- ;
-
-// expected-error at +2 {{statement after '#pragma omp for' must be a for loop}}
-#pragma omp for
- ++i;
-}
-
-void test_branch_protected_scope() {
- int i = 0;
-L1:
- ++i;
-
- int x[24];
-
-#pragma omp parallel
-#pragma omp for
- for (i = 0; i < 16; ++i) {
- if (i == 5)
- goto L1; // expected-error {{use of undeclared label 'L1'}}
- else if (i == 6)
- return; // expected-error {{cannot return from OpenMP region}}
- else if (i == 7)
- goto L2;
- else if (i == 8) {
- L2:
- x[i]++;
- }
- }
-
- if (x[0] == 0)
- goto L2; // expected-error {{use of undeclared label 'L2'}}
- else if (x[1] == 1)
- goto L1;
-}
-
-void test_invalid_clause() {
- int i;
-#pragma omp parallel
-// expected-warning at +1 {{extra tokens at the end of '#pragma omp for' are ignored}}
-#pragma omp for foo bar
- for (i = 0; i < 16; ++i)
- ;
-}
-
-void test_non_identifiers() {
- int i, x;
-
-#pragma omp parallel
-// expected-warning at +1 {{extra tokens at the end of '#pragma omp for' are ignored}}
-#pragma omp for;
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +2 {{unexpected OpenMP clause 'linear' in directive '#pragma omp for'}}
-// expected-warning at +1 {{extra tokens at the end of '#pragma omp for' are ignored}}
-#pragma omp for linear(x);
- for (i = 0; i < 16; ++i)
- ;
-
-#pragma omp parallel
-// expected-warning at +1 {{extra tokens at the end of '#pragma omp for' are ignored}}
-#pragma omp for private(x);
- for (i = 0; i < 16; ++i)
- ;
-
-#pragma omp parallel
-// expected-warning at +1 {{extra tokens at the end of '#pragma omp for' are ignored}}
-#pragma omp for, private(x);
- for (i = 0; i < 16; ++i)
- ;
-}
-
-extern int foo();
-
-void test_collapse() {
- int i;
-#pragma omp parallel
-// expected-error at +1 {{expected '('}}
-#pragma omp for collapse
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expected expression}} expected-error at +1 {{expected ')'}} expected-note at +1 {{to match this '('}}
-#pragma omp for collapse(
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expected expression}}
-#pragma omp for collapse()
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expected expression}} expected-error at +1 {{expected ')'}} expected-note at +1 {{to match this '('}}
-#pragma omp for collapse(,
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expected expression}} expected-error at +1 {{expected ')'}} expected-note at +1 {{to match this '('}}
-#pragma omp for collapse(, )
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-warning at +2 {{extra tokens at the end of '#pragma omp for' are ignored}}
-// expected-error at +1 {{expected '('}}
-#pragma omp for collapse 4)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +2 {{expected ')'}}
-// expected-note at +1 {{to match this '('}}
-#pragma omp for collapse(4
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +2 {{expected ')'}}
-// expected-note at +1 {{to match this '('}}
-#pragma omp for collapse(4,
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +2 {{expected ')'}}
-// expected-note at +1 {{to match this '('}}
-#pragma omp for collapse(4, )
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-#pragma omp for collapse(4)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +2 {{expected ')'}}
-// expected-note at +1 {{to match this '('}}
-#pragma omp for collapse(4 4)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +2 {{expected ')'}}
-// expected-note at +1 {{to match this '('}}
-#pragma omp for collapse(4, , 4)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-#pragma omp for collapse(4)
- for (int i1 = 0; i1 < 16; ++i1)
- for (int i2 = 0; i2 < 16; ++i2)
- for (int i3 = 0; i3 < 16; ++i3)
- for (int i4 = 0; i4 < 16; ++i4)
- foo();
-#pragma omp parallel
-// expected-error at +2 {{expected ')'}}
-// expected-note at +1 {{to match this '('}}
-#pragma omp for collapse(4, 8)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expression is not an integer constant expression}}
-#pragma omp for collapse(2.5)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expression is not an integer constant expression}}
-#pragma omp for collapse(foo())
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{argument to 'collapse' clause must be a positive integer value}}
-#pragma omp for collapse(-5)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{argument to 'collapse' clause must be a positive integer value}}
-#pragma omp for collapse(0)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{argument to 'collapse' clause must be a positive integer value}}
-#pragma omp for collapse(5 - 5)
- for (i = 0; i < 16; ++i)
- ;
-}
-
-void test_private() {
- int i;
-#pragma omp parallel
-// expected-error at +2 {{expected expression}}
-// expected-error at +1 {{expected ')'}} expected-note at +1 {{to match this '('}}
-#pragma omp for private(
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this '('}}
-// expected-error at +1 2 {{expected expression}}
-#pragma omp for private(,
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 2 {{expected expression}}
-#pragma omp for private(, )
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expected expression}}
-#pragma omp for private()
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expected expression}}
-#pragma omp for private(int)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expected variable name}}
-#pragma omp for private(0)
- for (i = 0; i < 16; ++i)
- ;
-
- int x, y, z;
-#pragma omp parallel
-#pragma omp for private(x)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-#pragma omp for private(x, y)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-#pragma omp for private(x, y, z)
- for (i = 0; i < 16; ++i) {
- x = y * i + z;
- }
-}
-
-void test_lastprivate() {
- int i;
-#pragma omp parallel
-// expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this '('}}
-// expected-error at +1 {{expected expression}}
-#pragma omp for lastprivate(
- for (i = 0; i < 16; ++i)
- ;
-
-#pragma omp parallel
-// expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this '('}}
-// expected-error at +1 2 {{expected expression}}
-#pragma omp for lastprivate(,
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 2 {{expected expression}}
-#pragma omp for lastprivate(, )
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expected expression}}
-#pragma omp for lastprivate()
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expected expression}}
-#pragma omp for lastprivate(int)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expected variable name}}
-#pragma omp for lastprivate(0)
- for (i = 0; i < 16; ++i)
- ;
-
- int x, y, z;
-#pragma omp parallel
-#pragma omp for lastprivate(x)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-#pragma omp for lastprivate(x, y)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-#pragma omp for lastprivate(x, y, z)
- for (i = 0; i < 16; ++i)
- ;
-}
-
-void test_firstprivate() {
- int i;
-#pragma omp parallel
-// expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this '('}}
-// expected-error at +1 {{expected expression}}
-#pragma omp for firstprivate(
- for (i = 0; i < 16; ++i)
- ;
-
-#pragma omp parallel
-// expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this '('}}
-// expected-error at +1 2 {{expected expression}}
-#pragma omp for firstprivate(,
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 2 {{expected expression}}
-#pragma omp for firstprivate(, )
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expected expression}}
-#pragma omp for firstprivate()
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expected expression}}
-#pragma omp for firstprivate(int)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-// expected-error at +1 {{expected variable name}}
-#pragma omp for firstprivate(0)
- for (i = 0; i < 16; ++i)
- ;
-
- int x, y, z;
-#pragma omp parallel
-#pragma omp for lastprivate(x) firstprivate(x)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-#pragma omp for lastprivate(x, y) firstprivate(x, y)
- for (i = 0; i < 16; ++i)
- ;
-#pragma omp parallel
-#pragma omp for lastprivate(x, y, z) firstprivate(x, y, z)
- for (i = 0; i < 16; ++i)
- ;
-}
-
-void test_loop_messages() {
- float a[100], b[100], c[100];
-#pragma omp parallel
-// expected-error at +2 {{variable must be of integer or pointer type}}
-#pragma omp for
- for (float fi = 0; fi < 10.0; fi++) {
- c[(int)fi] = a[(int)fi] + b[(int)fi];
- }
-#pragma omp parallel
-// expected-error at +2 {{variable must be of integer or pointer type}}
-#pragma omp for
- for (double fi = 0; fi < 10.0; fi++) {
- c[(int)fi] = a[(int)fi] + b[(int)fi];
- }
-}
-
Removed: cfe/trunk/test/OpenMP/for_private_messages.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_private_messages.cpp?rev=211112&view=auto
==============================================================================
--- cfe/trunk/test/OpenMP/for_private_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/for_private_messages.cpp (removed)
@@ -1,134 +0,0 @@
-// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
-
-void foo() {
-}
-
-bool foobool(int argc) {
- return argc;
-}
-
-struct S1; // expected-note 2 {{declared here}} expected-note 2 {{forward declaration of 'S1'}}
-extern S1 a;
-class S2 {
- mutable int a;
-public:
- S2():a(0) { }
-};
-const S2 b;
-const S2 ba[5];
-class S3 {
- int a;
-public:
- S3():a(0) { }
-};
-const S3 ca[5];
-class S4 { // expected-note {{'S4' declared here}}
- int a;
- S4();
-public:
- S4(int v):a(v) { }
-};
-class S5 { // expected-note {{'S5' declared here}}
- int a;
- S5():a(0) {}
-public:
- S5(int v):a(v) { }
-};
-
-S3 h;
-#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}}
-
-template<class I, class C> int foomain(I argc, C **argv) {
- I e(4);
- I g(5);
- int i;
- int &j = i; // expected-note {{'j' defined here}}
- #pragma omp for private // expected-error {{expected '(' after 'private'}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private () // expected-error {{expected expression}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (argc)
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (S1) // expected-error {{'S1' does not refer to a value}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (a, b) // expected-error {{private variable with incomplete type 'S1'}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (argv[1]) // expected-error {{expected variable name}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private(e, g)
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private(h) // expected-error {{threadprivate or thread local variable cannot be private}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for shared(i) // expected-error {{unexpected OpenMP clause 'shared' in directive '#pragma omp for'}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp parallel
- {
- int v = 0;
- int i;
- #pragma omp for private(i)
- for (int k = 0; k < argc; ++k) { i = k; v += i; }
- }
- #pragma omp parallel shared(i)
- #pragma omp parallel private(i)
- #pragma omp for private(j) // expected-error {{arguments of OpenMP clause 'private' cannot be of reference type}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private(i)
- for (int k = 0; k < argc; ++k) ++k;
- return 0;
-}
-
-int main(int argc, char **argv) {
- S4 e(4); // expected-note {{'e' defined here}}
- S5 g(5); // expected-note {{'g' defined here}}
- int i;
- int &j = i; // expected-note {{'j' defined here}}
- #pragma omp for private // expected-error {{expected '(' after 'private'}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private () // expected-error {{expected expression}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (argc)
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (S1) // expected-error {{'S1' does not refer to a value}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (a, b) // expected-error {{private variable with incomplete type 'S1'}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private (argv[1]) // expected-error {{expected variable name}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private(e, g) // expected-error 2 {{private variable must have an accessible, unambiguous default constructor}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private(h) // expected-error {{threadprivate or thread local variable cannot be private}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for shared(i) // expected-error {{unexpected OpenMP clause 'shared' in directive '#pragma omp for'}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp parallel
- {
- int i;
- #pragma omp for private(i)
- for (int k = 0; k < argc; ++k) ++k;
- }
- #pragma omp parallel shared(i)
- #pragma omp parallel private(i)
- #pragma omp for private(j) // expected-error {{arguments of OpenMP clause 'private' cannot be of reference type}}
- for (int k = 0; k < argc; ++k) ++k;
- #pragma omp for private(i)
- for (int k = 0; k < argc; ++k) ++k;
-
- return 0;
-}
-
Removed: cfe/trunk/test/OpenMP/for_reduction_messages.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_reduction_messages.cpp?rev=211112&view=auto
==============================================================================
--- cfe/trunk/test/OpenMP/for_reduction_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/for_reduction_messages.cpp (removed)
@@ -1,350 +0,0 @@
-// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 -o - %s
-
-void foo() {
-}
-
-bool foobool(int argc) {
- return argc;
-}
-
-struct S1; // expected-note {{declared here}} expected-note 4 {{forward declaration of 'S1'}}
-extern S1 a;
-class S2 {
- mutable int a;
- S2 &operator+=(const S2 &arg) { return (*this); }
-
-public:
- S2() : a(0) {}
- S2(S2 &s2) : a(s2.a) {}
- static float S2s; // expected-note 2 {{predetermined as shared}}
- static const float S2sc;
-};
-const float S2::S2sc = 0; // expected-note 2 {{'S2sc' defined here}}
-S2 b; // expected-note 2 {{'b' defined here}}
-const S2 ba[5]; // expected-note 2 {{'ba' defined here}}
-class S3 {
- int a;
-
-public:
- S3() : a(0) {}
- S3(const S3 &s3) : a(s3.a) {}
- S3 operator+=(const S3 &arg1) { return arg1; }
-};
-int operator+=(const S3 &arg1, const S3 &arg2) { return 5; }
-S3 c; // expected-note 2 {{'c' defined here}}
-const S3 ca[5]; // expected-note 2 {{'ca' defined here}}
-extern const int f; // expected-note 4 {{'f' declared here}}
-class S4 { // expected-note {{'S4' declared here}}
- int a;
- S4();
- S4(const S4 &s4);
- S4 &operator+=(const S4 &arg) { return (*this); }
-
-public:
- S4(int v) : a(v) {}
-};
-S4 &operator&=(S4 &arg1, S4 &arg2) { return arg1; }
-class S5 {
- int a;
- S5() : a(0) {}
- S5(const S5 &s5) : a(s5.a) {}
- S5 &operator+=(const S5 &arg);
-
-public:
- S5(int v) : a(v) {}
-};
-class S6 {
- int a;
-
-public:
- S6() : a(6) {}
- operator int() { return 6; }
-} o; // expected-note 2 {{'o' defined here}}
-
-S3 h, k;
-#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}}
-
-template <class T> // expected-note {{declared here}}
-T tmain(T argc) { // expected-note 2 {{'argc' defined here}}
- const T d = T(); // expected-note 4 {{'d' defined here}}
- const T da[5] = {T()}; // expected-note 2 {{'da' defined here}}
- T qa[5] = {T()};
- T i;
- T &j = i; // expected-note 4 {{'j' defined here}}
- S3 &p = k; // expected-note 2 {{'p' defined here}}
- const T &r = da[(int)i]; // expected-note 2 {{'r' defined here}}
- T &q = qa[(int)i]; // expected-note 2 {{'q' defined here}}
- T fl; // expected-note {{'fl' defined here}}
-#pragma omp parallel
-#pragma omp for reduction // expected-error {{expected '(' after 'reduction'}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp for' are ignored}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction( // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(- // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction() // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(*) // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(\) // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(& : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{variable of type 'float' is not valid for specified reduction operation}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp 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}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(|| : argc ? i : argc) // expected-error 2 {{expected variable name}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(foo : argc) //expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(&& : argc)
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(^ : T) // expected-error {{'T' does not refer to a value}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(+ : a, b, c, d, f) // expected-error {{reduction variable with incomplete type 'S1'}} expected-error 3 {{const-qualified variable cannot be reduction}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp 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}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(max : qa[1]) // expected-error 2 {{expected variable name}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(+ : ba) // expected-error {{a reduction variable with array type 'const S2 [5]'}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(* : ca) // expected-error {{a reduction variable with array type 'const S3 [5]'}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp 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]'}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(^ : fl) // expected-error {{variable of type 'float' is not valid for specified reduction operation}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(&& : S2::S2s) // expected-error {{shared variable cannot be reduction}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(&& : S2::S2sc) // expected-error {{const-qualified variable cannot be reduction}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(+ : h, k) // expected-error {{threadprivate or thread local variable cannot be reduction}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(+ : o) // expected-error {{variable of type 'class S6' is not valid for specified reduction operation}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for private(i), reduction(+ : j), reduction(+ : q) // expected-error 4 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel private(k)
-#pragma omp for reduction(+ : p), reduction(+ : p) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(+ : p), reduction(+ : p) // expected-error 3 {{variable can appear only once in OpenMP 'reduction' clause}} expected-note 3 {{previously referenced here}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(+ : r) // expected-error 2 {{const-qualified variable cannot be reduction}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel shared(i)
-#pragma omp parallel reduction(min : i)
-#pragma omp for reduction(max : j) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel private(fl) // expected-note 2 {{defined as private}}
-#pragma omp for reduction(+ : fl) // expected-error 2 {{reduction variable must be shared}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel reduction(* : fl) // expected-note 2 {{defined as reduction}}
-#pragma omp for reduction(+ : fl) // expected-error 2 {{reduction variable must be shared}}
- for (int i = 0; i < 10; ++i)
- foo();
-
- return T();
-}
-
-int main(int argc, char **argv) {
- const int d = 5; // expected-note 2 {{'d' defined here}}
- const int da[5] = {0}; // expected-note {{'da' defined here}}
- int qa[5] = {0};
- S4 e(4); // expected-note {{'e' defined here}}
- S5 g(5); // expected-note {{'g' defined here}}
- int i;
- int &j = i; // expected-note 2 {{'j' defined here}}
- S3 &p = k; // expected-note 2 {{'p' defined here}}
- const int &r = da[i]; // expected-note {{'r' defined here}}
- int &q = qa[i]; // expected-note {{'q' defined here}}
- float fl; // expected-note {{'fl' defined here}}
-#pragma omp parallel
-#pragma omp for reduction // expected-error {{expected '(' after 'reduction'}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp for' are ignored}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction( // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(- // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction() // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(*) // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(\) // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(foo : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(|| : argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(~ : argc) // expected-error {{expected unqualified-id}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(&& : argc)
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(^ : S1) // expected-error {{'S1' does not refer to a value}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(+ : a, b, c, d, f) // expected-error {{reduction variable with incomplete type 'S1'}} expected-error 2 {{const-qualified variable cannot be reduction}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp 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}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(max : argv[1]) // expected-error {{expected variable name}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(+ : ba) // expected-error {{a reduction variable with array type 'const S2 [5]'}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(* : ca) // expected-error {{a reduction variable with array type 'const S3 [5]'}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(- : da) // expected-error {{a reduction variable with array type 'const int [5]'}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(^ : fl) // expected-error {{variable of type 'float' is not valid for specified reduction operation}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(&& : S2::S2s) // expected-error {{shared variable cannot be reduction}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(&& : S2::S2sc) // expected-error {{const-qualified variable cannot be reduction}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp 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}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(+ : h, k) // expected-error {{threadprivate or thread local variable cannot be reduction}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(+ : o) // expected-error {{variable of type 'class S6' is not valid for specified reduction operation}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for private(i), reduction(+ : j), reduction(+ : q) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel private(k)
-#pragma omp for reduction(+ : p), reduction(+ : p) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(+ : p), reduction(+ : p) // expected-error {{variable can appear only once in OpenMP 'reduction' clause}} expected-note {{previously referenced here}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(+ : r) // expected-error {{const-qualified variable cannot be reduction}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel shared(i)
-#pragma omp parallel reduction(min : i)
-#pragma omp for reduction(max : j) // expected-error {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel private(fl) // expected-note {{defined as private}}
-#pragma omp for reduction(+ : fl) // expected-error {{reduction variable must be shared}}
- for (int i = 0; i < 10; ++i)
- foo();
-#pragma omp parallel reduction(* : fl) // expected-note {{defined as reduction}}
-#pragma omp for reduction(+ : fl) // expected-error {{reduction variable must be shared}}
- for (int i = 0; i < 10; ++i)
- foo();
-
- 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}}
-}
Modified: cfe/trunk/test/OpenMP/parallel_reduction_messages.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_reduction_messages.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/parallel_reduction_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/parallel_reduction_messages.cpp Tue Jun 17 12:20:53 2014
@@ -11,230 +11,205 @@ struct S1; // expected-note {{declared h
extern S1 a;
class S2 {
mutable int a;
- S2 &operator+=(const S2 &arg) { return (*this); }
-
+ S2 &operator +=(const S2 &arg) {return (*this);}
public:
- S2() : a(0) {}
- S2(S2 &s2) : a(s2.a) {}
+ S2():a(0) { }
+ S2(S2 &s2):a(s2.a) { }
static float S2s; // expected-note 2 {{predetermined as shared}}
static const float S2sc;
};
const float S2::S2sc = 0; // expected-note 2 {{'S2sc' defined here}}
-S2 b; // expected-note 2 {{'b' defined here}}
-const S2 ba[5]; // expected-note 2 {{'ba' defined here}}
+S2 b; // expected-note 2 {{'b' defined here}}
+const S2 ba[5]; // expected-note 2 {{'ba' defined here}}
class S3 {
int a;
-
public:
- S3() : a(0) {}
- S3(const S3 &s3) : a(s3.a) {}
- S3 operator+=(const S3 &arg1) { return arg1; }
+ S3():a(0) { }
+ S3(const S3 &s3):a(s3.a) { }
+ S3 operator +=(const S3 &arg1) {return arg1;}
};
-int operator+=(const S3 &arg1, const S3 &arg2) { return 5; }
-S3 c; // expected-note 2 {{'c' defined here}}
-const S3 ca[5]; // expected-note 2 {{'ca' defined here}}
+int operator +=(const S3 &arg1, const S3 &arg2) {return 5;}
+S3 c; // expected-note 2 {{'c' defined here}}
+const S3 ca[5]; // expected-note 2 {{'ca' defined here}}
extern const int f; // expected-note 4 {{'f' declared here}}
-class S4 { // expected-note {{'S4' declared here}}
+class S4 { // expected-note {{'S4' declared here}}
int a;
S4();
S4(const S4 &s4);
- S4 &operator+=(const S4 &arg) { return (*this); }
-
+ S4 &operator +=(const S4 &arg) {return (*this);}
public:
- S4(int v) : a(v) {}
+ S4(int v):a(v) { }
};
-S4 &operator&=(S4 &arg1, S4 &arg2) { return arg1; }
+S4 &operator &=(S4 &arg1, S4 &arg2) {return arg1;}
class S5 {
int a;
- S5() : a(0) {}
- S5(const S5 &s5) : a(s5.a) {}
- S5 &operator+=(const S5 &arg);
-
+ S5():a(0) {}
+ S5(const S5 &s5):a(s5.a) { }
+ S5 &operator +=(const S5 &arg);
public:
- S5(int v) : a(v) {}
+ S5(int v):a(v) { }
};
class S6 {
- int a;
-
-public:
- S6() : a(6) {}
- operator int() { return 6; }
+ int a;
+ public:
+ S6():a(6){ }
+ operator int() { return 6; }
} o; // expected-note 2 {{'o' defined here}}
S3 h, k;
#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}}
-template <class T> // expected-note {{declared here}}
-T tmain(T argc) { // expected-note 2 {{'argc' defined here}}
- const T d = T(); // expected-note 4 {{'d' defined here}}
- const T da[5] = {T()}; // expected-note 2 {{'da' defined here}}
- T qa[5] = {T()};
+template <class T> // expected-note {{declared here}}
+T tmain(T argc) { // expected-note 2 {{'argc' defined here}}
+ const T d = T(); // expected-note 4 {{'d' defined here}}
+ const T da[5] = { T() }; // expected-note 2 {{'da' defined here}}
+ T qa[5] = { T() };
T i;
- T &j = i; // expected-note 4 {{'j' defined here}}
- S3 &p = k; // expected-note 2 {{'p' defined here}}
- const T &r = da[(int)i]; // expected-note 2 {{'r' defined here}}
- T &q = qa[(int)i]; // expected-note 2 {{'q' defined here}}
- T fl; // expected-note {{'fl' defined here}}
-#pragma omp parallel reduction // expected-error {{expected '(' after 'reduction'}}
+ T &j = i; // expected-note 4 {{'j' defined here}}
+ S3 &p = k; // expected-note 2 {{'p' defined here}}
+ const T &r = da[(int)i]; // expected-note 2 {{'r' defined here}}
+ T &q = qa[(int)i]; // expected-note 2 {{'q' defined here}}
+ T fl; // expected-note {{'fl' defined here}}
+ #pragma omp parallel reduction // expected-error {{expected '(' after 'reduction'}}
foo();
-#pragma omp parallel reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp parallel' are ignored}}
+ #pragma omp parallel reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp parallel' are ignored}}
foo();
-#pragma omp parallel reduction( // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to match this '('}}
+ #pragma omp parallel reduction ( // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to match this '('}}
foo();
-#pragma omp parallel reduction(- // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
+ #pragma omp parallel reduction (- // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
foo();
-#pragma omp parallel reduction() // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}
+ #pragma omp parallel reduction () // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}
foo();
-#pragma omp parallel reduction(*) // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}}
+ #pragma omp parallel reduction (*) // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}}
foo();
-#pragma omp parallel reduction(\) // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}
+ #pragma omp parallel reduction (\) // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}
foo();
-#pragma omp parallel reduction(& : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{variable of type 'float' is not valid for specified reduction operation}}
+ #pragma omp parallel reduction (&: argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{variable of type 'float' is not valid for specified reduction operation}}
foo();
-#pragma omp parallel 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}}
+ #pragma omp parallel 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}}
foo();
-#pragma omp parallel reduction(|| : argc ? i : argc) // expected-error 2 {{expected variable name}}
+ #pragma omp parallel reduction (|| :argc ? i : argc) // expected-error 2 {{expected variable name}}
foo();
-#pragma omp parallel reduction(foo : argc) //expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}
+ #pragma omp parallel reduction (foo:argc) //expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}
foo();
-#pragma omp parallel reduction(&& : argc)
+ #pragma omp parallel reduction (&& :argc)
foo();
-#pragma omp parallel reduction(^ : T) // expected-error {{'T' does not refer to a value}}
+ #pragma omp parallel reduction (^ : T) // expected-error {{'T' does not refer to a value}}
foo();
-#pragma omp parallel reduction(+ : a, b, c, d, f) // expected-error {{reduction variable with incomplete type 'S1'}} expected-error 3 {{const-qualified variable cannot be reduction}}
+ #pragma omp parallel reduction (+ : a, b, c, d, f) // expected-error {{reduction variable with incomplete type 'S1'}} expected-error 3 {{const-qualified variable cannot be reduction}}
foo();
-#pragma omp parallel 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}}
+ #pragma omp parallel 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}}
foo();
-#pragma omp parallel reduction(max : qa[1]) // expected-error 2 {{expected variable name}}
+ #pragma omp parallel reduction (max : qa[1]) // expected-error 2 {{expected variable name}}
foo();
-#pragma omp parallel reduction(+ : ba) // expected-error {{a reduction variable with array type 'const S2 [5]'}}
+ #pragma omp parallel reduction(+ : ba) // expected-error {{a reduction variable with array type 'const S2 [5]'}}
foo();
-#pragma omp parallel reduction(* : ca) // expected-error {{a reduction variable with array type 'const S3 [5]'}}
+ #pragma omp parallel reduction(* : ca) // expected-error {{a reduction variable with array type 'const S3 [5]'}}
foo();
-#pragma omp parallel reduction(- : da) // expected-error {{a reduction variable with array type 'const int [5]'}} expected-error {{a reduction variable with array type 'const float [5]'}}
+ #pragma omp parallel reduction(- : da) // expected-error {{a reduction variable with array type 'const int [5]'}} expected-error {{a reduction variable with array type 'const float [5]'}}
foo();
-#pragma omp parallel reduction(^ : fl) // expected-error {{variable of type 'float' is not valid for specified reduction operation}}
+ #pragma omp parallel reduction(^ : fl) // expected-error {{variable of type 'float' is not valid for specified reduction operation}}
foo();
-#pragma omp parallel reduction(&& : S2::S2s) // expected-error {{shared variable cannot be reduction}}
+ #pragma omp parallel reduction(&& : S2::S2s) // expected-error {{shared variable cannot be reduction}}
foo();
-#pragma omp parallel reduction(&& : S2::S2sc) // expected-error {{const-qualified variable cannot be reduction}}
+ #pragma omp parallel reduction(&& : S2::S2sc) // expected-error {{const-qualified variable cannot be reduction}}
foo();
-#pragma omp parallel reduction(+ : h, k) // expected-error {{threadprivate or thread local variable cannot be reduction}}
+ #pragma omp parallel reduction(+ : h, k) // expected-error {{threadprivate or thread local variable cannot be reduction}}
foo();
-#pragma omp parallel reduction(+ : o) // expected-error {{variable of type 'class S6' is not valid for specified reduction operation}}
+ #pragma omp parallel reduction(+ : o) // expected-error {{variable of type 'class S6' is not valid for specified reduction operation}}
foo();
-#pragma omp parallel private(i), reduction(+ : j), reduction(+ : q) // expected-error 4 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
+ #pragma omp parallel private(i), reduction(+ : j), reduction(+:q) // expected-error 4 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
foo();
-#pragma omp parallel private(k)
-#pragma omp parallel reduction(+ : p), reduction(+ : p) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
+ #pragma omp parallel private(k)
+ #pragma omp parallel reduction(+ : p), reduction(+ : p) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
foo();
-#pragma omp parallel reduction(+ : p), reduction(+ : p) // expected-error 3 {{variable can appear only once in OpenMP 'reduction' clause}} expected-note 3 {{previously referenced here}}
+ #pragma omp parallel reduction(+ : p), reduction(+ : p) // expected-error 3 {{variable can appear only once in OpenMP 'reduction' clause}} expected-note 3 {{previously referenced here}}
foo();
-#pragma omp parallel reduction(+ : r) // expected-error 2 {{const-qualified variable cannot be reduction}}
+ #pragma omp parallel reduction(+ : r) // expected-error 2 {{const-qualified variable cannot be reduction}}
foo();
-#pragma omp parallel shared(i)
-#pragma omp parallel reduction(min : i)
-#pragma omp parallel reduction(max : j) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
+ #pragma omp parallel shared(i)
+ #pragma omp parallel reduction(min : i)
+ #pragma omp parallel reduction(max : j) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
foo();
-#pragma omp parallel
-#pragma omp for private(fl)
- for (int i = 0; i < 10; ++i)
-#pragma omp parallel reduction(+ : fl)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(- : fl)
- for (int i = 0; i < 10; ++i)
-#pragma omp parallel reduction(+ : fl)
- foo();
return T();
}
int main(int argc, char **argv) {
- const int d = 5; // expected-note 2 {{'d' defined here}}
- const int da[5] = {0}; // expected-note {{'da' defined here}}
- int qa[5] = {0};
+ const int d = 5; // expected-note 2 {{'d' defined here}}
+ const int da[5] = { 0 }; // expected-note {{'da' defined here}}
+ int qa[5] = { 0 };
S4 e(4); // expected-note {{'e' defined here}}
S5 g(5); // expected-note {{'g' defined here}}
int i;
- int &j = i; // expected-note 2 {{'j' defined here}}
- S3 &p = k; // expected-note 2 {{'p' defined here}}
- const int &r = da[i]; // expected-note {{'r' defined here}}
- int &q = qa[i]; // expected-note {{'q' defined here}}
- float fl; // expected-note {{'fl' defined here}}
-#pragma omp parallel reduction // expected-error {{expected '(' after 'reduction'}}
+ int &j = i; // expected-note 2 {{'j' defined here}}
+ S3 &p = k; // expected-note 2 {{'p' defined here}}
+ const int &r = da[i]; // expected-note {{'r' defined here}}
+ int &q = qa[i]; // expected-note {{'q' defined here}}
+ float fl; // expected-note {{'fl' defined here}}
+ #pragma omp parallel reduction // expected-error {{expected '(' after 'reduction'}}
foo();
-#pragma omp parallel reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp parallel' are ignored}}
+ #pragma omp parallel reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp parallel' are ignored}}
foo();
-#pragma omp parallel reduction( // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to match this '('}}
+ #pragma omp parallel reduction ( // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to match this '('}}
foo();
-#pragma omp parallel reduction(- // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
+ #pragma omp parallel reduction (- // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
foo();
-#pragma omp parallel reduction() // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}
+ #pragma omp parallel reduction () // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}
foo();
-#pragma omp parallel reduction(*) // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}}
+ #pragma omp parallel reduction (*) // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}}
foo();
-#pragma omp parallel reduction(\) // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}
+ #pragma omp parallel reduction (\) // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}}
foo();
-#pragma omp parallel reduction(foo : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}
+ #pragma omp parallel reduction (foo: argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}
foo();
-#pragma omp parallel reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
+ #pragma omp parallel reduction (| :argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
foo();
-#pragma omp parallel reduction(|| : argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
+ #pragma omp parallel reduction (|| :argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
foo();
-#pragma omp parallel reduction(~ : argc) // expected-error {{expected unqualified-id}}
+ #pragma omp parallel reduction (~:argc) // expected-error {{expected unqualified-id}}
foo();
-#pragma omp parallel reduction(&& : argc)
+ #pragma omp parallel reduction (&& :argc)
foo();
-#pragma omp parallel reduction(^ : S1) // expected-error {{'S1' does not refer to a value}}
+ #pragma omp parallel reduction (^ : S1) // expected-error {{'S1' does not refer to a value}}
foo();
-#pragma omp parallel reduction(+ : a, b, c, d, f) // expected-error {{reduction variable with incomplete type 'S1'}} expected-error 2 {{const-qualified variable cannot be reduction}}
+ #pragma omp parallel reduction (+ : a, b, c, d, f) // expected-error {{reduction variable with incomplete type 'S1'}} expected-error 2 {{const-qualified variable cannot be reduction}}
foo();
-#pragma omp parallel 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}}
+ #pragma omp parallel 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}}
foo();
-#pragma omp parallel reduction(max : argv[1]) // expected-error {{expected variable name}}
+ #pragma omp parallel reduction (max : argv[1]) // expected-error {{expected variable name}}
foo();
-#pragma omp parallel reduction(+ : ba) // expected-error {{a reduction variable with array type 'const S2 [5]'}}
+ #pragma omp parallel reduction(+ : ba) // expected-error {{a reduction variable with array type 'const S2 [5]'}}
foo();
-#pragma omp parallel reduction(* : ca) // expected-error {{a reduction variable with array type 'const S3 [5]'}}
+ #pragma omp parallel reduction(* : ca) // expected-error {{a reduction variable with array type 'const S3 [5]'}}
foo();
-#pragma omp parallel reduction(- : da) // expected-error {{a reduction variable with array type 'const int [5]'}}
+ #pragma omp parallel reduction(- : da) // expected-error {{a reduction variable with array type 'const int [5]'}}
foo();
-#pragma omp parallel reduction(^ : fl) // expected-error {{variable of type 'float' is not valid for specified reduction operation}}
+ #pragma omp parallel reduction(^ : fl) // expected-error {{variable of type 'float' is not valid for specified reduction operation}}
foo();
-#pragma omp parallel reduction(&& : S2::S2s) // expected-error {{shared variable cannot be reduction}}
+ #pragma omp parallel reduction(&& : S2::S2s) // expected-error {{shared variable cannot be reduction}}
foo();
-#pragma omp parallel reduction(&& : S2::S2sc) // expected-error {{const-qualified variable cannot be reduction}}
+ #pragma omp parallel reduction(&& : S2::S2sc) // expected-error {{const-qualified variable cannot be reduction}}
foo();
-#pragma omp parallel 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}}
+ #pragma omp parallel 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}}
foo();
-#pragma omp parallel reduction(+ : h, k) // expected-error {{threadprivate or thread local variable cannot be reduction}}
+ #pragma omp parallel reduction(+ : h, k) // expected-error {{threadprivate or thread local variable cannot be reduction}}
foo();
-#pragma omp parallel reduction(+ : o) // expected-error {{variable of type 'class S6' is not valid for specified reduction operation}}
+ #pragma omp parallel reduction(+ : o) // expected-error {{variable of type 'class S6' is not valid for specified reduction operation}}
foo();
-#pragma omp parallel private(i), reduction(+ : j), reduction(+ : q) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
+ #pragma omp parallel private(i), reduction(+ : j), reduction(+:q) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
foo();
-#pragma omp parallel private(k)
-#pragma omp parallel reduction(+ : p), reduction(+ : p) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
+ #pragma omp parallel private(k)
+ #pragma omp parallel reduction(+ : p), reduction(+ : p) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
foo();
-#pragma omp parallel reduction(+ : p), reduction(+ : p) // expected-error {{variable can appear only once in OpenMP 'reduction' clause}} expected-note {{previously referenced here}}
+ #pragma omp parallel reduction(+ : p), reduction(+ : p) // expected-error {{variable can appear only once in OpenMP 'reduction' clause}} expected-note {{previously referenced here}}
foo();
-#pragma omp parallel reduction(+ : r) // expected-error {{const-qualified variable cannot be reduction}}
+ #pragma omp parallel reduction(+ : r) // expected-error {{const-qualified variable cannot be reduction}}
foo();
-#pragma omp parallel shared(i)
-#pragma omp parallel reduction(min : i)
-#pragma omp parallel reduction(max : j) // expected-error {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
+ #pragma omp parallel shared(i)
+ #pragma omp parallel reduction(min : i)
+ #pragma omp parallel reduction(max : j) // expected-error {{argument of OpenMP clause 'reduction' must reference the same object in all threads}}
foo();
-#pragma omp parallel
-#pragma omp for private(fl)
- for (int i = 0; i < 10; ++i)
-#pragma omp parallel reduction(+ : fl)
- foo();
-#pragma omp parallel
-#pragma omp for reduction(- : fl)
- for (int i = 0; i < 10; ++i)
-#pragma omp parallel reduction(+ : fl)
- foo();
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}}
}
Modified: cfe/trunk/test/OpenMP/simd_loop_messages.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/simd_loop_messages.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/simd_loop_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/simd_loop_messages.cpp Tue Jun 17 12:20:53 2014
@@ -243,10 +243,7 @@ int test_iteration_spaces() {
for (ii = 0; ii < 10; ii++)
c[ii] = a[ii];
- #pragma omp simd lastprivate(ii)
- for (ii = 0; ii < 10; ii++)
- c[ii] = a[ii];
-
+ // TODO: Add test for lastprivate.
#pragma omp parallel
{
Modified: cfe/trunk/tools/libclang/CIndex.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CIndex.cpp (original)
+++ cfe/trunk/tools/libclang/CIndex.cpp Tue Jun 17 12:20:53 2014
@@ -1851,7 +1851,6 @@ public:
void VisitOMPExecutableDirective(const OMPExecutableDirective *D);
void VisitOMPParallelDirective(const OMPParallelDirective *D);
void VisitOMPSimdDirective(const OMPSimdDirective *D);
- void VisitOMPForDirective(const OMPForDirective *D);
private:
void AddDeclarationNameInfo(const Stmt *S);
@@ -2275,10 +2274,6 @@ void EnqueueVisitor::VisitOMPSimdDirecti
VisitOMPExecutableDirective(D);
}
-void EnqueueVisitor::VisitOMPForDirective(const OMPForDirective *D) {
- VisitOMPExecutableDirective(D);
-}
-
void CursorVisitor::EnqueueWorkList(VisitorWorkList &WL, const Stmt *S) {
EnqueueVisitor(WL, MakeCXCursor(S, StmtParent, TU,RegionOfInterest)).Visit(S);
}
@@ -3955,8 +3950,6 @@ CXString clang_getCursorKindSpelling(enu
return cxstring::createRef("OMPParallelDirective");
case CXCursor_OMPSimdDirective:
return cxstring::createRef("OMPSimdDirective");
- case CXCursor_OMPForDirective:
- return cxstring::createRef("OMPForDirective");
}
llvm_unreachable("Unhandled CXCursorKind");
Modified: cfe/trunk/tools/libclang/CXCursor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CXCursor.cpp?rev=211113&r1=211112&r2=211113&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CXCursor.cpp (original)
+++ cfe/trunk/tools/libclang/CXCursor.cpp Tue Jun 17 12:20:53 2014
@@ -519,9 +519,6 @@ CXCursor cxcursor::MakeCXCursor(const St
case Stmt::OMPSimdDirectiveClass:
K = CXCursor_OMPSimdDirective;
break;
- case Stmt::OMPForDirectiveClass:
- K = CXCursor_OMPForDirective;
- break;
}
CXCursor C = { K, 0, { Parent, S, TU } };
More information about the cfe-commits
mailing list