[flang] More review changes

Original-commit: flang-compiler/f18@48f34e66c8e3d47eec59bc677bc4885d19599dcf
Reviewed-on: https://github.com/flang-compiler/f18/pull/196
Tree-same-pre-rewrite: false

diff --git a/flang/lib/semantics/check-do-concurrent.cc b/flang/lib/semantics/check-do-concurrent.cc
index 7fe2329..e6f6461 100644 (file)
--- a/flang/lib/semantics/check-do-concurrent.cc
+++ b/flang/lib/semantics/check-do-concurrent.cc
@@ -146,10 +146,9 @@ private:
         (attrs.test(Attr::ELEMENTAL) && !attrs.test(Attr::IMPURE));
   }
   bool fromScope(const Symbol &symbol, const std::string &moduleName) {
-    if (symbol.scope() && symbol.scope()->IsModule()) {
-      if (symbol.scope()->symbol()->name().ToString() == moduleName) {
-        return true;
-      }
+    if (symbol.GetUltimate().owner().IsModule() &&
+        symbol.GetUltimate().owner().name().ToString() == moduleName) {
+      return true;
     }
     return false;
   }