Merge branch '3-acc-common' into 2-acc-common

Author: eugeneepshteyn

flang/include/flang/Semantics/scope.h

@@ -86,6 +86,13 @@ class Scope {
     CHECK(parent_ != this);
     return *parent_;
   }
+
+  mapType &commonBlocks() { return commonBlocks_; }
+  const mapType &commonBlocks() const { return commonBlocks_; }
+
+  mapType &commonBlockUses() { return commonBlockUses_; }
+  const mapType &commonBlockUses() const { return commonBlockUses_; }
+
   Kind kind() const { return kind_; }
   bool IsGlobal() const { return kind_ == Kind::Global; }
   bool IsIntrinsicModules() const { return kind_ == Kind::IntrinsicModules; }
@@ -186,11 +193,8 @@ class Scope {
   // Cray pointers are saved as map of pointee name -> pointer symbol
   const mapType &crayPointers() const { return crayPointers_; }
   void add_crayPointer(const SourceName &, Symbol &);
-  mapType &commonBlocks() { return commonBlocks_; }
-  const mapType &commonBlocks() const { return commonBlocks_; }
   Symbol &MakeCommonBlock(SourceName, SourceName location);
   bool AddCommonBlockUse(const SourceName &name, Symbol &cbSymbol);
-  mapType &commonBlockUses() { return commonBlockUses_; }
 
   // Find COMMON block that is declared in the current scope
   Symbol *FindCommonBlock(const SourceName &name) const {

flang/lib/Semantics/resolve-directives.cpp

@@ -1730,13 +1730,12 @@ void AccAttributeVisitor::Post(const parser::Name &name) {
 
 Symbol *AccAttributeVisitor::ResolveAccCommonBlockName(
     const parser::Name *name) {
-  if (!name) {
-    return nullptr;
-  }
-  if (auto *cb{
-          GetContext().scope.FindCommonBlockInVisibleScopes(name->source)}) {
-    name->symbol = cb;
-    return cb;
+  if (name) {
+    if (Symbol *cb{
+            GetContext().scope.FindCommonBlockInVisibleScopes(name->source)}) {
+      name->symbol = cb;
+      return cb;
+    }
   }
   return nullptr;
 }

flang/lib/Semantics/resolve-names.cpp

@@ -3633,9 +3633,9 @@ void ModuleVisitor::Post(const parser::UseStmt &x) {
     if (!currScope().FindCommonBlockInVisibleScopes(name)) {
       // Make a symbol, but don't add it to the Scope, since it needs to
       // be added to the USE-associated COMMON blocks
-      Symbol *localCB{&currScope().MakeSymbol(
+      Symbol &localCB{currScope().MakeSymbol(
           name, symbol->attrs(), UseDetails{name, symbol->GetUltimate()})};
-      currScope().AddCommonBlockUse(name, *localCB);
+      currScope().AddCommonBlockUse(name, localCB);
     }
   }
   // Go through the list of USE-associated COMMON block symbols in the module
@@ -3644,9 +3644,9 @@ void ModuleVisitor::Post(const parser::UseStmt &x) {
   for (const auto &[name, symbol] : useModuleScope_->commonBlockUses()) {
     // Make a symbol, but don't add it to the Scope, since it needs to
     // be added to the USE-associated COMMON blocks
-    Symbol *localCB{&currScope().MakeSymbol(
+    Symbol &localCB{currScope().MakeSymbol(
         name, symbol->attrs(), UseDetails{name, symbol->GetUltimate()})};
-    currScope().AddCommonBlockUse(name, *localCB);
+    currScope().AddCommonBlockUse(name, localCB);
   }
   useModuleScope_ = nullptr;
 }