<div dir="ltr"><div>Looks good to me. The changes for 'mergeable' mirror code for 'untied' which is similar from a parsing/sema perspective.<br><br></div>Ajay<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">
On Thu, Jul 17, 2014 at 6:17 PM, Alexey Bataev <span dir="ltr"><<a href="mailto:a.bataev@hotmail.com" target="_blank">a.bataev@hotmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: abataev<br>
Date: Thu Jul 17 07:47:03 2014<br>
New Revision: 213262<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=213262&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=213262&view=rev</a><br>
Log:<br>
[OPENMP] Initial parsing and sema analysis of 'mergeable' 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/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/task_ast_print.cpp<br>
cfe/trunk/test/OpenMP/task_messages.cpp<br>
cfe/trunk/tools/libclang/CIndex.cpp<br>
<br>
Modified: cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h (original)<br>
+++ cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h Thu Jul 17 07:47:03 2014<br>
@@ -2392,6 +2392,12 @@ bool RecursiveASTVisitor<Derived>::Visit<br>
}<br>
<br>
template <typename Derived><br>
+bool<br>
+RecursiveASTVisitor<Derived>::VisitOMPMergeableClause(OMPMergeableClause *) {<br>
+ return true;<br>
+}<br>
+<br>
+template <typename Derived><br>
template <typename T><br>
bool RecursiveASTVisitor<Derived>::VisitOMPClauseList(T *Node) {<br>
for (auto *E : Node->varlists()) {<br>
<br>
Modified: cfe/trunk/include/clang/AST/OpenMPClause.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/OpenMPClause.h?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/OpenMPClause.h?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/OpenMPClause.h (original)<br>
+++ cfe/trunk/include/clang/AST/OpenMPClause.h Thu Jul 17 07:47:03 2014<br>
@@ -740,6 +740,36 @@ public:<br>
StmtRange children() { return StmtRange(); }<br>
};<br>
<br>
+/// \brief This represents 'mergeable' clause in the '#pragma omp ...'<br>
+/// directive.<br>
+///<br>
+/// \code<br>
+/// #pragma omp task mergeable<br>
+/// \endcode<br>
+/// In this example directive '#pragma omp task' has 'mergeable' clause.<br>
+///<br>
+class OMPMergeableClause : public OMPClause {<br>
+public:<br>
+ /// \brief Build 'mergeable' clause.<br>
+ ///<br>
+ /// \param StartLoc Starting location of the clause.<br>
+ /// \param EndLoc Ending location of the clause.<br>
+ ///<br>
+ OMPMergeableClause(SourceLocation StartLoc, SourceLocation EndLoc)<br>
+ : OMPClause(OMPC_mergeable, StartLoc, EndLoc) {}<br>
+<br>
+ /// \brief Build an empty clause.<br>
+ ///<br>
+ OMPMergeableClause()<br>
+ : OMPClause(OMPC_mergeable, SourceLocation(), SourceLocation()) {}<br>
+<br>
+ static bool classof(const OMPClause *T) {<br>
+ return T->getClauseKind() == OMPC_mergeable;<br>
+ }<br>
+<br>
+ StmtRange children() { return StmtRange(); }<br>
+};<br>
+<br>
/// \brief This represents clause 'private' in the '#pragma omp ...' directives.<br>
///<br>
/// \code<br>
<br>
Modified: cfe/trunk/include/clang/AST/RecursiveASTVisitor.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/RecursiveASTVisitor.h?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/RecursiveASTVisitor.h?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/RecursiveASTVisitor.h (original)<br>
+++ cfe/trunk/include/clang/AST/RecursiveASTVisitor.h Thu Jul 17 07:47:03 2014<br>
@@ -2414,6 +2414,12 @@ bool RecursiveASTVisitor<Derived>::Visit<br>
}<br>
<br>
template <typename Derived><br>
+bool<br>
+RecursiveASTVisitor<Derived>::VisitOMPMergeableClause(OMPMergeableClause *) {<br>
+ return true;<br>
+}<br>
+<br>
+template <typename Derived><br>
template <typename T><br>
bool RecursiveASTVisitor<Derived>::VisitOMPClauseList(T *Node) {<br>
for (auto *E : Node->varlists()) {<br>
<br>
Modified: cfe/trunk/include/clang/Basic/OpenMPKinds.def<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.def?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.def?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/OpenMPKinds.def (original)<br>
+++ cfe/trunk/include/clang/Basic/OpenMPKinds.def Thu Jul 17 07:47:03 2014<br>
@@ -89,6 +89,7 @@ OPENMP_CLAUSE(schedule, OMPScheduleClaus<br>
OPENMP_CLAUSE(ordered, OMPOrderedClause)<br>
OPENMP_CLAUSE(nowait, OMPNowaitClause)<br>
OPENMP_CLAUSE(untied, OMPUntiedClause)<br>
+OPENMP_CLAUSE(mergeable, OMPMergeableClause)<br>
<br>
// Clauses allowed for OpenMP directive 'parallel'.<br>
OPENMP_PARALLEL_CLAUSE(if)<br>
@@ -176,7 +177,7 @@ OPENMP_PARALLEL_SECTIONS_CLAUSE(reductio<br>
OPENMP_PARALLEL_SECTIONS_CLAUSE(copyin)<br>
OPENMP_PARALLEL_SECTIONS_CLAUSE(lastprivate)<br>
<br>
-// TODO more clauses allowed for OpenMP directive 'task'.<br>
+// Clauses allowed for OpenMP directive 'task'.<br>
OPENMP_TASK_CLAUSE(if)<br>
OPENMP_TASK_CLAUSE(final)<br>
OPENMP_TASK_CLAUSE(default)<br>
@@ -184,6 +185,7 @@ OPENMP_TASK_CLAUSE(private)<br>
OPENMP_TASK_CLAUSE(firstprivate)<br>
OPENMP_TASK_CLAUSE(shared)<br>
OPENMP_TASK_CLAUSE(untied)<br>
+OPENMP_TASK_CLAUSE(mergeable)<br>
<br>
#undef OPENMP_SCHEDULE_KIND<br>
#undef OPENMP_PROC_BIND_KIND<br>
<br>
Modified: cfe/trunk/include/clang/Sema/Sema.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Sema/Sema.h (original)<br>
+++ cfe/trunk/include/clang/Sema/Sema.h Thu Jul 17 07:47:03 2014<br>
@@ -7443,6 +7443,9 @@ public:<br>
/// \brief Called on well-formed 'untied' clause.<br>
OMPClause *ActOnOpenMPUntiedClause(SourceLocation StartLoc,<br>
SourceLocation EndLoc);<br>
+ /// \brief Called on well-formed 'mergeable' clause.<br>
+ OMPClause *ActOnOpenMPMergeableClause(SourceLocation StartLoc,<br>
+ SourceLocation EndLoc);<br>
<br>
OMPClause *<br>
ActOnOpenMPVarListClause(OpenMPClauseKind Kind, ArrayRef<Expr *> Vars,<br>
<br>
Modified: cfe/trunk/lib/AST/StmtPrinter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtPrinter.cpp?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtPrinter.cpp?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/StmtPrinter.cpp (original)<br>
+++ cfe/trunk/lib/AST/StmtPrinter.cpp Thu Jul 17 07:47:03 2014<br>
@@ -661,6 +661,10 @@ void OMPClausePrinter::VisitOMPUntiedCla<br>
OS << "untied";<br>
}<br>
<br>
+void OMPClausePrinter::VisitOMPMergeableClause(OMPMergeableClause *) {<br>
+ OS << "mergeable";<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 href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtProfile.cpp?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtProfile.cpp?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/StmtProfile.cpp (original)<br>
+++ cfe/trunk/lib/AST/StmtProfile.cpp Thu Jul 17 07:47:03 2014<br>
@@ -308,6 +308,8 @@ void OMPClauseProfiler::VisitOMPNowaitCl<br>
<br>
void OMPClauseProfiler::VisitOMPUntiedClause(const OMPUntiedClause *) {}<br>
<br>
+void OMPClauseProfiler::VisitOMPMergeableClause(const OMPMergeableClause *) {}<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 href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/OpenMPKinds.cpp?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/OpenMPKinds.cpp?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Basic/OpenMPKinds.cpp (original)<br>
+++ cfe/trunk/lib/Basic/OpenMPKinds.cpp Thu Jul 17 07:47:03 2014<br>
@@ -104,6 +104,7 @@ unsigned clang::getOpenMPSimpleClauseTyp<br>
case OMPC_ordered:<br>
case OMPC_nowait:<br>
case OMPC_untied:<br>
+ case OMPC_mergeable:<br>
break;<br>
}<br>
llvm_unreachable("Invalid OpenMP simple clause kind");<br>
@@ -161,6 +162,7 @@ const char *clang::getOpenMPSimpleClause<br>
case OMPC_ordered:<br>
case OMPC_nowait:<br>
case OMPC_untied:<br>
+ case OMPC_mergeable:<br>
break;<br>
}<br>
llvm_unreachable("Invalid OpenMP simple clause kind");<br>
<br>
Modified: cfe/trunk/lib/Parse/ParseOpenMP.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseOpenMP.cpp?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseOpenMP.cpp?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Parse/ParseOpenMP.cpp (original)<br>
+++ cfe/trunk/lib/Parse/ParseOpenMP.cpp Thu Jul 17 07:47:03 2014<br>
@@ -292,7 +292,8 @@ bool Parser::ParseOpenMPSimpleVarList(Op<br>
/// default-clause | private-clause | firstprivate-clause | shared-clause<br>
/// | linear-clause | aligned-clause | collapse-clause |<br>
/// lastprivate-clause | reduction-clause | proc_bind-clause |<br>
-/// schedule-clause | copyin-clause | copyprivate-clause | untied-clause<br>
+/// schedule-clause | copyin-clause | copyprivate-clause | untied-clause |<br>
+/// mergeable-clause<br>
///<br>
OMPClause *Parser::ParseOpenMPClause(OpenMPDirectiveKind DKind,<br>
OpenMPClauseKind CKind, bool FirstClause) {<br>
@@ -354,6 +355,7 @@ OMPClause *Parser::ParseOpenMPClause(Ope<br>
case OMPC_ordered:<br>
case OMPC_nowait:<br>
case OMPC_untied:<br>
+ case OMPC_mergeable:<br>
// OpenMP [2.7.1, Restrictions, p. 9]<br>
// Only one ordered clause can appear on a loop directive.<br>
// OpenMP [2.7.1, Restrictions, C/C++, p. 4]<br>
@@ -472,6 +474,9 @@ OMPClause *Parser::ParseOpenMPSimpleClau<br>
/// untied-clause:<br>
/// 'untied'<br>
///<br>
+/// mergeable-clause:<br>
+/// 'mergeable'<br>
+///<br>
OMPClause *Parser::ParseOpenMPClause(OpenMPClauseKind Kind) {<br>
SourceLocation Loc = Tok.getLocation();<br>
ConsumeAnyToken();<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaOpenMP.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Thu Jul 17 07:47:03 2014<br>
@@ -2069,6 +2069,7 @@ OMPClause *Sema::ActOnOpenMPSingleExprCl<br>
case OMPC_ordered:<br>
case OMPC_nowait:<br>
case OMPC_untied:<br>
+ case OMPC_mergeable:<br>
case OMPC_threadprivate:<br>
case OMPC_unknown:<br>
llvm_unreachable("Clause is not allowed.");<br>
@@ -2270,6 +2271,7 @@ OMPClause *Sema::ActOnOpenMPSimpleClause<br>
case OMPC_ordered:<br>
case OMPC_nowait:<br>
case OMPC_untied:<br>
+ case OMPC_mergeable:<br>
case OMPC_threadprivate:<br>
case OMPC_unknown:<br>
llvm_unreachable("Clause is not allowed.");<br>
@@ -2383,6 +2385,7 @@ OMPClause *Sema::ActOnOpenMPSingleExprWi<br>
case OMPC_ordered:<br>
case OMPC_nowait:<br>
case OMPC_untied:<br>
+ case OMPC_mergeable:<br>
case OMPC_threadprivate:<br>
case OMPC_unknown:<br>
llvm_unreachable("Clause is not allowed.");<br>
@@ -2460,6 +2463,9 @@ OMPClause *Sema::ActOnOpenMPClause(OpenM<br>
case OMPC_untied:<br>
Res = ActOnOpenMPUntiedClause(StartLoc, EndLoc);<br>
break;<br>
+ case OMPC_mergeable:<br>
+ Res = ActOnOpenMPMergeableClause(StartLoc, EndLoc);<br>
+ break;<br>
case OMPC_if:<br>
case OMPC_final:<br>
case OMPC_num_threads:<br>
@@ -2499,6 +2505,11 @@ OMPClause *Sema::ActOnOpenMPUntiedClause<br>
return new (Context) OMPUntiedClause(StartLoc, EndLoc);<br>
}<br>
<br>
+OMPClause *Sema::ActOnOpenMPMergeableClause(SourceLocation StartLoc,<br>
+ SourceLocation EndLoc) {<br>
+ return new (Context) OMPMergeableClause(StartLoc, EndLoc);<br>
+}<br>
+<br>
OMPClause *Sema::ActOnOpenMPVarListClause(<br>
OpenMPClauseKind Kind, ArrayRef<Expr *> VarList, Expr *TailExpr,<br>
SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation ColonLoc,<br>
@@ -2547,6 +2558,7 @@ OMPClause *Sema::ActOnOpenMPVarListClaus<br>
case OMPC_ordered:<br>
case OMPC_nowait:<br>
case OMPC_untied:<br>
+ case OMPC_mergeable:<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 href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/TreeTransform.h?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/TreeTransform.h?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/TreeTransform.h (original)<br>
+++ cfe/trunk/lib/Sema/TreeTransform.h Thu Jul 17 07:47:03 2014<br>
@@ -6653,6 +6653,13 @@ TreeTransform<Derived>::TransformOMPUnti<br>
<br>
template <typename Derived><br>
OMPClause *<br>
+TreeTransform<Derived>::TransformOMPMergeableClause(OMPMergeableClause *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 href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderStmt.cpp?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderStmt.cpp?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Serialization/ASTReaderStmt.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/ASTReaderStmt.cpp Thu Jul 17 07:47:03 2014<br>
@@ -1712,6 +1712,9 @@ OMPClause *OMPClauseReader::readClause()<br>
case OMPC_untied:<br>
C = new (Context) OMPUntiedClause();<br>
break;<br>
+ case OMPC_mergeable:<br>
+ C = new (Context) OMPMergeableClause();<br>
+ break;<br>
case OMPC_private:<br>
C = OMPPrivateClause::CreateEmpty(Context, Record[Idx++]);<br>
break;<br>
@@ -1801,6 +1804,8 @@ void OMPClauseReader::VisitOMPNowaitClau<br>
<br>
void OMPClauseReader::VisitOMPUntiedClause(OMPUntiedClause *) {}<br>
<br>
+void OMPClauseReader::VisitOMPMergeableClause(OMPMergeableClause *) {}<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 href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterStmt.cpp?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterStmt.cpp?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Serialization/ASTWriterStmt.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/ASTWriterStmt.cpp Thu Jul 17 07:47:03 2014<br>
@@ -1733,6 +1733,8 @@ void OMPClauseWriter::VisitOMPNowaitClau<br>
<br>
void OMPClauseWriter::VisitOMPUntiedClause(OMPUntiedClause *) {}<br>
<br>
+void OMPClauseWriter::VisitOMPMergeableClause(OMPMergeableClause *) {}<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/task_ast_print.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/task_ast_print.cpp?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/task_ast_print.cpp?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/task_ast_print.cpp (original)<br>
+++ cfe/trunk/test/OpenMP/task_ast_print.cpp Thu Jul 17 07:47:03 2014<br>
@@ -37,7 +37,7 @@ T tmain(T argc, T *argv) {<br>
a = 2;<br>
#pragma omp task default(none), private(argc, b) firstprivate(argv) shared(d) if (argc > 0) final(S<T>::TS > 0)<br>
foo();<br>
-#pragma omp task if (C)<br>
+#pragma omp task if (C) mergeable<br>
foo();<br>
return 0;<br>
}<br>
@@ -50,7 +50,7 @@ T tmain(T argc, T *argv) {<br>
// CHECK-NEXT: a = 2;<br>
// CHECK-NEXT: #pragma omp task default(none) private(argc,b) firstprivate(argv) shared(d) if(argc > 0) final(S<int>::TS > 0)<br>
// CHECK-NEXT: foo()<br>
-// CHECK-NEXT: #pragma omp task if(5)<br>
+// CHECK-NEXT: #pragma omp task if(5) mergeable<br>
// CHECK-NEXT: foo()<br>
// CHECK: template <typename T = long, int C = 1> long tmain(long argc, long *argv) {<br>
// CHECK-NEXT: long b = argc, c, d, e, f, g;<br>
@@ -60,7 +60,7 @@ T tmain(T argc, T *argv) {<br>
// CHECK-NEXT: a = 2;<br>
// CHECK-NEXT: #pragma omp task default(none) private(argc,b) firstprivate(argv) shared(d) if(argc > 0) final(S<long>::TS > 0)<br>
// CHECK-NEXT: foo()<br>
-// CHECK-NEXT: #pragma omp task if(1)<br>
+// CHECK-NEXT: #pragma omp task if(1) mergeable<br>
// CHECK-NEXT: foo()<br>
// CHECK: template <typename T, int C> T tmain(T argc, T *argv) {<br>
// CHECK-NEXT: T b = argc, c, d, e, f, g;<br>
@@ -70,7 +70,7 @@ T tmain(T argc, T *argv) {<br>
// CHECK-NEXT: a = 2;<br>
// CHECK-NEXT: #pragma omp task default(none) private(argc,b) firstprivate(argv) shared(d) if(argc > 0) final(S<T>::TS > 0)<br>
// CHECK-NEXT: foo()<br>
-// CHECK-NEXT: #pragma omp task if(C)<br>
+// CHECK-NEXT: #pragma omp task if(C) mergeable<br>
// CHECK-NEXT: foo()<br>
<br>
enum Enum {};<br>
@@ -82,8 +82,8 @@ int main(int argc, char **argv) {<br>
#pragma omp threadprivate(a)<br>
Enum ee;<br>
// CHECK: Enum ee;<br>
-#pragma omp task untied<br>
- // CHECK-NEXT: #pragma omp task untied<br>
+#pragma omp task untied mergeable<br>
+ // CHECK-NEXT: #pragma omp task untied mergeable<br>
a = 2;<br>
// CHECK-NEXT: a = 2;<br>
#pragma omp task default(none), private(argc, b) firstprivate(argv) if (argc > 0) final(a > 0)<br>
<br>
Modified: cfe/trunk/test/OpenMP/task_messages.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/task_messages.cpp?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/task_messages.cpp?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/OpenMP/task_messages.cpp (original)<br>
+++ cfe/trunk/test/OpenMP/task_messages.cpp Thu Jul 17 07:47:03 2014<br>
@@ -100,6 +100,9 @@ int foo() {<br>
// expected-error@+1 {{directive '#pragma omp task' cannot contain more than one 'untied' clause}}<br>
#pragma omp task untied untied<br>
++r;<br>
+// expected-error@+1 {{directive '#pragma omp task' cannot contain more than one 'mergeable' clause}}<br>
+#pragma omp task mergeable mergeable<br>
+ ++r;<br>
return a + b;<br>
}<br>
<br>
@@ -262,6 +265,9 @@ L2:<br>
// expected-error@+1 {{directive '#pragma omp task' cannot contain more than one 'untied' clause}}<br>
#pragma omp task untied untied<br>
++r;<br>
+// expected-error@+1 {{directive '#pragma omp task' cannot contain more than one 'mergeable' clause}}<br>
+#pragma omp task mergeable mergeable<br>
+ ++r;<br>
// expected-note@+2 {{in instantiation of function template specialization 'foo<int>' requested here}}<br>
// expected-note@+1 {{in instantiation of function template specialization 'foo<S>' requested here}}<br>
return foo<int>() + foo<S>();<br>
<br>
Modified: cfe/trunk/tools/libclang/CIndex.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=213262&r1=213261&r2=213262&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=213262&r1=213261&r2=213262&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/libclang/CIndex.cpp (original)<br>
+++ cfe/trunk/tools/libclang/CIndex.cpp Thu Jul 17 07:47:03 2014<br>
@@ -1970,6 +1970,8 @@ void OMPClauseEnqueue::VisitOMPNowaitCla<br>
<br>
void OMPClauseEnqueue::VisitOMPUntiedClause(const OMPUntiedClause *) {}<br>
<br>
+void OMPClauseEnqueue::VisitOMPMergeableClause(const OMPMergeableClause *) {}<br>
+<br>
template<typename T><br>
void OMPClauseEnqueue::VisitOMPClauseList(T *Node) {<br>
for (const auto *I : Node->varlists())<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>