Guard against null cb

eugeneepshteyn · eugeneepshteyn · commit f462bf5d170e · 2025-10-09T12:16:44.000-04:00
diff --git a/flang/lib/Semantics/resolve-directives.cpp b/flang/lib/Semantics/resolve-directives.cpp
@@ -1707,9 +1707,10 @@ Symbol *AccAttributeVisitor::ResolveAccCommonBlockName(
   // 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;
+      if (auto *cb{childScope.FindCommonBlock(name->source)}) {
+        name->symbol = cb;
+        return cb;
+      }
     }
   }
   return nullptr;

Original file line number	Diff line number	Diff line change
`@@ -1707,9 +1707,10 @@ Symbol *AccAttributeVisitor::ResolveAccCommonBlockName(`
`1707`	`1707`	`// Look for COMMON block in the modules`
`1708`	`1708`	`for (const Scope &childScope : context_.globalScope().children()) {`
`1709`	`1709`	`if (childScope.kind() == Scope::Kind::Module) {`
`1710`		`- auto *cb{childScope.FindCommonBlock(name->source)};`
`1711`		`- name->symbol = cb;`
`1712`		`- return cb;`
	`1710`	`+ if (auto *cb{childScope.FindCommonBlock(name->source)}) {`
	`1711`	`+ name->symbol = cb;`
	`1712`	`+ return cb;`
	`1713`	`+ }`
`1713`	`1714`	`}`
`1714`	`1715`	`}`
`1715`	`1716`	`return nullptr;`