Searching for COMMON definition in top level modules

Author: eugeneepshteyn

flang/lib/Semantics/resolve-directives.cpp

@@ -1698,15 +1698,18 @@ Symbol *AccAttributeVisitor::ResolveAccCommonBlockName(
   if (!name) {
     return nullptr;
   }
+  // Check the local and surrounding scopes first
   if (auto *cb{GetProgramUnitOrBlockConstructContaining(GetContext().scope)
               .FindCommonBlock(name->source)}) {
     name->symbol = cb;
     return cb;
   }
-  if (auto *cb{GetContext().scope.FindSymbol(name->source)}) {
-    if (auto *sym{&cb->GetUltimate()}; sym && sym->has<CommonBlockDetails>()) {
-      name->symbol = sym;
-      return sym;
+  // Look for COMMON block in the modules
+  for (const Scope &childScope : context_.globalScope().children()) {
+    if (childScope.kind() == Scope::Kind::Module) {
+      auto *cb{childScope.FindCommonBlock(name->source)};
+      name->symbol = cb;
+      return cb;
     }
   }
   return nullptr;
@@ -1757,8 +1760,8 @@ void AccAttributeVisitor::ResolveAccObject(
               }
             } else {
               context_.Say(name.source,
-                  "COMMON block must be declared in the same scoping unit "
-                  "in which the OpenACC directive or clause appears"_err_en_US);
+                  "Could not find COMMON block '%s' used in OpenACC directive"_err_en_US,
+                  name.ToString());
             }
           },
       },