[flang] Fix crash from PDT component init in module file
Semantics now needs to preserve the parse trees from module files,
in case they contain parameterized derived type definitions with
component initializers that may require re-analysis during PDT
instantiation. Save them in the SemanticsContext.
Differential Revision: https://reviews.llvm.org/D124467
diff --git a/flang/lib/Semantics/mod-file.cpp b/flang/lib/Semantics/mod-file.cpp
index 212e4c5..d7e6efcb3 100644
--- a/flang/lib/Semantics/mod-file.cpp
+++ b/flang/lib/Semantics/mod-file.cpp
@@ -970,13 +970,14 @@
}
llvm::raw_null_ostream NullStream;
parsing.Parse(NullStream);
- auto &parseTree{parsing.parseTree()};
+ std::optional<parser::Program> &parsedProgram{parsing.parseTree()};
if (!parsing.messages().empty() || !parsing.consumedWholeFile() ||
- !parseTree) {
+ !parsedProgram) {
Say(name, ancestorName, "Module file is corrupt: %s"_err_en_US,
sourceFile->path());
return nullptr;
}
+ parser::Program &parseTree{context_.SaveParseTree(std::move(*parsedProgram))};
Scope *parentScope; // the scope this module/submodule goes into
if (!isIntrinsic.has_value()) {
for (const auto &dir : context_.intrinsicModuleDirectories()) {
@@ -991,7 +992,7 @@
: context_.globalScope()};
if (!ancestor) {
parentScope = &topScope;
- } else if (std::optional<SourceName> parent{GetSubmoduleParent(*parseTree)}) {
+ } else if (std::optional<SourceName> parent{GetSubmoduleParent(parseTree)}) {
parentScope = Read(*parent, false /*not intrinsic*/, ancestor, silent);
} else {
parentScope = ancestor;
@@ -1002,7 +1003,7 @@
}
Symbol &modSymbol{*pair.first->second};
modSymbol.set(Symbol::Flag::ModFile);
- ResolveNames(context_, *parseTree, topScope);
+ ResolveNames(context_, parseTree, topScope);
CHECK(modSymbol.has<ModuleDetails>());
CHECK(modSymbol.test(Symbol::Flag::ModFile));
if (isIntrinsic.value_or(false)) {
