diff options
| -rw-r--r-- | flang/lib/Semantics/mod-file.cpp | 19 | ||||
| -rw-r--r-- | flang/test/Semantics/modfile74.f90 | 19 |
2 files changed, 33 insertions, 5 deletions
diff --git a/flang/lib/Semantics/mod-file.cpp b/flang/lib/Semantics/mod-file.cpp index ac17697..c3b4626 100644 --- a/flang/lib/Semantics/mod-file.cpp +++ b/flang/lib/Semantics/mod-file.cpp @@ -978,11 +978,9 @@ void ModFileWriter::PutObjectEntity( << ") " << symbol.name() << '\n'; } if (symbol.test(Fortran::semantics::Symbol::Flag::CrayPointer)) { - if (!symbol.owner().crayPointers().empty()) { - for (const auto &[pointee, pointer] : symbol.owner().crayPointers()) { - if (pointer == symbol) { - os << "pointer(" << symbol.name() << "," << pointee << ")\n"; - } + for (const auto &[pointee, pointer] : symbol.owner().crayPointers()) { + if (pointer == symbol) { + os << "pointer(" << symbol.name() << "," << pointee << ")\n"; } } } @@ -1725,6 +1723,17 @@ void SubprogramSymbolCollector::DoSymbol( if (!scope.IsDerivedType()) { need_.push_back(symbol); } + if (symbol.test(Fortran::semantics::Symbol::Flag::CrayPointer)) { + for (const auto &[pointee, pointer] : symbol.owner().crayPointers()) { + if (&*pointer == &symbol) { + auto iter{symbol.owner().find(pointee)}; + CHECK(iter != symbol.owner().end()); + DoSymbol(*iter->second); + } + } + } else if (symbol.test(Fortran::semantics::Symbol::Flag::CrayPointee)) { + DoSymbol(GetCrayPointer(symbol)); + } } void SubprogramSymbolCollector::DoType(const DeclTypeSpec *type) { diff --git a/flang/test/Semantics/modfile74.f90 b/flang/test/Semantics/modfile74.f90 new file mode 100644 index 0000000..f24ce80 --- /dev/null +++ b/flang/test/Semantics/modfile74.f90 @@ -0,0 +1,19 @@ +! RUN: %python %S/test_modfile.py %s %flang_fc1 +module m + contains + function f() result(ptr) + character :: str + pointer(ptr, str) + ptr = 0 + end +end + +!Expect: m.mod +!module m +!contains +!function f() result(ptr) +!integer(8)::ptr +!pointer(ptr,str) +!character(1_8,1)::str +!end +!end |