Skip to content

[flang] relax ASSOCIATED checks for assumed-ranks #94277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 4, 2024
Merged

[flang] relax ASSOCIATED checks for assumed-ranks #94277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions flang/lib/Evaluate/intrinsics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,9 @@ static const IntrinsicInterface genericIntrinsicFunction[]{
{"associated",
{{"pointer", AnyPointer, Rank::anyOrAssumedRank, Optionality::required,
common::Intent::In, {ArgFlag::canBeNull}},
{"target", Addressable, Rank::known, Optionality::optional,
common::Intent::In, {ArgFlag::canBeNull}}},
{"target", Addressable, Rank::anyOrAssumedRank,
Optionality::optional, common::Intent::In,
{ArgFlag::canBeNull}}},
DefaultLogical, Rank::elemental, IntrinsicClass::inquiryFunction},
{"atan", {{"x", SameFloating}}, SameFloating},
{"atan", {{"y", OperandReal}, {"x", OperandReal}}, OperandReal},
Expand Down
11 changes: 11 additions & 0 deletions flang/lib/Semantics/check-call.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,6 +1473,17 @@ static void CheckAssociated(evaluate::ActualArguments &arguments,
"POINTER= argument '%s' is an object pointer but the TARGET= argument '%s' is not a variable"_err_en_US,
pointerExpr->AsFortran(), targetExpr->AsFortran());
}
if (!IsAssumedRank(*pointerExpr)) {
if (IsAssumedRank(*targetExpr)) {
messages.Say(
"TARGET= argument '%s' may not be assumed-rank when POINTER= argument is not"_err_en_US,
pointerExpr->AsFortran());
} else if (pointerExpr->Rank() != targetExpr->Rank()) {
messages.Say(
"POINTER= argument and TARGET= argument have incompatible ranks %d and %d"_err_en_US,
pointerExpr->Rank(), targetExpr->Rank());
}
}
}
}
}
Expand Down
15 changes: 9 additions & 6 deletions flang/test/Semantics/associated.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,21 @@ subroutine test(assumedRank)
integer, pointer :: intPointerArr(:)
procedure(objPtrFunc), pointer :: objPtrFuncPointer

!ERROR: Assumed-rank array cannot be forwarded to 'target=' argument
lvar = associated(assumedRank, assumedRank)
lvar = associated(assumedRank, assumedRank) ! ok
!ERROR: TARGET= argument 'realscalarptr' may not be assumed-rank when POINTER= argument is not
lvar = associated(realScalarPtr, assumedRank)
!ERROR: TARGET= argument 'realvecptr' may not be assumed-rank when POINTER= argument is not
lvar = associated(realVecPtr, assumedRank)
lvar = associated(assumedRank, targetRealVar) ! ok
lvar = associated(assumedRank, targetRealMat) ! ok
lvar = associated(realScalarPtr, targetRealVar) ! ok
!ERROR: 'target=' argument has unacceptable rank 0
!ERROR: POINTER= argument and TARGET= argument have incompatible ranks 1 and 0
lvar = associated(realVecPtr, targetRealVar)
!ERROR: 'target=' argument has unacceptable rank 0
!ERROR: POINTER= argument and TARGET= argument have incompatible ranks 2 and 0
lvar = associated(realMatPtr, targetRealVar)
!ERROR: 'target=' argument has unacceptable rank 2
!ERROR: POINTER= argument and TARGET= argument have incompatible ranks 0 and 2
lvar = associated(realScalarPtr, targetRealMat)
!ERROR: 'target=' argument has unacceptable rank 2
!ERROR: POINTER= argument and TARGET= argument have incompatible ranks 1 and 2
lvar = associated(realVecPtr, targetRealMat)
lvar = associated(realMatPtr, targetRealMat) ! ok
!ERROR: missing mandatory 'pointer=' argument
Expand Down