[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

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

[clementval]

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

41

I'll update that.

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

 // defined in module/__fortran_type_info.f90, packaging these descriptions
 // as static initializers for compiler-created objects.
 
 #ifndef FORTRAN_SEMANTICS_RUNTIME_TYPE_INFO_H_
 #define FORTRAN_SEMANTICS_RUNTIME_TYPE_INFO_H_
 
 #include <set>
 #include <string>
+#include <vector>
 
 namespace llvm {
 class raw_ostream;
 }
 
 namespace Fortran::semantics {
 class Scope;
 class SemanticsContext;
 class Symbol;
 
 struct RuntimeDerivedTypeTables {
   Scope *schemata{nullptr};
   std::set<std::string> names;
 };
 
 RuntimeDerivedTypeTables BuildRuntimeDerivedTypeTables(SemanticsContext &);
 
 /// Name of the builtin module that defines builtin derived types meant
 /// to describe other derived types at runtime in flang descriptor.
 constexpr char typeInfoBuiltinModule[]{"__fortran_type_info"};
 
+std::vector<const Symbol *> CollectBindings(const Scope &dtScope);
+
 } // namespace Fortran::semantics
 #endif // FORTRAN_SEMANTICS_RUNTIME_TYPE_INFO_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 *> 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);
     }
RuntimeDerivedTypeTables BuildRuntimeDerivedTypeTables(
   RuntimeDerivedTypeTables result;
   result.schemata = context.GetBuiltinModule(typeInfoBuiltinModule);
   if (result.schemata) {
     RuntimeTableBuilder builder{context, result};
     builder.DescribeTypes(context.globalScope(), false);
   }
   return result;
 }
+
 } // namespace Fortran::semantics