Author: Krzysztof Parzyszek Date: 2023-11-20T10:48:06-06:00 New Revision: ddfed815c930979414d403e01caca23875072676
URL: https://github.com/llvm/llvm-project/commit/ddfed815c930979414d403e01caca23875072676 DIFF: https://github.com/llvm/llvm-project/commit/ddfed815c930979414d403e01caca23875072676.diff LOG: Revert "[OpenMP] atomic compare fail : Parser & AST support" This reverts commit edd675ac283909397880f85ba68d0d5f99dc1be2. This breaks clang build where every component is a shared library. The file clang/lib/Basic/OpenMPKinds.cpp, which is a part of libclangBasic.so, uses `getOpenMPClauseName` which isn't: /usr/bin/ld: CMakeFiles/obj.clangBasic.dir/OpenMPKinds.cpp.o: in functio n `clang ::getOpenMPSimpleClauseTypeName(llvm::omp::Clause, unsigned int )': OpenMPKinds.cpp:(.text._ZN5clang29getOpenMPSimpleClauseTypeNameEN4llvm3o mp6ClauseEj+0x9b): undefined reference to `llvm::omp::getOpenMPClauseNam e(llvm::omp::Clause)' Added: Modified: clang/include/clang/AST/OpenMPClause.h clang/include/clang/AST/RecursiveASTVisitor.h clang/include/clang/Basic/DiagnosticSemaKinds.td clang/include/clang/Basic/OpenMPKinds.def clang/include/clang/Basic/OpenMPKinds.h clang/include/clang/Sema/Sema.h clang/lib/AST/OpenMPClause.cpp clang/lib/AST/StmtProfile.cpp clang/lib/Basic/OpenMPKinds.cpp clang/lib/CodeGen/CGStmtOpenMP.cpp clang/lib/Parse/ParseOpenMP.cpp clang/lib/Sema/SemaOpenMP.cpp clang/lib/Sema/TreeTransform.h clang/lib/Serialization/ASTReader.cpp clang/lib/Serialization/ASTWriter.cpp clang/test/OpenMP/atomic_ast_print.cpp clang/test/OpenMP/atomic_messages.cpp clang/tools/libclang/CIndex.cpp flang/lib/Semantics/check-omp-structure.cpp llvm/include/llvm/Frontend/OpenMP/OMP.td Removed: ################################################################################ diff --git a/clang/include/clang/AST/OpenMPClause.h b/clang/include/clang/AST/OpenMPClause.h index ccceadeabedc7ff..549f12e87df597a 100644 --- a/clang/include/clang/AST/OpenMPClause.h +++ b/clang/include/clang/AST/OpenMPClause.h @@ -2513,89 +2513,6 @@ class OMPRelaxedClause final : public OMPClause { } }; -/// This represents 'fail' clause in the '#pragma omp atomic' -/// directive. -/// -/// \code -/// #pragma omp atomic compare fail -/// \endcode -/// In this example directive '#pragma omp atomic compare' has 'fail' clause. -class OMPFailClause final : public OMPClause { - - // FailParameter is a memory-order-clause. Storing the ClauseKind is - // sufficient for our purpose. - OpenMPClauseKind FailParameter = llvm::omp::Clause::OMPC_unknown; - SourceLocation FailParameterLoc; - SourceLocation LParenLoc; - - friend class OMPClauseReader; - - /// Sets the location of '(' in fail clause. - void setLParenLoc(SourceLocation Loc) { LParenLoc = Loc; } - - /// Sets the location of memoryOrder clause argument in fail clause. - void setFailParameterLoc(SourceLocation Loc) { FailParameterLoc = Loc; } - - /// Sets the mem_order clause for 'atomic compare fail' directive. - void setFailParameter(OpenMPClauseKind FailParameter) { - this->FailParameter = FailParameter; - assert(checkFailClauseParameter(FailParameter) && - "Invalid fail clause parameter"); - } - -public: - /// Build 'fail' clause. - /// - /// \param StartLoc Starting location of the clause. - /// \param EndLoc Ending location of the clause. - OMPFailClause(SourceLocation StartLoc, SourceLocation EndLoc) - : OMPClause(llvm::omp::OMPC_fail, StartLoc, EndLoc) {} - - OMPFailClause(OpenMPClauseKind FailParameter, SourceLocation FailParameterLoc, - SourceLocation StartLoc, SourceLocation LParenLoc, - SourceLocation EndLoc) - : OMPClause(llvm::omp::OMPC_fail, StartLoc, EndLoc), - FailParameterLoc(FailParameterLoc), LParenLoc(LParenLoc) { - - setFailParameter(FailParameter); - } - - /// Build an empty clause. - OMPFailClause() - : OMPClause(llvm::omp::OMPC_fail, SourceLocation(), SourceLocation()) {} - - child_range children() { - return child_range(child_iterator(), child_iterator()); - } - - const_child_range children() const { - return const_child_range(const_child_iterator(), const_child_iterator()); - } - - child_range used_children() { - return child_range(child_iterator(), child_iterator()); - } - const_child_range used_children() const { - return const_child_range(const_child_iterator(), const_child_iterator()); - } - - static bool classof(const OMPClause *T) { - return T->getClauseKind() == llvm::omp::OMPC_fail; - } - - /// Gets the location of '(' (for the parameter) in fail clause. - SourceLocation getLParenLoc() const { - return LParenLoc; - } - - /// Gets the location of Fail Parameter (type memory-order-clause) in - /// fail clause. - SourceLocation getFailParameterLoc() const { return FailParameterLoc; } - - /// Gets the parameter (type memory-order-clause) in Fail clause. - OpenMPClauseKind getFailParameter() const { return FailParameter; } -}; - /// This represents clause 'private' in the '#pragma omp ...' directives. /// /// \code diff --git a/clang/include/clang/AST/RecursiveASTVisitor.h b/clang/include/clang/AST/RecursiveASTVisitor.h index c501801b95bd955..53bc15e1b19f668 100644 --- a/clang/include/clang/AST/RecursiveASTVisitor.h +++ b/clang/include/clang/AST/RecursiveASTVisitor.h @@ -3398,11 +3398,6 @@ bool RecursiveASTVisitor<Derived>::VisitOMPCompareClause(OMPCompareClause *) { return true; } -template <typename Derived> -bool RecursiveASTVisitor<Derived>::VisitOMPFailClause(OMPFailClause *) { - return true; -} - template <typename Derived> bool RecursiveASTVisitor<Derived>::VisitOMPSeqCstClause(OMPSeqCstClause *) { return true; diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 9a7dafa4a298273..3321ccaa8dab677 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -10962,8 +10962,6 @@ def note_omp_atomic_compare: Note< "expect binary operator in conditional expression|expect '<', '>' or '==' as order operator|expect comparison in a form of 'x == e', 'e == x', 'x ordop expr', or 'expr ordop x'|" "expect lvalue for result value|expect scalar value|expect integer value|unexpected 'else' statement|expect '==' operator|expect an assignment statement 'v = x'|" "expect a 'if' statement|expect no more than two statements|expect a compound statement|expect 'else' statement|expect a form 'r = x == e; if (r) ...'}0">; -def err_omp_atomic_fail_wrong_or_no_clauses : Error<"expected a memory order clause">; -def err_omp_atomic_fail_no_compare : Error<"expected 'compare' clause with the 'fail' modifier">; def err_omp_atomic_several_clauses : Error< "directive '#pragma omp atomic' cannot contain more than one 'read', 'write', 'update', 'capture', or 'compare' clause">; def err_omp_several_mem_order_clauses : Error< diff --git a/clang/include/clang/Basic/OpenMPKinds.def b/clang/include/clang/Basic/OpenMPKinds.def index f46a92d5ecfd44a..272537b769742b5 100644 --- a/clang/include/clang/Basic/OpenMPKinds.def +++ b/clang/include/clang/Basic/OpenMPKinds.def @@ -41,9 +41,6 @@ #ifndef OPENMP_ATOMIC_DEFAULT_MEM_ORDER_KIND #define OPENMP_ATOMIC_DEFAULT_MEM_ORDER_KIND(Name) #endif -#ifndef OPENMP_ATOMIC_FAIL_MODIFIER -#define OPENMP_ATOMIC_FAIL_MODIFIER(Name) -#endif #ifndef OPENMP_AT_KIND #define OPENMP_AT_KIND(Name) #endif @@ -141,11 +138,6 @@ OPENMP_ATOMIC_DEFAULT_MEM_ORDER_KIND(seq_cst) OPENMP_ATOMIC_DEFAULT_MEM_ORDER_KIND(acq_rel) OPENMP_ATOMIC_DEFAULT_MEM_ORDER_KIND(relaxed) -// Modifiers for atomic 'fail' clause. -OPENMP_ATOMIC_FAIL_MODIFIER(seq_cst) -OPENMP_ATOMIC_FAIL_MODIFIER(acquire) -OPENMP_ATOMIC_FAIL_MODIFIER(relaxed) - // Modifiers for 'at' clause. OPENMP_AT_KIND(compilation) OPENMP_AT_KIND(execution) @@ -234,7 +226,6 @@ OPENMP_DOACROSS_MODIFIER(source_omp_cur_iteration) #undef OPENMP_SCHEDULE_MODIFIER #undef OPENMP_SCHEDULE_KIND #undef OPENMP_ATOMIC_DEFAULT_MEM_ORDER_KIND -#undef OPENMP_ATOMIC_FAIL_MODIFIER #undef OPENMP_AT_KIND #undef OPENMP_SEVERITY_KIND #undef OPENMP_MAP_KIND diff --git a/clang/include/clang/Basic/OpenMPKinds.h b/clang/include/clang/Basic/OpenMPKinds.h index d127498774c7fa4..ac1b3cdfff145bc 100644 --- a/clang/include/clang/Basic/OpenMPKinds.h +++ b/clang/include/clang/Basic/OpenMPKinds.h @@ -363,11 +363,6 @@ bool isOpenMPCombinedParallelADirective(OpenMPDirectiveKind DKind); /// \return true - if the above condition is met for this directive /// otherwise - false. bool needsTaskBasedThreadLimit(OpenMPDirectiveKind DKind); - -/// Checks if the parameter to the fail clause in "#pragma atomic compare fail" -/// is restricted only to memory order clauses of "OMPC_acquire", -/// "OMPC_relaxed" and "OMPC_seq_cst". -bool checkFailClauseParameter(OpenMPClauseKind FailClauseParameter); } #endif diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h index 63a9f9d4cffe2f2..e6a9d8da6d911cc 100644 --- a/clang/include/clang/Sema/Sema.h +++ b/clang/include/clang/Sema/Sema.h @@ -12193,13 +12193,6 @@ class Sema final { /// Called on well-formed 'compare' clause. OMPClause *ActOnOpenMPCompareClause(SourceLocation StartLoc, SourceLocation EndLoc); - /// Called on well-formed 'fail' clause. - OMPClause *ActOnOpenMPFailClause(SourceLocation StartLoc, - SourceLocation EndLoc); - OMPClause *ActOnOpenMPFailClause( - OpenMPClauseKind Kind, SourceLocation KindLoc, - SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation EndLoc); - /// Called on well-formed 'seq_cst' clause. OMPClause *ActOnOpenMPSeqCstClause(SourceLocation StartLoc, SourceLocation EndLoc); diff --git a/clang/lib/AST/OpenMPClause.cpp b/clang/lib/AST/OpenMPClause.cpp index 04f680a8f5c92c8..4e19339a1361e6f 100644 --- a/clang/lib/AST/OpenMPClause.cpp +++ b/clang/lib/AST/OpenMPClause.cpp @@ -130,7 +130,6 @@ const OMPClauseWithPreInit *OMPClauseWithPreInit::get(const OMPClause *C) { case OMPC_update: case OMPC_capture: case OMPC_compare: - case OMPC_fail: case OMPC_seq_cst: case OMPC_acq_rel: case OMPC_acquire: @@ -228,7 +227,6 @@ const OMPClauseWithPostUpdate *OMPClauseWithPostUpdate::get(const OMPClause *C) case OMPC_update: case OMPC_capture: case OMPC_compare: - case OMPC_fail: case OMPC_seq_cst: case OMPC_acq_rel: case OMPC_acquire: @@ -1927,16 +1925,6 @@ void OMPClausePrinter::VisitOMPCompareClause(OMPCompareClause *) { OS << "compare"; } -void OMPClausePrinter::VisitOMPFailClause(OMPFailClause *Node) { - OS << "fail"; - if (Node) { - OS << "("; - OS << getOpenMPSimpleClauseTypeName( - Node->getClauseKind(), static_cast<int>(Node->getFailParameter())); - OS << ")"; - } -} - void OMPClausePrinter::VisitOMPSeqCstClause(OMPSeqCstClause *) { OS << "seq_cst"; } diff --git a/clang/lib/AST/StmtProfile.cpp b/clang/lib/AST/StmtProfile.cpp index d7b980a585702a5..8128219dd6f63c9 100644 --- a/clang/lib/AST/StmtProfile.cpp +++ b/clang/lib/AST/StmtProfile.cpp @@ -582,8 +582,6 @@ void OMPClauseProfiler::VisitOMPCaptureClause(const OMPCaptureClause *) {} void OMPClauseProfiler::VisitOMPCompareClause(const OMPCompareClause *) {} -void OMPClauseProfiler::VisitOMPFailClause(const OMPFailClause *) {} - void OMPClauseProfiler::VisitOMPSeqCstClause(const OMPSeqCstClause *) {} void OMPClauseProfiler::VisitOMPAcqRelClause(const OMPAcqRelClause *) {} diff --git a/clang/lib/Basic/OpenMPKinds.cpp b/clang/lib/Basic/OpenMPKinds.cpp index 6c31b0824eb8a4c..86de067da134a0a 100644 --- a/clang/lib/Basic/OpenMPKinds.cpp +++ b/clang/lib/Basic/OpenMPKinds.cpp @@ -104,11 +104,6 @@ unsigned clang::getOpenMPSimpleClauseType(OpenMPClauseKind Kind, StringRef Str, .Case(#Name, OMPC_ATOMIC_DEFAULT_MEM_ORDER_##Name) #include "clang/Basic/OpenMPKinds.def" .Default(OMPC_ATOMIC_DEFAULT_MEM_ORDER_unknown); - case OMPC_fail: - return static_cast<unsigned int>(llvm::StringSwitch<llvm::omp::Clause>(Str) -#define OPENMP_ATOMIC_FAIL_MODIFIER(Name) .Case(#Name, OMPC_##Name) -#include "clang/Basic/OpenMPKinds.def" - .Default(OMPC_unknown)); case OMPC_device_type: return llvm::StringSwitch<OpenMPDeviceType>(Str) #define OPENMP_DEVICE_TYPE_KIND(Name) .Case(#Name, OMPC_DEVICE_TYPE_##Name) @@ -439,11 +434,6 @@ const char *clang::getOpenMPSimpleClauseTypeName(OpenMPClauseKind Kind, #include "clang/Basic/OpenMPKinds.def" } llvm_unreachable("Invalid OpenMP 'depend' clause type"); - case OMPC_fail: { - OpenMPClauseKind CK = static_cast<OpenMPClauseKind>(Type); - return getOpenMPClauseName(CK).data(); - llvm_unreachable("Invalid OpenMP 'fail' clause modifier"); - } case OMPC_device: switch (Type) { case OMPC_DEVICE_unknown: @@ -899,10 +889,3 @@ void clang::getOpenMPCaptureRegions( llvm_unreachable("Unknown OpenMP directive"); } } - -bool clang::checkFailClauseParameter(OpenMPClauseKind FailClauseParameter) { - return FailClauseParameter == llvm::omp::OMPC_acquire || - FailClauseParameter == llvm::omp::OMPC_relaxed || - FailClauseParameter == llvm::omp::OMPC_seq_cst; -} - diff --git a/clang/lib/CodeGen/CGStmtOpenMP.cpp b/clang/lib/CodeGen/CGStmtOpenMP.cpp index 478d6dbf9ca81d9..62b056c5d08a18c 100644 --- a/clang/lib/CodeGen/CGStmtOpenMP.cpp +++ b/clang/lib/CodeGen/CGStmtOpenMP.cpp @@ -6516,10 +6516,6 @@ static void emitOMPAtomicExpr(CodeGenFunction &CGF, OpenMPClauseKind Kind, IsPostfixUpdate, IsFailOnly, Loc); break; } - case OMPC_fail: { - //TODO - break; - } default: llvm_unreachable("Clause is not allowed in 'omp atomic'."); } diff --git a/clang/lib/Parse/ParseOpenMP.cpp b/clang/lib/Parse/ParseOpenMP.cpp index 1f81c263f84717f..9b47ec4fbbc51f1 100644 --- a/clang/lib/Parse/ParseOpenMP.cpp +++ b/clang/lib/Parse/ParseOpenMP.cpp @@ -3248,7 +3248,6 @@ OMPClause *Parser::ParseOpenMPClause(OpenMPDirectiveKind DKind, else Clause = ParseOpenMPSingleExprClause(CKind, WrongDirective); break; - case OMPC_fail: case OMPC_default: case OMPC_proc_bind: case OMPC_atomic_default_mem_order: diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp index 3a5f4b12ce29621..dcdd6e7a3f5c762 100644 --- a/clang/lib/Sema/SemaOpenMP.cpp +++ b/clang/lib/Sema/SemaOpenMP.cpp @@ -12682,14 +12682,6 @@ StmtResult Sema::ActOnOpenMPAtomicDirective(ArrayRef<OMPClause *> Clauses, } break; } - case OMPC_fail: { - if (AtomicKind != OMPC_compare) { - Diag(C->getBeginLoc(), diag::err_omp_atomic_fail_no_compare) - << SourceRange(C->getBeginLoc(), C->getEndLoc()); - return StmtError(); - } - break; - } case OMPC_seq_cst: case OMPC_acq_rel: case OMPC_acquire: @@ -16891,11 +16883,6 @@ OMPClause *Sema::ActOnOpenMPSimpleClause( static_cast<OpenMPAtomicDefaultMemOrderClauseKind>(Argument), ArgumentLoc, StartLoc, LParenLoc, EndLoc); break; - case OMPC_fail: - Res = ActOnOpenMPFailClause( - static_cast<OpenMPClauseKind>(Argument), - ArgumentLoc, StartLoc, LParenLoc, EndLoc); - break; case OMPC_update: Res = ActOnOpenMPUpdateClause(static_cast<OpenMPDependClauseKind>(Argument), ArgumentLoc, StartLoc, LParenLoc, EndLoc); @@ -17536,9 +17523,6 @@ OMPClause *Sema::ActOnOpenMPClause(OpenMPClauseKind Kind, case OMPC_compare: Res = ActOnOpenMPCompareClause(StartLoc, EndLoc); break; - case OMPC_fail: - Res = ActOnOpenMPFailClause(StartLoc, EndLoc); - break; case OMPC_seq_cst: Res = ActOnOpenMPSeqCstClause(StartLoc, EndLoc); break; @@ -17699,24 +17683,6 @@ OMPClause *Sema::ActOnOpenMPCompareClause(SourceLocation StartLoc, return new (Context) OMPCompareClause(StartLoc, EndLoc); } -OMPClause *Sema::ActOnOpenMPFailClause(SourceLocation StartLoc, - SourceLocation EndLoc) { - return new (Context) OMPFailClause(StartLoc, EndLoc); -} - -OMPClause *Sema::ActOnOpenMPFailClause( - OpenMPClauseKind Parameter, SourceLocation KindLoc, - SourceLocation StartLoc, SourceLocation LParenLoc, - SourceLocation EndLoc) { - - if (!checkFailClauseParameter(Parameter)) { - Diag(KindLoc, diag::err_omp_atomic_fail_wrong_or_no_clauses); - return nullptr; - } - return new (Context) - OMPFailClause(Parameter, KindLoc, StartLoc, LParenLoc, EndLoc); -} - OMPClause *Sema::ActOnOpenMPSeqCstClause(SourceLocation StartLoc, SourceLocation EndLoc) { return new (Context) OMPSeqCstClause(StartLoc, EndLoc); diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h index 8c574abd403f045..e24f710fdedd4e2 100644 --- a/clang/lib/Sema/TreeTransform.h +++ b/clang/lib/Sema/TreeTransform.h @@ -9866,12 +9866,6 @@ TreeTransform<Derived>::TransformOMPCompareClause(OMPCompareClause *C) { return C; } -template <typename Derived> -OMPClause *TreeTransform<Derived>::TransformOMPFailClause(OMPFailClause *C) { - // No need to rebuild this clause, no template-dependent parameters. - return C; -} - template <typename Derived> OMPClause * TreeTransform<Derived>::TransformOMPSeqCstClause(OMPSeqCstClause *C) { diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index f22da838424b415..dbc2d0b56c46d9c 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -10276,9 +10276,6 @@ OMPClause *OMPClauseReader::readClause() { case llvm::omp::OMPC_compare: C = new (Context) OMPCompareClause(); break; - case llvm::omp::OMPC_fail: - C = new (Context) OMPFailClause(); - break; case llvm::omp::OMPC_seq_cst: C = new (Context) OMPSeqCstClause(); break; @@ -10672,16 +10669,6 @@ void OMPClauseReader::VisitOMPCaptureClause(OMPCaptureClause *) {} void OMPClauseReader::VisitOMPCompareClause(OMPCompareClause *) {} -// Read the parameter of fail clause. This will have been saved when -// OMPClauseWriter is called. -void OMPClauseReader::VisitOMPFailClause(OMPFailClause *C) { - C->setLParenLoc(Record.readSourceLocation()); - SourceLocation FailParameterLoc = Record.readSourceLocation(); - C->setFailParameterLoc(FailParameterLoc); - OpenMPClauseKind CKind = Record.readEnum<OpenMPClauseKind>(); - C->setFailParameter(CKind); -} - void OMPClauseReader::VisitOMPSeqCstClause(OMPSeqCstClause *) {} void OMPClauseReader::VisitOMPAcqRelClause(OMPAcqRelClause *) {} diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index 6df815234e235fb..5ebeb106a197bdf 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -6622,13 +6622,6 @@ void OMPClauseWriter::VisitOMPCaptureClause(OMPCaptureClause *) {} void OMPClauseWriter::VisitOMPCompareClause(OMPCompareClause *) {} -// Save the parameter of fail clause. -void OMPClauseWriter::VisitOMPFailClause(OMPFailClause *C) { - Record.AddSourceLocation(C->getLParenLoc()); - Record.AddSourceLocation(C->getFailParameterLoc()); - Record.writeEnum(C->getFailParameter()); -} - void OMPClauseWriter::VisitOMPSeqCstClause(OMPSeqCstClause *) {} void OMPClauseWriter::VisitOMPAcqRelClause(OMPAcqRelClause *) {} diff --git a/clang/test/OpenMP/atomic_ast_print.cpp b/clang/test/OpenMP/atomic_ast_print.cpp index 6886ef29a6752db..d82beb1da485081 100644 --- a/clang/test/OpenMP/atomic_ast_print.cpp +++ b/clang/test/OpenMP/atomic_ast_print.cpp @@ -226,12 +226,6 @@ T foo(T argc) { { v = a; if (a < b) { a = b; } } #pragma omp atomic compare capture hint(6) { v = a == b; if (v) a = c; } -#pragma omp atomic compare fail(acquire) - { if (a < c) { a = c; } } -#pragma omp atomic compare fail(relaxed) - { if (a < c) { a = c; } } -#pragma omp atomic compare fail(seq_cst) - { if (a < c) { a = c; } } #endif return T(); } @@ -1105,12 +1099,6 @@ int main(int argc, char **argv) { { v = a; if (a < b) { a = b; } } #pragma omp atomic compare capture hint(6) { v = a == b; if (v) a = c; } -#pragma omp atomic compare fail(acquire) - if(a < b) { a = b; } -#pragma omp atomic compare fail(relaxed) - if(a < b) { a = b; } -#pragma omp atomic compare fail(seq_cst) - if(a < b) { a = b; } #endif // CHECK-NEXT: #pragma omp atomic // CHECK-NEXT: a++; @@ -1441,18 +1429,6 @@ int main(int argc, char **argv) { // CHECK-51-NEXT: if (v) // CHECK-51-NEXT: a = c; // CHECK-51-NEXT: } - // CHECK-51-NEXT: #pragma omp atomic compare fail(acquire) - // CHECK-51-NEXT: if (a < b) { - // CHECK-51-NEXT: a = b; - // CHECK-51-NEXT: } - // CHECK-51-NEXT: #pragma omp atomic compare fail(relaxed) - // CHECK-51-NEXT: if (a < b) { - // CHECK-51-NEXT: a = b; - // CHECK-51-NEXT: } - // CHECK-51-NEXT: #pragma omp atomic compare fail(seq_cst) - // CHECK-51-NEXT: if (a < b) { - // CHECK-51-NEXT: a = b; - // CHECK-51-NEXT: } // expect-note@+1 {{in instantiation of function template specialization 'foo<int>' requested here}} return foo(a); } diff --git a/clang/test/OpenMP/atomic_messages.cpp b/clang/test/OpenMP/atomic_messages.cpp index b09e3318cd9ac04..d54c17a9dd37f55 100644 --- a/clang/test/OpenMP/atomic_messages.cpp +++ b/clang/test/OpenMP/atomic_messages.cpp @@ -958,24 +958,6 @@ int mixed() { // expected-error@+1 {{directive '#pragma omp atomic' cannot contain more than one 'capture' clause}} #pragma omp atomic compare compare capture capture { v = a; if (a > b) a = b; } -// expected-error@+1 {{expected 'compare' clause with the 'fail' modifier}} -#pragma omp atomic fail(seq_cst) - if(v == a) { v = a; } -// expected-error@+1 {{expected '(' after 'fail'}} -#pragma omp atomic compare fail - if(v < a) { v = a; } -// expected-error@+1 {{expected a memory order clause}} -#pragma omp atomic compare fail(capture) - if(v < a) { v = a; } - // expected-error@+2 {{expected ')'}} - // expected-note@+1 {{to match this '('}} -#pragma omp atomic compare fail(seq_cst | acquire) - if(v < a) { v = a; } -// expected-error@+1 {{directive '#pragma omp atomic' cannot contain more than one 'fail' clause}} -#pragma omp atomic compare fail(relaxed) fail(seq_cst) - if(v < a) { v = a; } - - #endif // expected-note@+1 {{in instantiation of function template specialization 'mixed<int>' requested here}} return mixed<int>(); diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp index a449fa4d4af43a2..df630f66f0b946a 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -2402,8 +2402,6 @@ void OMPClauseEnqueue::VisitOMPCaptureClause(const OMPCaptureClause *) {} void OMPClauseEnqueue::VisitOMPCompareClause(const OMPCompareClause *) {} -void OMPClauseEnqueue::VisitOMPFailClause(const OMPFailClause *) {} - void OMPClauseEnqueue::VisitOMPSeqCstClause(const OMPSeqCstClause *) {} void OMPClauseEnqueue::VisitOMPAcqRelClause(const OMPAcqRelClause *) {} diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp index 83a0f184b5f0d83..0b1a581bf298196 100644 --- a/flang/lib/Semantics/check-omp-structure.cpp +++ b/flang/lib/Semantics/check-omp-structure.cpp @@ -2228,7 +2228,6 @@ CHECK_SIMPLE_CLAUSE(CancellationConstructType, OMPC_cancellation_construct_type) CHECK_SIMPLE_CLAUSE(Doacross, OMPC_doacross) CHECK_SIMPLE_CLAUSE(OmpxAttribute, OMPC_ompx_attribute) CHECK_SIMPLE_CLAUSE(OmpxBare, OMPC_ompx_bare) -CHECK_SIMPLE_CLAUSE(Fail, OMPC_fail) CHECK_REQ_SCALAR_INT_CLAUSE(Grainsize, OMPC_grainsize) CHECK_REQ_SCALAR_INT_CLAUSE(NumTasks, OMPC_num_tasks) diff --git a/llvm/include/llvm/Frontend/OpenMP/OMP.td b/llvm/include/llvm/Frontend/OpenMP/OMP.td index 5ac0f83b2b6f66a..f8b3b0c7524979b 100644 --- a/llvm/include/llvm/Frontend/OpenMP/OMP.td +++ b/llvm/include/llvm/Frontend/OpenMP/OMP.td @@ -209,7 +209,6 @@ def OMPC_Write : Clause<"write"> { let clangClass = "OMPWriteClause"; } def OMPC_Update : Clause<"update"> { let clangClass = "OMPUpdateClause"; } def OMPC_Capture : Clause<"capture"> { let clangClass = "OMPCaptureClause"; } def OMPC_Compare : Clause<"compare"> { let clangClass = "OMPCompareClause"; } -def OMPC_Fail : Clause<"fail"> { let clangClass = "OMPFailClause"; } def OMPC_SeqCst : Clause<"seq_cst"> { let clangClass = "OMPSeqCstClause"; } def OMPC_AcqRel : Clause<"acq_rel"> { let clangClass = "OMPAcqRelClause"; } def OMPC_Acquire : Clause<"acquire"> { let clangClass = "OMPAcquireClause"; } @@ -638,8 +637,7 @@ def OMP_Atomic : Directive<"atomic"> { VersionedClause<OMPC_Acquire, 50>, VersionedClause<OMPC_Release, 50>, VersionedClause<OMPC_Relaxed, 50>, - VersionedClause<OMPC_Hint, 50>, - VersionedClause<OMPC_Fail, 51> + VersionedClause<OMPC_Hint, 50> ]; } def OMP_Target : Directive<"target"> { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
