[flang] Allow reference to earlier generic in later interface
Name resolutions defers all resolution and checking of specific procedures
in non-type-bound generic interfaces to the end of the specification part.
This prevents expression analysis of references to generic functions in
specification expressions in interfaces from resolving.
Example (now a new test case in modfile07.f90):
```
module m12
interface generic
module procedure specific
end interface
interface
module subroutine s(a1,a2)
character(*) a1
character(generic(a1)) a2 ! <--
end
end interface
contains
pure integer function specific(x)
character(*), intent(in) :: x
specific = len(x)
end
end
```
The solution is to partially resolve specific procedures as they are
defined for each generic, when they can be resolved, with the final
pass at the end of the specification part to finish up any forward
references and emit the necessary error messages.
Making this fix caused some issues in module file output, which have
all been resolved by making this simplifying change: generics are
now all emitted to module file specification parts as their own
group of declarations at the end of the specification part,
followed only by namelists and COMMON blocks.
Differential Revision: https://reviews.llvm.org/D157346
diff --git a/flang/lib/Semantics/mod-file.cpp b/flang/lib/Semantics/mod-file.cpp
index c88e209..6671151 100644
--- a/flang/lib/Semantics/mod-file.cpp
+++ b/flang/lib/Semantics/mod-file.cpp
@@ -271,13 +271,6 @@
}
} else {
PutGeneric(symbol);
- if (x.specific() && &x.specific()->owner() == &symbol.owner()) {
- PutSymbol(typeBindings, *x.specific());
- }
- if (x.derivedType() &&
- &x.derivedType()->owner() == &symbol.owner()) {
- PutSymbol(typeBindings, *x.derivedType());
- }
}
},
[&](const UseDetails &) { PutUse(symbol); },
@@ -583,21 +576,8 @@
}
}
-// When a generic interface has the same name as a derived type
-// in the same scope, the generic shadows the derived type.
-// If the derived type were declared first, emit the generic
-// interface at the position of derived type's declaration.
-// (ReplaceName() is not used for this purpose because doing so
-// would confusingly position error messages pertaining to the generic
-// interface upon the derived type's declaration.)
static inline SourceName NameInModuleFile(const Symbol &symbol) {
- if (const auto *generic{symbol.detailsIf<GenericDetails>()}) {
- if (const auto *derivedTypeOverload{generic->derivedType()}) {
- if (derivedTypeOverload->name().begin() < symbol.name().begin()) {
- return derivedTypeOverload->name();
- }
- }
- } else if (const auto *use{symbol.detailsIf<UseDetails>()}) {
+ if (const auto *use{symbol.detailsIf<UseDetails>()}) {
if (use->symbol().attrs().test(Attr::PRIVATE)) {
// Avoid the use in sorting of names created to access private
// specific procedures as a result of generic resolution;
@@ -609,10 +589,10 @@
}
// Collect the symbols of this scope sorted by their original order, not name.
-// Namelists are an exception: they are sorted after other symbols.
+// Generics and namelists are exceptions: they are sorted after other symbols.
void CollectSymbols(
const Scope &scope, SymbolVector &sorted, SymbolVector &uses) {
- SymbolVector namelist;
+ SymbolVector namelist, generics;
std::size_t commonSize{scope.commonBlocks().size()};
auto symbols{scope.GetSymbols()};
sorted.reserve(symbols.size() + commonSize);
@@ -620,6 +600,15 @@
if (!symbol->test(Symbol::Flag::ParentComp)) {
if (symbol->has<NamelistDetails>()) {
namelist.push_back(symbol);
+ } else if (const auto *generic{symbol->detailsIf<GenericDetails>()}) {
+ if (generic->specific() &&
+ &generic->specific()->owner() == &symbol->owner()) {
+ sorted.push_back(*generic->specific());
+ } else if (generic->derivedType() &&
+ &generic->derivedType()->owner() == &symbol->owner()) {
+ sorted.push_back(*generic->derivedType());
+ }
+ generics.push_back(symbol);
} else {
sorted.push_back(symbol);
}
@@ -630,9 +619,12 @@
}
// Sort most symbols by name: use of Symbol::ReplaceName ensures the source
// location of a symbol's name is the first "real" use.
- std::sort(sorted.begin(), sorted.end(), [](SymbolRef x, SymbolRef y) {
- return NameInModuleFile(x).begin() < NameInModuleFile(y).begin();
- });
+ auto sorter{[](SymbolRef x, SymbolRef y) {
+ return NameInModuleFile(*x).begin() < NameInModuleFile(*y).begin();
+ }};
+ std::sort(sorted.begin(), sorted.end(), sorter);
+ std::sort(generics.begin(), generics.end(), sorter);
+ sorted.insert(sorted.end(), generics.begin(), generics.end());
sorted.insert(sorted.end(), namelist.begin(), namelist.end());
for (const auto &pair : scope.commonBlocks()) {
sorted.push_back(*pair.second);
