[flang] Address TODO from previous changes to IsSaved()
An earlier fix to evaluate::IsSaved() needed to preserve its
treatment of named constants in modules and main programs -- i.e.
they would appear to be saved -- until a correction was added
to the lowering code. This TODO can now be resolved.
Differential Revision: https://reviews.llvm.org/D114756
diff --git a/flang/lib/Evaluate/tools.cpp b/flang/lib/Evaluate/tools.cpp
index bbfb46e..4e8054f 100644
--- a/flang/lib/Evaluate/tools.cpp
+++ b/flang/lib/Evaluate/tools.cpp
@@ -1207,10 +1207,8 @@
return false; // this is a component
} else if (symbol.attrs().test(Attr::SAVE)) {
return true; // explicit SAVE attribute
- } else if (symbol.test(Symbol::Flag::InDataStmt)) {
- return true;
} else if (IsDummy(symbol) || IsFunctionResult(symbol) ||
- IsAutomatic(symbol)) {
+ IsAutomatic(symbol) || IsNamedConstant(symbol)) {
return false;
} else if (scopeKind == Scope::Kind::Module ||
(scopeKind == Scope::Kind::MainProgram &&
@@ -1228,13 +1226,8 @@
// -fno-automatic/-save/-Msave option applies to objects in
// executable subprograms unless they are explicitly RECURSIVE.
return true;
- } else if (IsNamedConstant(symbol)) {
- // TODO: lowering needs named constants in modules to be static,
- // so this test for a named constant has lower precedence for the
- // time being; when lowering is corrected, this case should be
- // moved up above module logic, since named constants don't really
- // have implied SAVE attributes.
- return false;
+ } else if (symbol.test(Symbol::Flag::InDataStmt)) {
+ return true;
} else if (const auto *object{symbol.detailsIf<ObjectEntityDetails>()};
object && object->init()) {
return true;
