Skip to content

[flang] Better error handling for PDT constant expression #130637

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
Mar 10, 2025
Merged

[flang] Better error handling for PDT constant expression #130637

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
7 changes: 4 additions & 3 deletions flang/lib/Evaluate/check-expression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,14 @@ class IsConstantExprHelper
bool operator()(const Component &component) const {
return (*this)(component.base());
}
// Forbid integer division by zero in constants.
// Prevent integer division by known zeroes in constant expressions.
template <int KIND>
bool operator()(
const Divide<Type<TypeCategory::Integer, KIND>> &division) const {
using T = Type<TypeCategory::Integer, KIND>;
if (const auto divisor{GetScalarConstantValue<T>(division.right())}) {
return !divisor->IsZero() && (*this)(division.left());
if ((*this)(division.left()) && (*this)(division.right())) {
const auto divisor{GetScalarConstantValue<T>(division.right())};
return !divisor || !divisor->IsZero();
} else {
return false;
}
Expand Down
11 changes: 9 additions & 2 deletions flang/lib/Semantics/type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,11 +567,18 @@ const DeclTypeSpec &InstantiateHelper::InstantiateIntrinsicType(
kind = *value;
} else {
foldingContext().messages().Say(symbolName,
"KIND parameter value (%jd) of intrinsic type %s "
"did not resolve to a supported value"_err_en_US,
"KIND parameter value (%jd) of intrinsic type %s did not resolve to a supported value"_err_en_US,
*value,
parser::ToUpperCaseLetters(EnumToString(intrinsic.category())));
}
} else {
std::string exprString;
llvm::raw_string_ostream sstream(exprString);
copy.AsFortran(sstream);
foldingContext().messages().Say(symbolName,
"KIND parameter expression (%s) of intrinsic type %s did not resolve to a constant value"_err_en_US,
exprString,
parser::ToUpperCaseLetters(EnumToString(intrinsic.category())));
}
switch (spec.category()) {
case DeclTypeSpec::Numeric:
Expand Down
11 changes: 11 additions & 0 deletions flang/test/Semantics/pdt04.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
!RUN: not %flang_fc1 %s 2>&1 | FileCheck %s
!CHECK: error: KIND parameter expression (int(1_4/0_4,kind=8)) of intrinsic type CHARACTER did not resolve to a constant value
!CHECK: in the context: instantiation of parameterized derived type 'ty(j=1_4,k=0_4)'
!CHECK: warning: INTEGER(4) division by zero
program main
type ty(j,k)
integer, kind :: j, k
character(kind=j/k) a
end type
type(ty(1,0)) x
end
2 changes: 1 addition & 1 deletion flang/test/Semantics/resolve105.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
! RUN: %python %S/test_errors.py %s %flang_fc1
! Test instantiation of components that are procedure pointers.
!
program test
type dtype(kindParam)
integer, kind :: kindParam = 4
!ERROR: KIND parameter expression (kindparam) of intrinsic type REAL did not resolve to a constant value
!ERROR: KIND parameter value (66) of intrinsic type REAL did not resolve to a supported value
!ERROR: KIND parameter value (55) of intrinsic type REAL did not resolve to a supported value
procedure (real(kindParam)), pointer, nopass :: field => null()
Expand Down