Skip to content

[flang] Allow polymorphic type mismatch for hlfir.eoshift. #158718

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
Sep 16, 2025
Merged

[flang] Allow polymorphic type mismatch for hlfir.eoshift. #158718

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
15 changes: 9 additions & 6 deletions flang/lib/Optimizer/HLFIR/IR/HLFIROps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1618,12 +1618,15 @@ static llvm::LogicalResult verifyArrayShift(Op op) {
if (mlir::Value boundary = op.getBoundary()) {
mlir::Type boundaryTy =
hlfir::getFortranElementOrSequenceType(boundary.getType());
if (auto match = areMatchingTypes(
op, eleTy, hlfir::getFortranElementType(boundaryTy),
/*allowCharacterLenMismatch=*/!useStrictIntrinsicVerifier);
match.failed())
return op.emitOpError(
"ARRAY and BOUNDARY operands must have the same element type");
// In case of polymorphic ARRAY type, the BOUNDARY's element type
// may not match the ARRAY's element type.
if (!hlfir::isPolymorphicType(array.getType()))
if (auto match = areMatchingTypes(
op, eleTy, hlfir::getFortranElementType(boundaryTy),
/*allowCharacterLenMismatch=*/!useStrictIntrinsicVerifier);
match.failed())
return op.emitOpError(
"ARRAY and BOUNDARY operands must have the same element type");
if (failed(verifyOperandTypeShape(boundaryTy, "BOUNDARY")))
return mlir::failure();
}
Expand Down
11 changes: 11 additions & 0 deletions flang/test/Lower/HLFIR/eoshift.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
module eoshift_types
type t
end type t
type, extends(t) :: t2
end type t2
end module eoshift_types

! 1d shift by scalar
Expand Down Expand Up @@ -269,3 +271,12 @@ subroutine eoshift14(array)
! CHECK-DAG: %[[VAL_3]] = arith.constant 1 : i32
! CHECK: %[[VAL_5:.*]] = hlfir.eoshift{{.*}}boundary %[[VAL_4]] : (!fir.box<!fir.array<?xui32>>, i32, ui32) -> !hlfir.expr<?xui32>
end subroutine eoshift14

! CHECK-LABEL: func.func @_QPeoshift15(
subroutine eoshift15(array, boundary)
use eoshift_types
class(t), allocatable :: array(:,:)
type(t) :: boundary(:)
array = eoshift(array, shift=1, boundary=boundary)
! CHECK: hlfir.eoshift %{{.*}} %{{.*}} boundary %{{.*}}#0 : (!fir.class<!fir.heap<!fir.array<?x?x!fir.type<_QMeoshift_typesTt>>>>, i32, !fir.box<!fir.array<?x!fir.type<_QMeoshift_typesTt>>>) -> !hlfir.expr<?x?x!fir.type<_QMeoshift_typesTt>?>
end subroutine eoshift15