[flang] Stricter checking of v_list DIO arguments #139329
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Catch assumed-rank arguments to defined I/O subroutines, and ensure that v_list dummy arguments are vectors. Fixes llvm#138933.
llvmbot
added
flang
Member
|
@llvm/pr-subscribers-flang-semantics Author: Peter Klausler (klausler) ChangesCatch assumed-rank arguments to defined I/O subroutines, and ensure that v_list dummy arguments are vectors. Fixes #138933. Full diff: https://github.com/llvm/llvm-project/pull/139329.diff 2 Files Affected:
diff --git a/flang/lib/Semantics/check-declarations.cpp b/flang/lib/Semantics/check-declarations.cpp
index 318085518cc57..25117964e078f 100644
--- a/flang/lib/Semantics/check-declarations.cpp
+++ b/flang/lib/Semantics/check-declarations.cpp
@@ -1192,7 +1192,7 @@ void CheckHelper::CheckObjectEntity(
typeName);
} else if (evaluate::IsAssumedRank(symbol)) {
SayWithDeclaration(symbol,
- "Assumed Rank entity of %s type is not supported"_err_en_US,
+ "Assumed rank entity of %s type is not supported"_err_en_US,
typeName);
}
}
@@ -3414,7 +3414,13 @@ void CheckHelper::CheckBindC(const Symbol &symbol) {
bool CheckHelper::CheckDioDummyIsData(
const Symbol &subp, const Symbol *arg, std::size_t position) {
if (arg && arg->detailsIf<ObjectEntityDetails>()) {
- return true;
+ if (evaluate::IsAssumedRank(*arg)) {
+ messages_.Say(arg->name(),
+ "Dummy argument '%s' may not be assumed-rank"_err_en_US, arg->name());
+ return false;
+ } else {
+ return true;
+ }
} else {
if (arg) {
messages_.Say(arg->name(),
@@ -3592,9 +3598,10 @@ void CheckHelper::CheckDioVlistArg(
CheckDioDummyIsDefaultInteger(subp, *arg);
CheckDioDummyAttrs(subp, *arg, Attr::INTENT_IN);
const auto *objectDetails{arg->detailsIf<ObjectEntityDetails>()};
- if (!objectDetails || !objectDetails->shape().CanBeAssumedShape()) {
+ if (!objectDetails || !objectDetails->shape().CanBeAssumedShape() ||
+ objectDetails->shape().Rank() != 1) {
messages_.Say(arg->name(),
- "Dummy argument '%s' of a defined input/output procedure must be assumed shape"_err_en_US,
+ "Dummy argument '%s' of a defined input/output procedure must be assumed shape vector"_err_en_US,
arg->name());
}
}
diff --git a/flang/test/Semantics/io11.f90 b/flang/test/Semantics/io11.f90
index 3529929003b01..c00deede6b516 100644
--- a/flang/test/Semantics/io11.f90
+++ b/flang/test/Semantics/io11.f90
@@ -342,7 +342,7 @@ subroutine formattedReadProc(dtv, unit, iotype, vlist, iostat, iomsg)
end subroutine
end module m15
-module m16
+module m16a
type,public :: t
integer c
contains
@@ -355,15 +355,58 @@ subroutine formattedReadProc(dtv, unit, iotype, vlist, iostat, iomsg)
class(t), intent(inout) :: dtv
integer, intent(in) :: unit
character(len=*), intent(in) :: iotype
- !ERROR: Dummy argument 'vlist' of a defined input/output procedure must be assumed shape
+ !ERROR: Dummy argument 'vlist' of a defined input/output procedure must be assumed shape vector
integer, intent(in) :: vlist(5)
integer, intent(out) :: iostat
character(len=*), intent(inout) :: iomsg
+ iostat = 343
+ stop 'fail'
+ end subroutine
+end module m16a
+module m16b
+ type,public :: t
+ integer c
+ contains
+ procedure, pass :: tbp=>formattedReadProc
+ generic :: read(formatted) => tbp
+ end type
+ private
+contains
+ subroutine formattedReadProc(dtv, unit, iotype, vlist, iostat, iomsg)
+ class(t), intent(inout) :: dtv
+ integer, intent(in) :: unit
+ character(len=*), intent(in) :: iotype
+ !ERROR: Dummy argument 'vlist' of a defined input/output procedure must be assumed shape vector
+ integer, intent(in) :: vlist(:,:)
+ integer, intent(out) :: iostat
+ character(len=*), intent(inout) :: iomsg
+ iostat = 343
+ stop 'fail'
+ end subroutine
+end module m16b
+
+module m16c
+ type,public :: t
+ integer c
+ contains
+ procedure, pass :: tbp=>formattedReadProc
+ generic :: read(formatted) => tbp
+ end type
+ private
+contains
+ subroutine formattedReadProc(dtv, unit, iotype, vlist, iostat, iomsg)
+ class(t), intent(inout) :: dtv
+ integer, intent(in) :: unit
+ character(len=*), intent(in) :: iotype
+ !ERROR: Dummy argument 'vlist' may not be assumed-rank
+ integer, intent(in) :: vlist(..)
+ integer, intent(out) :: iostat
+ character(len=*), intent(inout) :: iomsg
iostat = 343
stop 'fail'
end subroutine
-end module m16
+end module m16c
module m17
! Test the same defined input/output procedure specified as a generic
|
eugeneepshteyn
approved these changes
May 9, 2025
DanielCChen
approved these changes
May 12, 2025
Contributor
DanielCChen
left a comment
DanielCChen
left a comment
There was a problem hiding this comment.
LGTM.
It fixed our test case.
Thanks.
akuhlens
approved these changes
May 12, 2025
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/157/builds/27806 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Catch assumed-rank arguments to defined I/O subroutines, and ensure that v_list dummy arguments are vectors.
Fixes #138933.