Skip to content

Commit

Permalink
[flang] prevent rewrite of CMPLX with dynamically optional Y argument
Browse files Browse the repository at this point in the history
CMPLX was always rewritten as a complex constructor, but the second operand
of a complex constructor cannot be dynamically absent (i.e., a
disassociated pointer, an unallocated allocatable or an absent OPTIONAL
dummy argument), while the second argument of CMPLX can be dynamically
absent.

To avoid having to generate branches in complex constructor lowering
when Y is a pointer, keep the distinction between CMPLX and a complex
constructor when Y is a pointer, an allocatable, or an OPTIONAL entity.

Differential Revision: https://reviews.llvm.org/D118784
  • Loading branch information
jeanPerier committed Feb 2, 2022
1 parent 73f21db commit bc699ed
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 0 deletions.
8 changes: 8 additions & 0 deletions flang/include/flang/Evaluate/tools.h
Expand Up @@ -889,6 +889,10 @@ template <typename A> bool IsAllocatableOrPointer(const A &x) {
semantics::Attrs{semantics::Attr::POINTER, semantics::Attr::ALLOCATABLE});
}

// Like IsAllocatableOrPointer, but accepts pointer function results as being
// pointers.
bool IsAllocatableOrPointerObject(const Expr<SomeType> &, FoldingContext &);

// Procedure and pointer detection predicates
bool IsProcedure(const Expr<SomeType> &);
bool IsFunction(const Expr<SomeType> &);
Expand All @@ -897,6 +901,10 @@ bool IsBareNullPointer(const Expr<SomeType> *); // NULL() w/o MOLD=
bool IsNullPointer(const Expr<SomeType> &);
bool IsObjectPointer(const Expr<SomeType> &, FoldingContext &);

// Can Expr be passed as absent to an optional dummy argument.
// See 15.5.2.12 point 1 for more details.
bool MayBePassedAsAbsentOptional(const Expr<SomeType> &, FoldingContext &);

// Extracts the chain of symbols from a designator, which has perhaps been
// wrapped in an Expr<>, removing all of the (co)subscripts. The
// base object will be the first symbol in the result vector.
Expand Down
9 changes: 9 additions & 0 deletions flang/lib/Evaluate/fold-complex.cpp
Expand Up @@ -41,6 +41,15 @@ Expr<Type<TypeCategory::Complex, KIND>> FoldIntrinsicFunction(
// CMPLX(X [, KIND]) with complex X
return Fold(context, ConvertToType<T>(std::move(*x)));
} else {
if (args.size() >= 2 && args[1].has_value()) {
// Do not fold CMPLX with an Y argument that may be absent at runtime
// into a complex constructor so that lowering can deal with the
// optional aspect (there is no optional aspect with the complex
// constructor).
if (MayBePassedAsAbsentOptional(*args[1]->UnwrapExpr(), context)) {
return Expr<T>{std::move(funcRef)};
}
}
// CMPLX(X [, Y [, KIND]]) with non-complex X
Expr<SomeType> re{std::move(*args[0].value().UnwrapExpr())};
Expr<SomeType> im{args.size() >= 2 && args[1].has_value()
Expand Down
18 changes: 18 additions & 0 deletions flang/lib/Evaluate/tools.cpp
Expand Up @@ -1078,6 +1078,24 @@ std::optional<Expr<SomeType>> DataConstantConversionExtension(
return std::nullopt;
}

bool IsAllocatableOrPointerObject(
const Expr<SomeType> &expr, FoldingContext &context) {
const semantics::Symbol *sym{UnwrapWholeSymbolOrComponentDataRef(expr)};
return (sym && semantics::IsAllocatableOrPointer(*sym)) ||
evaluate::IsObjectPointer(expr, context);
}

bool MayBePassedAsAbsentOptional(
const Expr<SomeType> &expr, FoldingContext &context) {
const semantics::Symbol *sym{UnwrapWholeSymbolOrComponentDataRef(expr)};
// 15.5.2.12 1. is pretty clear that an unallocated allocatable/pointer actual
// may be passed to a non-allocatable/non-pointer optional dummy. Note that
// other compilers (like nag, nvfortran, ifort, gfortran and xlf) seems to
// ignore this point in intrinsic contexts (e.g CMPLX argument).
return (sym && semantics::IsOptional(*sym)) ||
IsAllocatableOrPointerObject(expr, context);
}

} // namespace Fortran::evaluate

namespace Fortran::semantics {
Expand Down

0 comments on commit bc699ed

Please sign in to comment.