Merge branch 'users/kparzysz/spr/d01-flang-depend-update' into users/kparzysz/spr/d02-flang-omp-hint

Author: kparzysz

flang/examples/FeatureList/FeatureList.cpp

@@ -473,8 +473,8 @@ struct NodeVisitor {
   READ_FEATURE(OmpDependClause::InOut)
   READ_FEATURE(OmpDependClause::Sink)
   READ_FEATURE(OmpDependClause::Source)
-  READ_FEATURE(OmpDependenceType)
-  READ_FEATURE(OmpDependenceType::Type)
+  READ_FEATURE(OmpTaskDependenceType)
+  READ_FEATURE(OmpTaskDependenceType::Type)
   READ_FEATURE(OmpDependSinkVec)
   READ_FEATURE(OmpDependSinkVecLength)
   READ_FEATURE(OmpEndAllocators)

flang/include/flang/Semantics/symbol.h

@@ -24,8 +24,6 @@
 #include <set>
 #include <vector>
 
-#include "llvm/Support/Signals.h"
-
 namespace llvm {
 class raw_ostream;
 }
@@ -755,9 +753,9 @@ class Symbol {
       // OpenMP miscellaneous flags
       OmpCommonBlock, OmpReduction, OmpAligned, OmpNontemporal, OmpAllocate,
       OmpDeclarativeAllocateDirective, OmpExecutableAllocateDirective,
-      OmpDependClause, OmpDeclareSimd, OmpDeclareTarget, OmpThreadprivate,
-      OmpDeclareReduction, OmpFlushed, OmpCriticalLock, OmpIfSpecified, OmpNone,
-      OmpPreDetermined, OmpImplicit);
+      OmpDeclareSimd, OmpDeclareTarget, OmpThreadprivate, OmpDeclareReduction,
+      OmpFlushed, OmpCriticalLock, OmpIfSpecified, OmpNone, OmpPreDetermined,
+      OmpImplicit);
   using Flags = common::EnumSet<Flag, Flag_enumSize>;
 
   const Scope &owner() const { return *owner_; }
@@ -978,7 +976,6 @@ template <std::size_t BLOCK_SIZE> class Symbols {
   }
 
 private:
-  static int counter;
   using blockType = std::array<Symbol, BLOCK_SIZE>;
   std::list<blockType *> blocks_;
   std::size_t nextIndex_{0};
@@ -997,8 +994,6 @@ template <std::size_t BLOCK_SIZE> class Symbols {
   }
 };
 
-template <std::size_t BLOCK_SIZE> int Symbols<BLOCK_SIZE>::counter;
-
 // Define a few member functions here in the header so that they
 // can be used by lib/Evaluate without inducing a dependence cycle
 // between the two shared libraries.

flang/lib/Lower/OpenMP/Clauses.cpp

@@ -597,10 +597,9 @@ Depend make(const parser::OmpClause::Depend &inp,
           [&](const wrapped::InOut &s) -> Variant {
             auto &t0 = std::get<parser::OmpTaskDependenceType>(s.t);
             auto &t1 = std::get<parser::OmpObjectList>(s.t);
-            return Depend::DepType{
-                {/*TaskDependenceType=*/convert1(t0.v),
-                 /*Iterator=*/std::nullopt,
-                 /*LocatorList=*/makeObjects(t1, semaCtx)}};
+            return Depend::DepType{{/*TaskDependenceType=*/convert1(t0.v),
+                                    /*Iterator=*/std::nullopt,
+                                    /*LocatorList=*/makeObjects(t1, semaCtx)}};
           },
       },
       inp.v.u)};

flang/lib/Semantics/resolve-directives.cpp

@@ -25,7 +25,6 @@
 #include <map>
 #include <sstream>
 
-#include "llvm/Support/Signals.h"
 template <typename T>
 static Fortran::semantics::Scope *GetScope(
     Fortran::semantics::SemanticsContext &context, const T &x) {
@@ -443,7 +442,8 @@ class OmpAttributeVisitor : DirectiveAttributeVisitor<llvm::omp::Directive> {
     // Iterate over elements of x, and resolve any common blocks that
     // are still unresolved.
     for (const parser::OmpObject &obj : x.v) {
-      if (auto *name{std::get_if<parser::Name>(&obj.u)}) {
+      auto *name{std::get_if<parser::Name>(&obj.u)};
+      if (name && !name->symbol) {
         Resolve(*name, currScope().MakeCommonBlock(name->source));
       }
     }

llvm/include/llvm/Frontend/OpenMP/ClauseT.h

@@ -503,7 +503,7 @@ struct DependT {
   using LocatorList = ObjectListT<I, E>;
   using TaskDependenceType = tomp::type::TaskDependenceType;
 
-  struct DepType {  // The form with task dependence type.
+  struct DepType { // The form with task dependence type.
     using TupleTrait = std::true_type;
     // Empty LocatorList means "omp_all_memory".
     std::tuple<TaskDependenceType, OPT(Iterator), LocatorList> t;