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

[flang] Handle optional TARGET associate in ASSOCIATED runtime 

The TARGET argument of ASSOCIATED may be dynamically optional, in which
case ASSOCIATED(POINTER, TARGET) is equal to ASSOCIATED(TARGET).

Make the runtime argument a pointer so that it can detect and handle
arguments that are dynamically optional.

Also fix the runtime to check if TARGET base address is not null and if
its element size is not null to match the requirement of ASSOCIATED
regarding TARGET:
- if TARGET is an object: true iff [..] TARGET is not a zerosized storage sequence
- if TARGET is a POINTER: true iff [..] POINTER and TARGET are associated

Not that ASSOCIATED will also returns false if TARGET is an unallocated allocatable.
This is not described in the standard, but is a unanimous behaviour of
existing compilers.

Differential Revision: https://reviews.llvm.org/D120835
This commit is contained in:
Jean Perier 2022-03-03 10:11:19 +01:00
parent 013160f6e2
commit 392cba8603
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flang/include/flang/Runtime/pointer.h
View File

@ -105,7 +105,7 @@ bool RTNAME(PointerIsAssociated)(const Descriptor &);
// True when the pointer is associated with a specific target.
bool RTNAME(PointerIsAssociatedWith)(
const Descriptor &, const Descriptor &target);
const Descriptor &, const Descriptor *target);
} // extern "C"
} // namespace Fortran::runtime

16
flang/runtime/pointer.cpp
View File

@ -147,16 +147,22 @@ bool RTNAME(PointerIsAssociated)(const Descriptor &pointer) {
}
bool RTNAME(PointerIsAssociatedWith)(
const Descriptor &pointer, const Descriptor &target) {
const Descriptor &pointer, const Descriptor *target) {
if (!target) {
return pointer.raw().base_addr != nullptr;
}
if (!target->raw().base_addr || target->ElementBytes() == 0) {
return false;
}
int rank{pointer.rank()};
if (pointer.raw().base_addr != target.raw().base_addr ||
pointer.ElementBytes() != target.ElementBytes() ||
rank != target.rank()) {
if (pointer.raw().base_addr != target->raw().base_addr ||
pointer.ElementBytes() != target->ElementBytes() ||
rank != target->rank()) {
return false;
}
for (int j{0}; j < rank; ++j) {
const Dimension &pDim{pointer.GetDimension(j)};
const Dimension &tDim{target.GetDimension(j)};
const Dimension &tDim{target->GetDimension(j)};
if (pDim.Extent() != tDim.Extent() ||
pDim.ByteStride() != tDim.ByteStride()) {
return false;