maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[flang] Accept NULL(mold=x) as constant component value in constant structure constructor 

The predicate IsInitialDataTarget() was failing to return a correct true
result in the case of a reference to the intrinsic function NULL() with a
MOLD= argument.  Fix, and improve tests for "NULL()" elsewhere in semantics,
checking for an attribute set by intrinsics.cpp rather than the actual name.

Differential Revision: https://reviews.llvm.org/D119452
This commit is contained in:
Peter Klausler 2022-02-07 15:34:54 -08:00
parent 885140171a
commit 3632e9f852
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
flang/lib/Evaluate/check-expression.cpp
View File

@ -270,9 +270,6 @@ public:
return false;
}
bool operator()(const StructureConstructor &) const { return false; }
template <typename T> bool operator()(const FunctionRef<T> &) {
return false;
}
template <typename D, typename R, typename... O>
bool operator()(const Operation<D, R, O...> &) const {
return false;
@ -280,7 +277,11 @@ public:
template <typename T> bool operator()(const Parentheses<T> &x) const {
return (*this)(x.left());
}
template <typename T> bool operator()(const FunctionRef<T> &x) const {
bool operator()(const ProcedureRef &x) const {
if (const SpecificIntrinsic * intrinsic{x.proc().GetSpecificIntrinsic()}) {
return intrinsic->characteristics.value().attrs.test(
characteristics::Procedure::Attr::NullPointer);
}
return false;
}
bool operator()(const Relational<SomeType> &) const { return false; }
@ -557,7 +558,7 @@ public:
return std::nullopt;
}
template <typename T> Result operator()(const FunctionRef<T> &x) const {
Result operator()(const ProcedureRef &x) const {
if (const auto *symbol{x.proc().GetSymbol()}) {
const Symbol &ultimate{symbol->GetUltimate()};
if (!semantics::IsPureProcedure(ultimate)) {
@ -708,7 +709,7 @@ public:
Result operator()(const ComplexPart &) const { return false; }
Result operator()(const Substring &) const { return false; }
template <typename T> Result operator()(const FunctionRef<T> &x) const {
Result operator()(const ProcedureRef &x) const {
if (auto chars{
characteristics::Procedure::Characterize(x.proc(), context_)}) {
if (chars->functionResult) {

4
flang/lib/Semantics/expression.cpp
View File

@ -3108,7 +3108,9 @@ bool ExpressionAnalyzer::EnforceTypeConstraint(parser::CharBlock at,
MaybeExpr ExpressionAnalyzer::MakeFunctionRef(parser::CharBlock callSite,
ProcedureDesignator &&proc, ActualArguments &&arguments) {
if (const auto *intrinsic{std::get_if<SpecificIntrinsic>(&proc.u)}) {
if (intrinsic->name == "null" && arguments.empty()) {
if (intrinsic->characteristics.value().attrs.test(
characteristics::Procedure::Attr::NullPointer) &&
arguments.empty()) {
return Expr<SomeType>{NullPointer{}};
}
}