Skip to content

[FLANG] Solving issue with adjustr intrinsic in where construct #146851

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

Open
EbinJose2002 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[FLANG] Solving issue with adjustr intrinsic in where construct #146851

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8768516
Removed unnecessary handling of reference to boxchar conversion in Bu…
EbinJose2002 Jul 1, 2025
ed8f048
Added test file for the issue
EbinJose2002 Jul 3, 2025
ae2f94c
Update adjustr.f90
EbinJose2002 Jul 3, 2025
4f86344
Create emboxchar
EbinJose2002 Jul 10, 2025
9cb61ce
Using associate to get length. Also modified the test to check for em…
EbinJose2002 Aug 18, 2025
306af24
Update flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp
EbinJose2002 Aug 19, 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
12 changes: 10 additions & 2 deletions flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,16 @@ struct AssociateOpConversion
!mlir::isa<fir::BaseBoxType>(assocType)) ||
((mlir::isa<fir::BoxCharType>(sourceVar.getType()) &&
!mlir::isa<fir::BoxCharType>(assocType)))) {
sourceVar =
fir::BoxAddrOp::create(builder, loc, assocType, sourceVar);
sourceVar = builder.create<fir::BoxAddrOp>(loc, assocType, sourceVar);
} else if (mlir::isa<fir::ReferenceType>(sourceVar.getType()) &&
mlir::isa<fir::BoxCharType>(assocType)) {
mlir::Value lenVal = associate.getTypeparams()[0];
Copy link
Contributor

@vzakhari vzakhari Aug 18, 2025

Choose a reason for hiding this comment

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

nit: please assert that getTypeparams() returns a vector of length one.

auto refTy = mlir::cast<fir::ReferenceType>(sourceVar.getType());
auto charTy = mlir::dyn_cast<fir::CharacterType>(refTy.getEleTy());
Copy link
Contributor

@vzakhari vzakhari Jul 11, 2025

Choose a reason for hiding this comment

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

Thanks for the update!

This will only work for the types with constant length. I do not know if we should be here for non-constant lengths, but I would just take the type parameters from the associate operation - this should work for all the cases.

Copy link
Contributor Author

@EbinJose2002 EbinJose2002 Aug 18, 2025

Choose a reason for hiding this comment

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

Sorry for the delayed reply.
I have made the change to access the length from associate instruction itself.

auto boxCharType =
fir::BoxCharType::get(builder.getContext(), charTy.getFKind());
sourceVar = builder.create<fir::EmboxCharOp>(loc, boxCharType,
sourceVar, lenVal);
} else {
sourceVar = builder.createConvert(loc, assocType, sourceVar);
}
Expand Down
16 changes: 16 additions & 0 deletions flang/test/Lower/adjustr.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
! RUN: %flang_fc1 -emit-fir -o - %s | FileCheck %s

! Checking no reference to boxchar conversion is in the emitted fir.
! CHECK-NOT: (!fir.ref<!fir.char<1,4>>) -> !fir.boxchar<1>
Copy link
Contributor

@vzakhari vzakhari Jul 11, 2025

Choose a reason for hiding this comment

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

Please update the checks to show what kind of emboxchar we generate after this change.

Copy link
Contributor Author

@EbinJose2002 EbinJose2002 Aug 18, 2025

Choose a reason for hiding this comment

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

I have added check for the emboxchar that is generated.

Copy link
Contributor

@vzakhari vzakhari Aug 18, 2025

Choose a reason for hiding this comment

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

Please add more context into the checks, e.g. the operands of fir.emboxchar, where they are coming from, and how the results of fir.emboxchar are used.

! CHECK: %[[Const4:.*]] = arith.constant 4 : index
! CHECK: fir.emboxchar

program main
logical ,dimension(1):: mask = .true.
character(len=2),dimension(1):: d1 = "a "
character(len=4),dimension(1):: d4
where (mask)
d4 = adjustr(d1 // d1)
end where
write(6,*) "d4 =", d4
end
Loading