[flang] Make CollectBindings available to lowering

[jeanPerier]

LGTM

[PeteSteinfeld]

All builds and tests correctly and looks good.

[klausler]

It's not a generally useful utility, so it probably doesn't belong in tools.{h,cpp}. Can you leave it where it is and just decouple it from it current class?

[clementval]

In D138129#3931087, @klausler wrote:

It's not a generally useful utility, so it probably doesn't belong in tools.{h,cpp}. Can you leave it where it is and just decouple it from it current class?

Sure. I’ll update the patch.

[clementval]

Keep function in the same file

[klausler]

flang/include/flang/Semantics/runtime-type-info.h

41 ↗

(On Diff #476056)

SymbolVector might be better here -- it's a vector of SymbolRef.

[clementval]

flang/include/flang/Semantics/runtime-type-info.h

41 ↗

(On Diff #476056)

I'll update that.

flang/include/flang/Semantics/tools.h

 const Symbol *FindUnsafeIoDirectComponent(
     GenericKind::DefinedIo, const DerivedTypeSpec &, const Scope * = nullptr);
 
 // Some intrinsic operators have more than one name (e.g. `operator(.eq.)` and
 // `operator(==)`). GetAllNames() returns them all, including symbolName.
 std::forward_list<std::string> GetAllNames(
     const SemanticsContext &, const SourceName &);
 
+std::vector<const Symbol *> CollectBindings(const Scope &dtScope);
+
 } // namespace Fortran::semantics
 #endif // FORTRAN_SEMANTICS_TOOLS_H_

flang/lib/Semantics/runtime-type-info.cpp

private:
   evaluate::StructureConstructor DescribeComponent(
       const Symbol &, const ProcEntityDetails &, Scope &);
   bool InitializeDataPointer(evaluate::StructureConstructorValues &,
       const Symbol &symbol, const ObjectEntityDetails &object, Scope &scope,
       Scope &dtScope, const std::string &distinctName);
   evaluate::StructureConstructor PackageIntValue(
       const SomeExpr &genre, std::int64_t = 0) const;
   SomeExpr PackageIntValueExpr(const SomeExpr &genre, std::int64_t = 0) const;
-  std::vector<const Symbol *> CollectBindings(const Scope &dtScope) const;
   std::vector<evaluate::StructureConstructor> DescribeBindings(
       const Scope &dtScope, Scope &);
   void DescribeGeneric(
       const GenericDetails &, std::map<int, evaluate::StructureConstructor> &);
   void DescribeSpecialProc(std::map<int, evaluate::StructureConstructor> &,
       const Symbol &specificOrBinding, bool isAssignment, bool isFinal,
       std::optional<GenericKind::DefinedIo>);
   void IncorporateDefinedIoGenericInterfaces(
evaluate::StructureConstructor RuntimeTableBuilder::PackageIntValue(
   return Structure(valueSchema_, std::move(xs));
 }
 
 SomeExpr RuntimeTableBuilder::PackageIntValueExpr(
     const SomeExpr &genre, std::int64_t n) const {
   return StructureExpr(PackageIntValue(genre, n));
 }
 
-std::vector<const Symbol *> RuntimeTableBuilder::CollectBindings(
-    const Scope &dtScope) const {
-  std::vector<const Symbol *> result;
-  std::map<SourceName, const Symbol *> localBindings;
-  // Collect local bindings
-  for (auto pair : dtScope) {
-    const Symbol &symbol{*pair.second};
-    if (symbol.has<ProcBindingDetails>()) {
-      localBindings.emplace(symbol.name(), &symbol);
-    }
-  }
-  if (const Scope * parentScope{dtScope.GetDerivedTypeParent()}) {
-    result = CollectBindings(*parentScope);
-    // Apply overrides from the local bindings of the extended type
-    for (auto iter{result.begin()}; iter != result.end(); ++iter) {
-      const Symbol &symbol{**iter};
-      auto overridden{localBindings.find(symbol.name())};
-      if (overridden != localBindings.end()) {
-        *iter = overridden->second;
-        localBindings.erase(overridden);
-      }
-    }
-  }
-  // Add remaining (non-overriding) local bindings in name order to the result
-  for (auto pair : localBindings) {
-    result.push_back(pair.second);
-  }
-  return result;
-}
-
 std::vector<evaluate::StructureConstructor>
 RuntimeTableBuilder::DescribeBindings(const Scope &dtScope, Scope &scope) {
   std::vector<evaluate::StructureConstructor> result;
   for (const Symbol *symbol : CollectBindings(dtScope)) {
     evaluate::StructureConstructorValues values;
     AddValue(values, bindingSchema_, "proc"s,
         SomeExpr{evaluate::ProcedureDesignator{
             symbol->get<ProcBindingDetails>().symbol()}});

flang/lib/Semantics/tools.cpp

for (const auto &pair : *dtScope) {
           }
         }
       }
     }
   }
   return nullptr;
 }
 
+std::vector<const Symbol *> CollectBindings(const Scope &dtScope) {
+  std::vector<const Symbol *> result;
+  std::map<SourceName, const Symbol *> localBindings;
+  // Collect local bindings
+  for (auto pair : dtScope) {
+    const Symbol &symbol{*pair.second};
+    if (symbol.has<ProcBindingDetails>()) {
+      localBindings.emplace(symbol.name(), &symbol);
+    }
+  }
+  if (const Scope * parentScope{dtScope.GetDerivedTypeParent()}) {
+    result = CollectBindings(*parentScope);
+    // Apply overrides from the local bindings of the extended type
+    for (auto iter{result.begin()}; iter != result.end(); ++iter) {
+      const Symbol &symbol{**iter};
+      auto overridden{localBindings.find(symbol.name())};
+      if (overridden != localBindings.end()) {
+        *iter = overridden->second;
+        localBindings.erase(overridden);
+      }
+    }
+  }
+  // Add remaining (non-overriding) local bindings in name order to the result
+  for (auto pair : localBindings) {
+    result.push_back(pair.second);
+  }
+  return result;
+}
+
 } // namespace Fortran::semantics