Skip to content

[flang] Fix failure to fold character array #123418

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
klausler merged 1 commit into from
Jan 27, 2025
Merged

[flang] Fix failure to fold character array #123418

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
4 changes: 4 additions & 0 deletions flang/lib/Evaluate/fold-implementation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ std::optional<Constant<T>> Folder<T>::ApplyComponent(
auto *typedExpr{UnwrapExpr<Expr<T>>(expr.value())};
CHECK(typedExpr);
array = std::make_unique<ArrayConstructor<T>>(*typedExpr);
if constexpr (T::category == TypeCategory::Character) {
array->set_LEN(Expr<SubscriptInteger>{value->LEN()});
}
}
if (subscripts) {
if (auto element{ApplySubscripts(*value, *subscripts)}) {
Expand Down Expand Up @@ -407,6 +410,7 @@ template <typename T> Expr<T> Folder<T>::Folding(Designator<T> &&designator) {
template <typename T>
Constant<T> *Folder<T>::Folding(std::optional<ActualArgument> &arg) {
if (auto *expr{UnwrapExpr<Expr<SomeType>>(arg)}) {
*expr = Fold(context_, std::move(*expr));
if constexpr (T::category != TypeCategory::Derived) {
if (!UnwrapExpr<Expr<T>>(*expr)) {
if (const Symbol *
Expand Down
11 changes: 11 additions & 0 deletions flang/test/Evaluate/fold-arr-char-component.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
! RUN: %python %S/test_folding.py %s %flang_fc1
! Ensure that array-valued component references have lengths
! (see https://github.com/llvm/llvm-project/issues/123362)
module m
type cdt
character(7) :: a = "ibm704", b = "cdc6600"
end type
type(cdt), parameter :: arr(2) = cdt()
integer, parameter :: check(*) = scan(arr%a, arr%b)
logical, parameter :: test1 = all(check == 5) ! the '0'
end
Loading