<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">Hello Samuel,<br>
Thanks for the review. Fixed in revision 213496.<br>
<pre class="moz-signature" cols="72">Best regards,
Alexey Bataev
=============
Software Engineer
Intel Compiler Team</pre>
18.07.2014 22:21, Samuel F Antao пишет:<br>
</div>
<blockquote
cite="mid:OF59DEB559.B3EC82CF-ON85257D19.00645A51-85257D19.0064DA60@us.ibm.com"
type="cite">
<p><font face="sans-serif" size="2">Hi Alexey,</font><br>
<br>
<font face="sans-serif" size="2">I took a close look into this
commit and it looks good for me. </font><br>
<br>
<font face="sans-serif" size="2">I only have a minor suggestion
related to the testcase: it would be good to add a case with
the ordered clause being passed twice in order to test the
diagnostics, given that this check is done in code specific to
that clause. </font><br>
<br>
<font face="sans-serif" size="2">Regards,</font><br>
<font face="sans-serif" size="2">Samuel</font><br>
<br>
<tt><font size="2"><br>
> Date: Fri, 20 Jun 2014 09:44:06 -0000<br>
> From: Alexey Bataev <a class="moz-txt-link-rfc2396E" href="mailto:a.bataev@hotmail.com"><a.bataev@hotmail.com></a><br>
> To: <a class="moz-txt-link-abbreviated" href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
> Subject: r211347 - [OPENMP] Initial support for
'ordered' clause.<br>
> Message-ID:
<a class="moz-txt-link-rfc2396E" href="mailto:20140620094407.347DD2A6C026@llvm.org"><20140620094407.347DD2A6C026@llvm.org></a><br>
> Content-Type: text/plain; charset="utf-8"<br>
> <br>
> Author: abataev<br>
> Date: Fri Jun 20 04:44:06 2014<br>
> New Revision: 211347<br>
> <br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project?rev=211347&view=rev">http://llvm.org/viewvc/llvm-project?rev=211347&view=rev</a><br>
> Log:<br>
> [OPENMP] Initial support for 'ordered' clause.<br>
> <br>
> Modified:<br>
>
cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h<br>
> cfe/trunk/include/clang/AST/OpenMPClause.h<br>
> cfe/trunk/include/clang/AST/RecursiveASTVisitor.h<br>
> cfe/trunk/include/clang/Basic/OpenMPKinds.def<br>
> cfe/trunk/include/clang/Parse/Parser.h<br>
> cfe/trunk/include/clang/Sema/Sema.h<br>
> cfe/trunk/lib/AST/StmtPrinter.cpp<br>
> cfe/trunk/lib/AST/StmtProfile.cpp<br>
> cfe/trunk/lib/Basic/OpenMPKinds.cpp<br>
> cfe/trunk/lib/Parse/ParseOpenMP.cpp<br>
> cfe/trunk/lib/Sema/SemaOpenMP.cpp<br>
> cfe/trunk/lib/Sema/TreeTransform.h<br>
> cfe/trunk/lib/Serialization/ASTReaderStmt.cpp<br>
> cfe/trunk/lib/Serialization/ASTWriterStmt.cpp<br>
> cfe/trunk/test/OpenMP/for_ast_print.cpp<br>
> cfe/trunk/tools/libclang/CIndex.cpp<br>
> <br>
> Modified:
cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/</a><br>
>
AST/DataRecursiveASTVisitor.h?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> ---
cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h
(original)<br>
> +++
cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h Fri
Jun 20<br>
> 04:44:06 2014<br>
> @@ -2351,6 +2351,12 @@
RecursiveASTVisitor<Derived>::VisitOMPSc<br>
> }<br>
> <br>
> template <typename Derived><br>
> +bool<br>
>
+RecursiveASTVisitor<Derived>::VisitOMPOrderedClause(OMPOrderedClause
*) {<br>
> + return true;<br>
> +}<br>
> +<br>
> +template <typename Derived><br>
> template <typename T><br>
> void
RecursiveASTVisitor<Derived>::VisitOMPClauseList(T
*Node) {<br>
> for (auto *I : Node->varlists())<br>
> <br>
> Modified: cfe/trunk/include/clang/AST/OpenMPClause.h<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/</a><br>
>
AST/OpenMPClause.h?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/include/clang/AST/OpenMPClause.h
(original)<br>
> +++ cfe/trunk/include/clang/AST/OpenMPClause.h Fri Jun
20 04:44:06 2014<br>
> @@ -600,6 +600,35 @@ public:<br>
> StmtRange children() { return
StmtRange(&ChunkSize, &ChunkSize + 1); }<br>
> };<br>
> <br>
> +/// \brief This represents 'ordered' clause in the
'#pragma omp <br>
> ...' directive.<br>
> +///<br>
> +/// \code<br>
> +/// #pragma omp for ordered<br>
> +/// \endcode<br>
> +/// In this example directive '#pragma omp for' has
'ordered' clause.<br>
> +///<br>
> +class OMPOrderedClause : public OMPClause {<br>
> +public:<br>
> + /// \brief Build 'ordered' clause.<br>
> + ///<br>
> + /// \param StartLoc Starting location of the clause.<br>
> + /// \param EndLoc Ending location of the clause.<br>
> + ///<br>
> + OMPOrderedClause(SourceLocation StartLoc,
SourceLocation EndLoc)<br>
> + : OMPClause(OMPC_ordered, StartLoc, EndLoc) {}<br>
> +<br>
> + /// \brief Build an empty clause.<br>
> + ///<br>
> + OMPOrderedClause()<br>
> + : OMPClause(OMPC_ordered, SourceLocation(),
SourceLocation()) {}<br>
> +<br>
> + static bool classof(const OMPClause *T) {<br>
> + return T->getClauseKind() == OMPC_ordered;<br>
> + }<br>
> +<br>
> + StmtRange children() { return StmtRange(); }<br>
> +};<br>
> +<br>
> /// \brief This represents clause 'private' in the
'#pragma omp <br>
> ...' directives.<br>
> ///<br>
> /// \code<br>
> <br>
> Modified:
cfe/trunk/include/clang/AST/RecursiveASTVisitor.h<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/</a><br>
>
AST/RecursiveASTVisitor.h?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/include/clang/AST/RecursiveASTVisitor.h
(original)<br>
> +++ cfe/trunk/include/clang/AST/RecursiveASTVisitor.h
Fri Jun 20 04:44:06 2014<br>
> @@ -2372,6 +2372,12 @@
RecursiveASTVisitor<Derived>::VisitOMPSc<br>
> }<br>
> <br>
> template <typename Derived><br>
> +bool<br>
>
+RecursiveASTVisitor<Derived>::VisitOMPOrderedClause(OMPOrderedClause
*) {<br>
> + return true;<br>
> +}<br>
> +<br>
> +template <typename Derived><br>
> template <typename T><br>
> void
RecursiveASTVisitor<Derived>::VisitOMPClauseList(T
*Node) {<br>
> for (auto *I : Node->varlists())<br>
> <br>
> Modified: cfe/trunk/include/clang/Basic/OpenMPKinds.def<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/</a><br>
>
Basic/OpenMPKinds.def?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/include/clang/Basic/OpenMPKinds.def
(original)<br>
> +++ cfe/trunk/include/clang/Basic/OpenMPKinds.def Fri
Jun 20 04:44:06 2014<br>
> @@ -60,6 +60,7 @@ OPENMP_CLAUSE(aligned,
OMPAlignedClause)<br>
> OPENMP_CLAUSE(copyin, OMPCopyinClause)<br>
> OPENMP_CLAUSE(proc_bind, OMPProcBindClause)<br>
> OPENMP_CLAUSE(schedule, OMPScheduleClause)<br>
> +OPENMP_CLAUSE(ordered, OMPOrderedClause)<br>
> <br>
> // Clauses allowed for OpenMP directive 'parallel'.<br>
> OPENMP_PARALLEL_CLAUSE(if)<br>
> @@ -87,6 +88,7 @@ OPENMP_FOR_CLAUSE(firstprivate)<br>
> OPENMP_FOR_CLAUSE(reduction)<br>
> OPENMP_FOR_CLAUSE(collapse)<br>
> OPENMP_FOR_CLAUSE(schedule)<br>
> +OPENMP_FOR_CLAUSE(ordered)<br>
> <br>
> // Static attributes for 'default' clause.<br>
> OPENMP_DEFAULT_KIND(none)<br>
> <br>
> Modified: cfe/trunk/include/clang/Parse/Parser.h<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/</a><br>
>
Parse/Parser.h?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/include/clang/Parse/Parser.h (original)<br>
> +++ cfe/trunk/include/clang/Parse/Parser.h Fri Jun 20
04:44:06 2014<br>
> @@ -2351,6 +2351,11 @@ private:<br>
> /// \param Kind Kind of current clause.<br>
> ///<br>
> OMPClause
*ParseOpenMPSingleExprWithArgClause(OpenMPClauseKind Kind);<br>
> + /// \brief Parses clause without any additional
arguments.<br>
> + ///<br>
> + /// \param Kind Kind of current clause.<br>
> + ///<br>
> + OMPClause *ParseOpenMPClause(OpenMPClauseKind Kind);<br>
> /// \brief Parses clause with the list of variables
of a kind \a Kind.<br>
> ///<br>
> /// \param Kind Kind of current clause.<br>
> <br>
> Modified: cfe/trunk/include/clang/Sema/Sema.h<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/</a><br>
>
Sema/Sema.h?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/include/clang/Sema/Sema.h (original)<br>
> +++ cfe/trunk/include/clang/Sema/Sema.h Fri Jun 20
04:44:06 2014<br>
> @@ -7381,6 +7381,12 @@ public:<br>
> SourceLocation
CommaLoc,<br>
> SourceLocation
EndLoc);<br>
> <br>
> + OMPClause *ActOnOpenMPClause(OpenMPClauseKind Kind,
<br>
> SourceLocation StartLoc,<br>
> + SourceLocation EndLoc);<br>
> + /// \brief Called on well-formed 'ordered' clause.<br>
> + OMPClause *ActOnOpenMPOrderedClause(SourceLocation
StartLoc,<br>
> + SourceLocation
EndLoc);<br>
> +<br>
> OMPClause *<br>
> ActOnOpenMPVarListClause(OpenMPClauseKind Kind,
ArrayRef<Expr *> Vars,<br>
> Expr *TailExpr,
SourceLocation StartLoc,<br>
> <br>
> Modified: cfe/trunk/lib/AST/StmtPrinter.cpp<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/</a><br>
>
StmtPrinter.cpp?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/lib/AST/StmtPrinter.cpp (original)<br>
> +++ cfe/trunk/lib/AST/StmtPrinter.cpp Fri Jun 20
04:44:06 2014<br>
> @@ -638,6 +638,10 @@ void
OMPClausePrinter::VisitOMPScheduleC<br>
> OS << ")";<br>
> }<br>
> <br>
> +void
OMPClausePrinter::VisitOMPOrderedClause(OMPOrderedClause *)
{<br>
> + OS << "ordered";<br>
> +}<br>
> +<br>
> template<typename T><br>
> void OMPClausePrinter::VisitOMPClauseList(T *Node,
char StartSym) {<br>
> for (typename T::varlist_iterator I =
Node->varlist_begin(),<br>
> <br>
> Modified: cfe/trunk/lib/AST/StmtProfile.cpp<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/</a><br>
>
StmtProfile.cpp?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/lib/AST/StmtProfile.cpp (original)<br>
> +++ cfe/trunk/lib/AST/StmtProfile.cpp Fri Jun 20
04:44:06 2014<br>
> @@ -293,6 +293,8 @@ void
OMPClauseProfiler::VisitOMPSchedule<br>
> Profiler->VisitStmt(C->getChunkSize());<br>
> }<br>
> <br>
> +void OMPClauseProfiler::VisitOMPOrderedClause(const
OMPOrderedClause *) {}<br>
> +<br>
> template<typename T><br>
> void OMPClauseProfiler::VisitOMPClauseList(T *Node) {<br>
> for (auto *I : Node->varlists())<br>
> <br>
> Modified: cfe/trunk/lib/Basic/OpenMPKinds.cpp<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/</a><br>
>
OpenMPKinds.cpp?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/lib/Basic/OpenMPKinds.cpp (original)<br>
> +++ cfe/trunk/lib/Basic/OpenMPKinds.cpp Fri Jun 20
04:44:06 2014<br>
> @@ -95,6 +95,7 @@ unsigned
clang::getOpenMPSimpleClauseTyp<br>
> case OMPC_linear:<br>
> case OMPC_aligned:<br>
> case OMPC_copyin:<br>
> + case OMPC_ordered:<br>
> break;<br>
> }<br>
> llvm_unreachable("Invalid OpenMP simple clause
kind");<br>
> @@ -147,6 +148,7 @@ const char
*clang::getOpenMPSimpleClause<br>
> case OMPC_linear:<br>
> case OMPC_aligned:<br>
> case OMPC_copyin:<br>
> + case OMPC_ordered:<br>
> break;<br>
> }<br>
> llvm_unreachable("Invalid OpenMP simple clause
kind");<br>
> <br>
> Modified: cfe/trunk/lib/Parse/ParseOpenMP.cpp<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/</a><br>
>
ParseOpenMP.cpp?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/lib/Parse/ParseOpenMP.cpp (original)<br>
> +++ cfe/trunk/lib/Parse/ParseOpenMP.cpp Fri Jun 20
04:44:06 2014<br>
> @@ -317,6 +317,16 @@ OMPClause
*Parser::ParseOpenMPClause(Ope<br>
> <br>
> Clause =
ParseOpenMPSingleExprWithArgClause(CKind);<br>
> break;<br>
> + case OMPC_ordered:<br>
> + // OpenMP [2.7.1, Restrictions, p. 9]<br>
> + // Only one ordered clause can appear on a loop
directive.<br>
> + if (!FirstClause) {<br>
> + Diag(Tok, diag::err_omp_more_one_clause)
<< <br>
> getOpenMPDirectiveName(DKind)<br>
> +
<< getOpenMPClauseName(CKind);<br>
> + }<br>
> +<br>
> + Clause = ParseOpenMPClause(CKind);<br>
> + break;<br>
> case OMPC_private:<br>
> case OMPC_firstprivate:<br>
> case OMPC_lastprivate:<br>
> @@ -409,6 +419,19 @@ OMPClause
*Parser::ParseOpenMPSimpleClau<br>
>
Tok.getLocation());<br>
> }<br>
> <br>
> +/// \brief Parsing of OpenMP clauses like 'ordered'.<br>
> +///<br>
> +/// ordered-clause:<br>
> +/// 'ordered'<br>
> +///<br>
> +OMPClause *Parser::ParseOpenMPClause(OpenMPClauseKind
Kind) {<br>
> + SourceLocation Loc = Tok.getLocation();<br>
> + ConsumeAnyToken();<br>
> +<br>
> + return Actions.ActOnOpenMPClause(Kind, Loc,
Tok.getLocation());<br>
> +}<br>
> +<br>
> +<br>
> /// \brief Parsing of OpenMP clauses with single
expressions and <br>
> some additional<br>
> /// argument like 'schedule' or 'dist_schedule'.<br>
> ///<br>
> <br>
> Modified: cfe/trunk/lib/Sema/SemaOpenMP.cpp<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/</a><br>
>
SemaOpenMP.cpp?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original)<br>
> +++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Fri Jun 20
04:44:06 2014<br>
> @@ -1522,6 +1522,7 @@ OMPClause
*Sema::ActOnOpenMPSingleExprCl<br>
> case OMPC_linear:<br>
> case OMPC_aligned:<br>
> case OMPC_copyin:<br>
> + case OMPC_ordered:<br>
> case OMPC_threadprivate:<br>
> case OMPC_unknown:<br>
> llvm_unreachable("Clause is not allowed.");<br>
> @@ -1699,6 +1700,7 @@ OMPClause
*Sema::ActOnOpenMPSimpleClause<br>
> case OMPC_linear:<br>
> case OMPC_aligned:<br>
> case OMPC_copyin:<br>
> + case OMPC_ordered:<br>
> case OMPC_threadprivate:<br>
> case OMPC_unknown:<br>
> llvm_unreachable("Clause is not allowed.");<br>
> @@ -1807,6 +1809,7 @@ OMPClause
*Sema::ActOnOpenMPSingleExprWi<br>
> case OMPC_linear:<br>
> case OMPC_aligned:<br>
> case OMPC_copyin:<br>
> + case OMPC_ordered:<br>
> case OMPC_threadprivate:<br>
> case OMPC_unknown:<br>
> llvm_unreachable("Clause is not allowed.");<br>
> @@ -1870,6 +1873,41 @@ OMPClause
*Sema::ActOnOpenMPScheduleClau<br>
> EndLoc, Kind,
ValExpr);<br>
> }<br>
> <br>
> +OMPClause *Sema::ActOnOpenMPClause(OpenMPClauseKind
Kind,<br>
> + SourceLocation
StartLoc,<br>
> + SourceLocation
EndLoc) {<br>
> + OMPClause *Res = nullptr;<br>
> + switch (Kind) {<br>
> + case OMPC_ordered:<br>
> + Res = ActOnOpenMPOrderedClause(StartLoc, EndLoc);<br>
> + break;<br>
> + case OMPC_if:<br>
> + case OMPC_num_threads:</font></tt><br>
<tt><font size="2">> + case OMPC_safelen:<br>
> + case OMPC_collapse:<br>
> + case OMPC_schedule:<br>
> + case OMPC_private:<br>
> + case OMPC_firstprivate:<br>
> + case OMPC_lastprivate:<br>
> + case OMPC_shared:<br>
> + case OMPC_reduction:<br>
> + case OMPC_linear:<br>
> + case OMPC_aligned:<br>
> + case OMPC_copyin:<br>
> + case OMPC_default:<br>
> + case OMPC_proc_bind:<br>
> + case OMPC_threadprivate:<br>
> + case OMPC_unknown:<br>
> + llvm_unreachable("Clause is not allowed.");<br>
> + }<br>
> + return Res;<br>
> +}<br>
> +<br>
> +OMPClause
*Sema::ActOnOpenMPOrderedClause(SourceLocation StartLoc,<br>
> +
SourceLocation EndLoc) {<br>
> + return new (Context) OMPOrderedClause(StartLoc,
EndLoc);<br>
> +}<br>
> +<br>
> OMPClause *Sema::ActOnOpenMPVarListClause(<br>
> OpenMPClauseKind Kind, ArrayRef<Expr *>
VarList, Expr *TailExpr,<br>
> SourceLocation StartLoc, SourceLocation LParenLoc,
<br>
> SourceLocation ColonLoc,<br>
> @@ -1911,6 +1949,7 @@ OMPClause
*Sema::ActOnOpenMPVarListClaus<br>
> case OMPC_default:<br>
> case OMPC_proc_bind:<br>
> case OMPC_schedule:<br>
> + case OMPC_ordered:<br>
> case OMPC_threadprivate:<br>
> case OMPC_unknown:<br>
> llvm_unreachable("Clause is not allowed.");<br>
> <br>
> Modified: cfe/trunk/lib/Sema/TreeTransform.h<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/</a><br>
>
TreeTransform.h?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/lib/Sema/TreeTransform.h (original)<br>
> +++ cfe/trunk/lib/Sema/TreeTransform.h Fri Jun 20
04:44:06 2014<br>
> @@ -6500,6 +6500,13 @@
TreeTransform<Derived>::TransformOMPSche<br>
> <br>
> template <typename Derived><br>
> OMPClause *<br>
>
+TreeTransform<Derived>::TransformOMPOrderedClause(OMPOrderedClause
*C) {<br>
> + // No need to rebuild this clause, no
template-dependent parameters.<br>
> + return C;<br>
> +}<br>
> +<br>
> +template <typename Derived><br>
> +OMPClause *<br>
>
TreeTransform<Derived>::TransformOMPPrivateClause(OMPPrivateClause
*C) {<br>
> llvm::SmallVector<Expr *, 16> Vars;<br>
> Vars.reserve(C->varlist_size());<br>
> <br>
> Modified: cfe/trunk/lib/Serialization/ASTReaderStmt.cpp<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/</a><br>
>
Serialization/ASTReaderStmt.cpp?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/lib/Serialization/ASTReaderStmt.cpp
(original)<br>
> +++ cfe/trunk/lib/Serialization/ASTReaderStmt.cpp Fri
Jun 20 04:44:06 2014<br>
> @@ -1694,6 +1694,9 @@ OMPClause
*OMPClauseReader::readClause()<br>
> case OMPC_schedule:<br>
> C = new (Context) OMPScheduleClause();<br>
> break;<br>
> + case OMPC_ordered:<br>
> + C = new (Context) OMPOrderedClause();<br>
> + break;<br>
> case OMPC_private:<br>
> C = OMPPrivateClause::CreateEmpty(Context,
Record[Idx++]);<br>
> break;<br>
> @@ -1769,6 +1772,8 @@ void
OMPClauseReader::VisitOMPScheduleCl<br>
>
C->setCommaLoc(Reader->ReadSourceLocation(Record,
Idx));<br>
> }<br>
> <br>
> +void
OMPClauseReader::VisitOMPOrderedClause(OMPOrderedClause *)
{}<br>
> +<br>
> void
OMPClauseReader::VisitOMPPrivateClause(OMPPrivateClause *C)
{<br>
>
C->setLParenLoc(Reader->ReadSourceLocation(Record,
Idx));<br>
> unsigned NumVars = C->varlist_size();<br>
> <br>
> Modified: cfe/trunk/lib/Serialization/ASTWriterStmt.cpp<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/</a><br>
>
Serialization/ASTWriterStmt.cpp?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/lib/Serialization/ASTWriterStmt.cpp
(original)<br>
> +++ cfe/trunk/lib/Serialization/ASTWriterStmt.cpp Fri
Jun 20 04:44:06 2014<br>
> @@ -1715,6 +1715,8 @@ void
OMPClauseWriter::VisitOMPScheduleCl<br>
>
Writer->Writer.AddSourceLocation(C->getCommaLoc(),
Record);<br>
> }<br>
> <br>
> +void
OMPClauseWriter::VisitOMPOrderedClause(OMPOrderedClause *)
{}<br>
> +<br>
> void
OMPClauseWriter::VisitOMPPrivateClause(OMPPrivateClause *C)
{<br>
> Record.push_back(C->varlist_size());<br>
>
Writer->Writer.AddSourceLocation(C->getLParenLoc(),
Record);<br>
> <br>
> Modified: cfe/trunk/test/OpenMP/for_ast_print.cpp<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/</a><br>
>
for_ast_print.cpp?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/test/OpenMP/for_ast_print.cpp (original)<br>
> +++ cfe/trunk/test/OpenMP/for_ast_print.cpp Fri Jun 20
04:44:06 2014<br>
> @@ -20,12 +20,12 @@ T tmain(T argc) {<br>
> // CHECK-NEXT: for (int i = 0; i < 2; ++i)<br>
> // CHECK-NEXT: a = 2;<br>
> #pragma omp parallel<br>
> -#pragma omp for private(argc, b), firstprivate(c, d),
lastprivate<br>
> (d, f) collapse(N) schedule(static, N)<br>
> +#pragma omp for private(argc, b), firstprivate(c, d),
lastprivate<br>
> (d, f) collapse(N) schedule(static, N) ordered<br>
> for (int i = 0; i < 10; ++i)<br>
> for (int j = 0; j < 10; ++j)<br>
> foo();<br>
> // CHECK-NEXT: #pragma omp parallel<br>
> - // CHECK-NEXT: #pragma omp for private(argc,b)
firstprivate(c,d) <br>
> lastprivate(d,f) collapse(N) schedule(static, N)<br>
> + // CHECK-NEXT: #pragma omp for private(argc,b)
firstprivate(c,d) <br>
> lastprivate(d,f) collapse(N) schedule(static, N)
ordered<br>
> // CHECK-NEXT: for (int i = 0; i < 10; ++i)<br>
> // CHECK-NEXT: for (int j = 0; j < 10; ++j)<br>
> // CHECK-NEXT: foo();<br>
> @@ -43,12 +43,12 @@ int main(int argc, char **argv) {<br>
> // CHECK-NEXT: for (int i = 0; i < 2; ++i)<br>
> // CHECK-NEXT: a = 2;<br>
> #pragma omp parallel<br>
> -#pragma omp for private(argc, b), firstprivate(argv,
c), <br>
> lastprivate(d, f) collapse(2) schedule(auto)<br>
> +#pragma omp for private(argc, b), firstprivate(argv,
c), <br>
> lastprivate(d, f) collapse(2) schedule(auto) ordered<br>
> for (int i = 0; i < 10; ++i)<br>
> for (int j = 0; j < 10; ++j)<br>
> foo();<br>
> // CHECK-NEXT: #pragma omp parallel<br>
> - // CHECK-NEXT: #pragma omp for private(argc,b)
firstprivate<br>
> (argv,c) lastprivate(d,f) collapse(2) schedule(auto)<br>
> + // CHECK-NEXT: #pragma omp for private(argc,b)
firstprivate<br>
> (argv,c) lastprivate(d,f) collapse(2) schedule(auto)
ordered<br>
> // CHECK-NEXT: for (int i = 0; i < 10; ++i)<br>
> // CHECK-NEXT: for (int j = 0; j < 10; ++j)<br>
> // CHECK-NEXT: foo();<br>
> <br>
> Modified: cfe/trunk/tools/libclang/CIndex.cpp<br>
> URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/</a><br>
>
CIndex.cpp?rev=211347&r1=211346&r2=211347&view=diff<br>
>
==============================================================================<br>
> --- cfe/trunk/tools/libclang/CIndex.cpp (original)<br>
> +++ cfe/trunk/tools/libclang/CIndex.cpp Fri Jun 20
04:44:06 2014<br>
> @@ -1949,6 +1949,8 @@ void
OMPClauseEnqueue::VisitOMPScheduleC<br>
> Visitor->AddStmt(C->getChunkSize());<br>
> }<br>
> <br>
> +void OMPClauseEnqueue::VisitOMPOrderedClause(const
OMPOrderedClause *) {}<br>
> +<br>
> template<typename T><br>
> void OMPClauseEnqueue::VisitOMPClauseList(T *Node) {<br>
> for (const auto *I : Node->varlists())<br>
> <br>
> <br>
> <br>
> </font></tt>
</p>
</blockquote>
<br>
</body>
</html>