From ad014e3ce4e8ddf42259d0e3b2a50a152278b396 Mon Sep 17 00:00:00 2001
From: Eric Schweitz <eschweitz@nvidia.com>
Date: Tue, 9 Oct 2018 16:20:01 -0700
Subject: [PATCH] [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
---
 flang/lib/semantics/check-do-concurrent.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/flang/lib/semantics/check-do-concurrent.cc b/flang/lib/semantics/check-do-concurrent.cc
index 7fe2329..e6f6461 100644
--- 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;
   }
-- 
2.7.4