Skip to content

[flang][semantics] fix IsConstantExpr for intrinsic with optional argument #161915

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 8 commits into from
Oct 4, 2025
Merged

[flang][semantics] fix IsConstantExpr for intrinsic with optional argument #161915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e11d68
initial commit
akuhlens Oct 3, 2025
22e8f06
don't used brace initialization
akuhlens Oct 3, 2025
7bb937e
clean up comment
akuhlens Oct 3, 2025
904ed43
initial commit
akuhlens Oct 3, 2025
8c3b43f
address feedback
akuhlens Oct 3, 2025
d981142
add test
akuhlens Oct 3, 2025
b395191
fix duplicate messages in results
akuhlens Oct 3, 2025
684d6f2
Merge branch 'main' into andre/issue-161694
akuhlens Oct 4, 2025
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
18 changes: 12 additions & 6 deletions flang/lib/Evaluate/check-expression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,22 @@ bool IsConstantExprHelper<INVARIANT>::operator()(
} else if (proc.IsPure()) {
std::size_t j{0};
for (const auto &arg : call.arguments()) {
if (const auto *dataDummy{j < proc.dummyArguments.size()
? std::get_if<characteristics::DummyDataObject>(
&proc.dummyArguments[j].u)
: nullptr};
dataDummy &&
const auto *dataDummy{j < proc.dummyArguments.size()
? std::get_if<characteristics::DummyDataObject>(
&proc.dummyArguments[j].u)
: nullptr};
if (dataDummy &&
dataDummy->attrs.test(
characteristics::DummyDataObject::Attr::OnlyIntrinsicInquiry)) {
// The value of the argument doesn't matter
} else if (!arg) {
return false;
if (dataDummy &&
dataDummy->attrs.test(
characteristics::DummyDataObject::Attr::Optional)) {
// Missing optional arguments are okay.
} else {
return false;
}
} else if (const auto *expr{arg->UnwrapExpr()};
!expr || !(*this)(*expr)) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion flang/test/Semantics/intrinsics03.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,6 @@ subroutine ichar_tests()
!Without -Wportability, the warning isn't emitted and the parameter is constant.
integer, parameter :: a2 = ichar('B ')
!ERROR: Character in intrinsic function ichar must have length one
!ERROR: Must be a constant value
!ERROR: Value of named constant 'a3' (ichar("")) cannot be computed as a constant value
integer, parameter :: a3 = ichar('')
end subroutine
2 changes: 1 addition & 1 deletion flang/test/Semantics/intrinsics04.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ subroutine ichar_tests()
!WARNING: Character in intrinsic function ichar should have length one [-Wportability]
integer, parameter :: a2 = ichar('B ')
!ERROR: Character in intrinsic function ichar must have length one
!ERROR: Must be a constant value
!ERROR: Value of named constant 'a3' (ichar("")) cannot be computed as a constant value
integer, parameter :: a3 = ichar('')
end subroutine
15 changes: 15 additions & 0 deletions flang/test/Semantics/type-parameter-constant.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
! RUN: %python %S/test_errors.py %s %flang_fc1
type A (p, r)
integer, kind :: p, r
!ERROR: KIND parameter expression (int(selected_real_kind(six,twenty_three),kind=8)) of intrinsic type REAL did not resolve to a constant value
real (selected_real_kind(p, r)) :: data
end type
integer :: six = 6, twenty_three = 23
type(a(6,23)) :: a1
!ERROR: Value of KIND type parameter 'p' must be constant
!ERROR: Value of KIND type parameter 'r' must be constant
!WARNING: specification expression refers to local object 'six' (initialized and saved) [-Wsaved-local-in-spec-expr]
!WARNING: specification expression refers to local object 'twenty_three' (initialized and saved) [-Wsaved-local-in-spec-expr]
type(a(six, twenty_three)) :: a2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: there is a trailing blank after a2, which caused a warning when apply the patch.

print *, a1%data%kind
end