Revert "[OPENMP50]Add basic support for inscan reduction modifier."

This reverts commit 36ed0ce to fix a
crash in scan_messages.cpp test.

Author: alexey-bataev

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -10101,19 +10101,6 @@ def err_omp_depobj_single_clause_expected : Error<
   "exactly one of 'depend', 'destroy', or 'update' clauses is expected">;
 def err_omp_scan_single_clause_expected : Error<
   "exactly one of 'inclusive' or 'exclusive' clauses is expected">;
-def err_omp_inclusive_exclusive_not_reduction : Error<
-  "the list item must appear in 'reduction' clause with the 'inscan' modifier "
-  "of the parent directive">;
-def err_omp_reduction_not_inclusive_exclusive : Error<
-  "the inscan reduction list item must appear as a list item in an 'inclusive' or"
-  " 'exclusive' clause on an inner 'omp scan' directive">;
-def err_omp_wrong_inscan_reduction : Error<
-  "'inscan' modifier can be used only in 'omp for', 'omp simd', 'omp for simd',"
-  " 'omp parallel for', or 'omp parallel for simd' directive">;
-def err_omp_inscan_reduction_expected : Error<
-  "expected 'reduction' clause with the 'inscan' modifier">;
-def note_omp_previous_inscan_reduction : Note<
-  "'reduction' clause with 'inscan' modifier is used here">;
 def err_omp_expected_predefined_allocator : Error<
   "expected one of the predefined allocators for the variables with the static "
   "storage: 'omp_default_mem_alloc', 'omp_large_cap_mem_alloc', "

clang/include/clang/Basic/OpenMPKinds.def

@@ -1112,7 +1112,6 @@ OPENMP_DEPOBJ_CLAUSE(update)
 
 // Modifiers for 'reduction' clause.
 OPENMP_REDUCTION_MODIFIER(default)
-OPENMP_REDUCTION_MODIFIER(inscan)
 
 #undef OPENMP_REDUCTION_MODIFIER
 #undef OPENMP_SCAN_CLAUSE

clang/lib/Sema/SemaOpenMP.cpp

@@ -62,15 +62,14 @@ class DSAStackTy {
   struct DSAVarData {
     OpenMPDirectiveKind DKind = OMPD_unknown;
     OpenMPClauseKind CKind = OMPC_unknown;
-    unsigned Modifier = 0;
     const Expr *RefExpr = nullptr;
     DeclRefExpr *PrivateCopy = nullptr;
     SourceLocation ImplicitDSALoc;
     DSAVarData() = default;
     DSAVarData(OpenMPDirectiveKind DKind, OpenMPClauseKind CKind,
                const Expr *RefExpr, DeclRefExpr *PrivateCopy,
-               SourceLocation ImplicitDSALoc, unsigned Modifier)
-        : DKind(DKind), CKind(CKind), Modifier(Modifier), RefExpr(RefExpr),
+               SourceLocation ImplicitDSALoc)
+        : DKind(DKind), CKind(CKind), RefExpr(RefExpr),
           PrivateCopy(PrivateCopy), ImplicitDSALoc(ImplicitDSALoc) {}
   };
   using OperatorOffsetTy =
@@ -81,7 +80,6 @@ class DSAStackTy {
 private:
   struct DSAInfo {
     OpenMPClauseKind Attributes = OMPC_unknown;
-    unsigned Modifier = 0;
     /// Pointer to a reference expression and a flag which shows that the
     /// variable is marked as lastprivate(true) or not (false).
     llvm::PointerIntPair<const Expr *, 1, bool> RefExpr;
@@ -166,8 +164,6 @@ class DSAStackTy {
     /// List of globals marked as declare target link in this target region
     /// (isOpenMPTargetExecutionDirective(Directive) == true).
     llvm::SmallVector<DeclRefExpr *, 4> DeclareTargetLinkVarDecls;
-    /// List of decls used in inclusive/exclusive clauses of the scan directive.
-    llvm::DenseSet<CanonicalDeclPtr<Decl>> UsedInScanDirective;
     SharingMapTy(OpenMPDirectiveKind DKind, DeclarationNameInfo Name,
                  Scope *CurScope, SourceLocation Loc)
         : Directive(DKind), DirectiveName(Name), CurScope(CurScope),
@@ -473,20 +469,9 @@ class DSAStackTy {
   /// parent directive.
   const ValueDecl *getParentLoopControlVariable(unsigned I) const;
 
-  /// Marks the specified decl \p D as used in scan directive.
-  void markDeclAsUsedInScanDirective(ValueDecl *D) {
-    if (SharingMapTy *Stack = getSecondOnStackOrNull())
-      Stack->UsedInScanDirective.insert(D);
-  }
-
-  /// Checks if the specified declaration was used in the inner scan directive.
-  bool isUsedInScanDirective(ValueDecl *D) const {
-    return getTopOfStack().UsedInScanDirective.count(D) > 0;
-  }
-
   /// Adds explicit data sharing attribute to the specified declaration.
   void addDSA(const ValueDecl *D, const Expr *E, OpenMPClauseKind A,
-              DeclRefExpr *PrivateCopy = nullptr, unsigned Modifier = 0);
+              DeclRefExpr *PrivateCopy = nullptr);
 
   /// Adds additional information for the reduction items with the reduction id
   /// represented as an operator.
@@ -1094,7 +1079,6 @@ DSAStackTy::DSAVarData DSAStackTy::getDSA(const_iterator &Iter,
     DVar.PrivateCopy = Data.PrivateCopy;
     DVar.CKind = Data.Attributes;
     DVar.ImplicitDSALoc = Iter->DefaultAttrLoc;
-    DVar.Modifier = Data.Modifier;
     return DVar;
   }
 
@@ -1242,21 +1226,19 @@ const ValueDecl *DSAStackTy::getParentLoopControlVariable(unsigned I) const {
 }
 
 void DSAStackTy::addDSA(const ValueDecl *D, const Expr *E, OpenMPClauseKind A,
-                        DeclRefExpr *PrivateCopy, unsigned Modifier) {
+                        DeclRefExpr *PrivateCopy) {
   D = getCanonicalDecl(D);
   if (A == OMPC_threadprivate) {
     DSAInfo &Data = Threadprivates[D];
     Data.Attributes = A;
     Data.RefExpr.setPointer(E);
     Data.PrivateCopy = nullptr;
-    Data.Modifier = Modifier;
   } else {
     DSAInfo &Data = getTopOfStack().SharingMap[D];
     assert(Data.Attributes == OMPC_unknown || (A == Data.Attributes) ||
            (A == OMPC_firstprivate && Data.Attributes == OMPC_lastprivate) ||
            (A == OMPC_lastprivate && Data.Attributes == OMPC_firstprivate) ||
            (isLoopControlVariable(D).first && A == OMPC_private));
-    Data.Modifier = Modifier;
     if (A == OMPC_lastprivate && Data.Attributes == OMPC_firstprivate) {
       Data.RefExpr.setInt(/*IntVal=*/true);
       return;
@@ -1268,7 +1250,6 @@ void DSAStackTy::addDSA(const ValueDecl *D, const Expr *E, OpenMPClauseKind A,
     Data.PrivateCopy = PrivateCopy;
     if (PrivateCopy) {
       DSAInfo &Data = getTopOfStack().SharingMap[PrivateCopy->getDecl()];
-      Data.Modifier = Modifier;
       Data.Attributes = A;
       Data.RefExpr.setPointerAndInt(PrivateCopy, IsLastprivate);
       Data.PrivateCopy = nullptr;
@@ -1374,7 +1355,7 @@ const DSAStackTy::DSAVarData DSAStackTy::getTopMostTaskgroupReductionData(
                                        "set.");
     TaskgroupDescriptor = I->TaskgroupReductionRef;
     return DSAVarData(OMPD_taskgroup, OMPC_reduction, Data.RefExpr.getPointer(),
-                      Data.PrivateCopy, I->DefaultAttrLoc, /*Modifier=*/0);
+                      Data.PrivateCopy, I->DefaultAttrLoc);
   }
   return DSAVarData();
 }
@@ -1399,7 +1380,7 @@ const DSAStackTy::DSAVarData DSAStackTy::getTopMostTaskgroupReductionData(
                                        "set.");
     TaskgroupDescriptor = I->TaskgroupReductionRef;
     return DSAVarData(OMPD_taskgroup, OMPC_reduction, Data.RefExpr.getPointer(),
-                      Data.PrivateCopy, I->DefaultAttrLoc, /*Modifier=*/0);
+                      Data.PrivateCopy, I->DefaultAttrLoc);
   }
   return DSAVarData();
 }
@@ -1474,7 +1455,6 @@ const DSAStackTy::DSAVarData DSAStackTy::getTopDSA(ValueDecl *D,
   if (TI != Threadprivates.end()) {
     DVar.RefExpr = TI->getSecond().RefExpr.getPointer();
     DVar.CKind = OMPC_threadprivate;
-    DVar.Modifier = TI->getSecond().Modifier;
     return DVar;
   }
   if (VD && VD->hasAttr<OMPThreadPrivateDeclAttr>()) {
@@ -1566,7 +1546,6 @@ const DSAStackTy::DSAVarData DSAStackTy::getTopDSA(ValueDecl *D,
       DVar.CKind = Data.Attributes;
       DVar.ImplicitDSALoc = I->DefaultAttrLoc;
       DVar.DKind = I->Directive;
-      DVar.Modifier = Data.Modifier;
       return DVar;
     }
 
@@ -1613,7 +1592,6 @@ const DSAStackTy::DSAVarData DSAStackTy::getTopDSA(ValueDecl *D,
     DVar.CKind = Data.Attributes;
     DVar.ImplicitDSALoc = I->DefaultAttrLoc;
     DVar.DKind = I->Directive;
-    DVar.Modifier = Data.Modifier;
   }
 
   return DVar;
@@ -2337,64 +2315,11 @@ void Sema::EndOpenMPClause() {
   DSAStack->setClauseParsingMode(/*K=*/OMPC_unknown);
 }
 
+static void checkAllocateClauses(Sema &S, DSAStackTy *Stack,
+                                 ArrayRef<OMPClause *> Clauses);
 static std::pair<ValueDecl *, bool>
 getPrivateItem(Sema &S, Expr *&RefExpr, SourceLocation &ELoc,
                SourceRange &ERange, bool AllowArraySection = false);
-
-/// Check consistency of the reduction clauses.
-static void checkReductionClauses(Sema &S, DSAStackTy *Stack,
-                                 ArrayRef<OMPClause *> Clauses) {
-  bool InscanFound = false;
-  SourceLocation InscanLoc;
-  // OpenMP 5.0, 2.19.5.4 reduction Clause, Restrictions.
-  // A reduction clause without the inscan reduction-modifier may not appear on
-  // a construct on which a reduction clause with the inscan reduction-modifier
-  // appears.
-  for (OMPClause *C : Clauses) {
-    if (C->getClauseKind() != OMPC_reduction)
-      continue;
-    auto *RC = cast<OMPReductionClause>(C);
-    if (RC->getModifier() == OMPC_REDUCTION_inscan) {
-      InscanFound = true;
-      InscanLoc = RC->getModifierLoc();
-      break;
-    }
-  }
-  if (InscanFound) {
-    for (OMPClause *C : Clauses) {
-      if (C->getClauseKind() != OMPC_reduction)
-        continue;
-      auto *RC = cast<OMPReductionClause>(C);
-      if (RC->getModifier() != OMPC_REDUCTION_inscan) {
-        S.Diag(RC->getModifier() == OMPC_REDUCTION_unknown
-                   ? RC->getBeginLoc()
-                   : RC->getModifierLoc(),
-               diag::err_omp_inscan_reduction_expected);
-        S.Diag(InscanLoc, diag::note_omp_previous_inscan_reduction);
-        continue;
-      }
-      for (Expr *Ref : RC->varlists()) {
-        assert(Ref && "NULL expr in OpenMP nontemporal clause.");
-        SourceLocation ELoc;
-        SourceRange ERange;
-        Expr *SimpleRefExpr = Ref;
-        auto Res = getPrivateItem(S, SimpleRefExpr, ELoc, ERange,
-                                  /*AllowArraySection=*/true);
-        ValueDecl *D = Res.first;
-        if (!D)
-          continue;
-        if (!Stack->isUsedInScanDirective(getCanonicalDecl(D))) {
-          S.Diag(Ref->getExprLoc(),
-                 diag::err_omp_reduction_not_inclusive_exclusive)
-              << Ref->getSourceRange();
-        }
-      }
-    }
-  }
-}
-
-static void checkAllocateClauses(Sema &S, DSAStackTy *Stack,
-                                 ArrayRef<OMPClause *> Clauses);
 static DeclRefExpr *buildCapture(Sema &S, ValueDecl *D, Expr *CaptureExpr,
                                  bool WithInit);
 
@@ -2471,7 +2396,6 @@ void Sema::EndOpenMPDSABlock(Stmt *CurDirective) {
     // Check allocate clauses.
     if (!CurContext->isDependentContext())
       checkAllocateClauses(*this, DSAStack, D->clauses());
-    checkReductionClauses(*this, DSAStack, D->clauses());
   }
 
   DSAStack->pop();
@@ -14187,11 +14111,9 @@ struct ReductionData {
   SmallVector<Decl *, 4> ExprCaptures;
   /// List of postupdate expressions.
   SmallVector<Expr *, 4> ExprPostUpdates;
-  /// Reduction modifier.
-  unsigned RedModifier = 0;
   ReductionData() = delete;
   /// Reserves required memory for the reduction data.
-  ReductionData(unsigned Size, unsigned Modifier = 0) : RedModifier(Modifier) {
+  ReductionData(unsigned Size) {
     Vars.reserve(Size);
     Privates.reserve(Size);
     LHSs.reserve(Size);
@@ -14909,8 +14831,7 @@ static bool actOnOMPReductionKindClause(
     }
     // All reduction items are still marked as reduction (to do not increase
     // code base size).
-    Stack->addDSA(D, RefExpr->IgnoreParens(), OMPC_reduction, Ref,
-                  RD.RedModifier);
+    Stack->addDSA(D, RefExpr->IgnoreParens(), OMPC_reduction, Ref);
     if (CurrDir == OMPD_taskgroup) {
       if (DeclareReductionRef.isUsable())
         Stack->addTaskgroupReductionData(D, ReductionIdRange,
@@ -14937,22 +14858,8 @@ OMPClause *Sema::ActOnOpenMPReductionClause(
         << getOpenMPClauseName(OMPC_reduction);
     return nullptr;
   }
-  // OpenMP 5.0, 2.19.5.4 reduction Clause, Restrictions
-  // A reduction clause with the inscan reduction-modifier may only appear on a
-  // worksharing-loop construct, a worksharing-loop SIMD construct, a simd
-  // construct, a parallel worksharing-loop construct or a parallel
-  // worksharing-loop SIMD construct.
-  if (Modifier == OMPC_REDUCTION_inscan &&
-      (DSAStack->getCurrentDirective() != OMPD_for &&
-       DSAStack->getCurrentDirective() != OMPD_for_simd &&
-       DSAStack->getCurrentDirective() != OMPD_simd &&
-       DSAStack->getCurrentDirective() != OMPD_parallel_for &&
-       DSAStack->getCurrentDirective() != OMPD_parallel_for_simd)) {
-    Diag(ModifierLoc, diag::err_omp_wrong_inscan_reduction);
-    return nullptr;
-  }
 
-  ReductionData RD(VarList.size(), Modifier);
+  ReductionData RD(VarList.size());
   if (actOnOMPReductionKindClause(*this, DSAStack, OMPC_reduction, VarList,
                                   StartLoc, LParenLoc, ColonLoc, EndLoc,
                                   ReductionIdScopeSpec, ReductionId,
@@ -18254,19 +18161,6 @@ OMPClause *Sema::ActOnOpenMPInclusiveClause(ArrayRef<Expr *> VarList,
     if (!D)
       continue;
 
-    const DSAStackTy::DSAVarData DVar =
-        DSAStack->getTopDSA(D, /*FromParent=*/true);
-    // OpenMP 5.0, 2.9.6, scan Directive, Restrictions.
-    // A list item that appears in the inclusive or exclusive clause must appear
-    // in a reduction clause with the inscan modifier on the enclosing
-    // worksharing-loop, worksharing-loop SIMD, or simd construct.
-    if (DVar.CKind != OMPC_reduction ||
-        DVar.Modifier != OMPC_REDUCTION_inscan)
-      Diag(ELoc, diag::err_omp_inclusive_exclusive_not_reduction)
-          << RefExpr->getSourceRange();
-
-    if (DSAStack->getParentDirective() != OMPD_unknown)
-      DSAStack->markDeclAsUsedInScanDirective(D);
     Vars.push_back(RefExpr);
   }
 
@@ -18295,19 +18189,6 @@ OMPClause *Sema::ActOnOpenMPExclusiveClause(ArrayRef<Expr *> VarList,
     if (!D)
       continue;
 
-    const DSAStackTy::DSAVarData DVar =
-        DSAStack->getTopDSA(D, /*FromParent=*/true);
-    // OpenMP 5.0, 2.9.6, scan Directive, Restrictions.
-    // A list item that appears in the inclusive or exclusive clause must appear
-    // in a reduction clause with the inscan modifier on the enclosing
-    // worksharing-loop, worksharing-loop SIMD, or simd construct.
-    if (DVar.CKind != OMPC_reduction ||
-        DVar.Modifier != OMPC_REDUCTION_inscan)
-      Diag(ELoc, diag::err_omp_inclusive_exclusive_not_reduction)
-          << RefExpr->getSourceRange();
-
-    if (DSAStack->getParentDirective() != OMPD_unknown)
-      DSAStack->markDeclAsUsedInScanDirective(D);
     Vars.push_back(RefExpr);
   }
 

clang/test/OpenMP/nesting_of_regions.cpp

@@ -2892,7 +2892,7 @@ void foo() {
   }
 #pragma omp parallel for simd
   for (int i = 0; i < 10; ++i) {
-#pragma omp scan // omp45-error {{OpenMP constructs may not be nested inside a simd region}} omp50-error {{exactly one of 'inclusive' or 'exclusive' clauses is expected}}
+#pragma omp scan // omp45-error {{OpenMP constructs may not be nested inside a simd region}}  omp50-error {{exactly one of 'inclusive' or 'exclusive' clauses is expected}}
     bar();
   }
 #pragma omp parallel for simd

clang/test/OpenMP/parallel_for_reduction_messages.cpp

@@ -1,10 +1,10 @@
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=50 -ferror-limit 150 -o - %s -Wuninitialized
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=50 -std=c++98 -ferror-limit 150 -o - %s -Wuninitialized
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=50 -std=c++11 -ferror-limit 150 -o - %s -Wuninitialized
+// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 150 -o - %s -Wuninitialized
+// RUN: %clang_cc1 -verify -fopenmp -std=c++98 -ferror-limit 150 -o - %s -Wuninitialized
+// RUN: %clang_cc1 -verify -fopenmp -std=c++11 -ferror-limit 150 -o - %s -Wuninitialized
 
-// RUN: %clang_cc1 -verify -fopenmp-simd -fopenmp-version=50 -ferror-limit 150 -o - %s -Wuninitialized
-// RUN: %clang_cc1 -verify -fopenmp-simd -fopenmp-version=50 -std=c++98 -ferror-limit 150 -o - %s -Wuninitialized
-// RUN: %clang_cc1 -verify -fopenmp-simd -fopenmp-version=50 -std=c++11 -ferror-limit 150 -o - %s -Wuninitialized
+// RUN: %clang_cc1 -verify -fopenmp-simd -ferror-limit 150 -o - %s -Wuninitialized
+// RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 -ferror-limit 150 -o - %s -Wuninitialized
+// RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 -ferror-limit 150 -o - %s -Wuninitialized
 
 extern int omp_default_mem_alloc;
 void xxx(int argc) {
@@ -78,14 +78,6 @@ class S5 {
 #pragma omp for reduction(+:a) // expected-error {{reduction variable must be shared}}
   for (int i = 0; i < 10; ++i)
     ::foo();
-#pragma omp parallel for reduction(inscan, +:a)
-  for (int i = 0; i < 10; ++i) {
-#pragma omp scan inclusive(a)
-  }
-#pragma omp parallel for reduction(inscan, +:a)
-  for (int i = 0; i < 10; ++i) {
-#pragma omp scan exclusive(a)
-  }
   }
 };
 class S6 { // expected-note 3 {{candidate function (the implicit copy assignment operator) not viable: no known conversion from 'int' to 'const S6' for 1st argument}}
@@ -341,21 +333,5 @@ int main(int argc, char **argv) {
   for (int i = 0; i < 10; ++i)
     m++;
 
-#pragma omp parallel for reduction(inscan, + : m) reduction(*: fl) reduction(default, &&: j) // expected-error 2 {{expected 'reduction' clause with the 'inscan' modifier}} expected-note 2 {{'reduction' clause with 'inscan' modifier is used here}}
-  for (int i = 0; i < 10; ++i) {
-#pragma omp scan exclusive(m)
-    m++;
-  }
-#pragma omp parallel for reduction(inscan, + : m, fl, j) // expected-error 2 {{the inscan reduction list item must appear as a list item in an 'inclusive' or 'exclusive' clause on an inner 'omp scan' directive}}
-  for (int i = 0; i < 10; ++i) {
-#pragma omp scan exclusive(m)
-    m++;
-  }
-#pragma omp parallel for reduction(inscan, + : m, fl, j) // expected-error 2 {{the inscan reduction list item must appear as a list item in an 'inclusive' or 'exclusive' clause on an inner 'omp scan' directive}}
-  for (int i = 0; i < 10; ++i) {
-#pragma omp scan inclusive(m)
-    m++;
-  }
-
   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}}
 }