[flang] Tweak API per review

Original-commit: flang-compiler/f18@c0ab787cd1eb82a13fca9a473973b25e737da77a
Reviewed-on: https://github.com/flang-compiler/f18/pull/311

diff --git a/flang/lib/semantics/tools.cc b/flang/lib/semantics/tools.cc
index 9418c21..4f3334a 100644 (file)
--- a/flang/lib/semantics/tools.cc
+++ b/flang/lib/semantics/tools.cc
@@ -87,22 +87,25 @@ bool IsUseAssociated(const Symbol &symbol, const Scope &scope) {
       owner != FindProgramUnitContaining(scope);
 }
 
-bool IsAncestor(const Scope *maybeAncestor, const Scope &maybeDescendent) {
-  if (maybeAncestor == nullptr) {
-    return false;
-  }
-  const Scope *scope{&maybeDescendent};
-  while (scope->kind() != Scope::Kind::Global) {
-    scope = &scope->parent();
-    if (scope == maybeAncestor) {
-      return true;
+bool DoesScopeContain(const Scope *maybeAncestor, const Scope &maybeDescendent) {
+  if (maybeAncestor != nullptr) {
+    const Scope *scope{&maybeDescendent};
+    while (scope->kind() != Scope::Kind::Global) {
+      scope = &scope->parent();
+      if (scope == maybeAncestor) {
+        return true;
+      }
     }
   }
   return false;
 }
 
+bool DoesScopeContain(const Scope *maybeAncestor, const Symbol &symbol) {
+  return DoesScopeContain(maybeAncestor, symbol.owner());
+}
+
 bool IsHostAssociated(const Symbol &symbol, const Scope &scope) {
-  return IsAncestor(FindProgramUnitContaining(symbol), scope);
+  return DoesScopeContain(FindProgramUnitContaining(symbol), scope);
 }
 
 bool IsDummy(const Symbol &symbol) {

diff --git a/flang/lib/semantics/tools.h b/flang/lib/semantics/tools.h
index 49638bd..d83fe50 100644 (file)
--- a/flang/lib/semantics/tools.h
+++ b/flang/lib/semantics/tools.h
@@ -35,7 +35,8 @@ const Symbol *FindPointerComponent(const DeclTypeSpec &);
 const Symbol *FindPointerComponent(const Symbol &);
 
 bool IsCommonBlockContaining(const Symbol &block, const Symbol &object);
-bool IsAncestor(const Scope *maybeAncestor, const Scope &maybeDescendent);
+bool DoesScopeContain(const Scope *maybeAncestor, const Scope &maybeDescendent);
+bool DoesScopeContain(const Scope *, const Symbol &);
 bool IsUseAssociated(const Symbol *, const Scope &);
 bool IsHostAssociated(const Symbol &, const Scope &);
 bool IsDummy(const Symbol &);