Skip to content

[flang] Use box for components with non-default lower bounds #138994

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
May 8, 2025
Merged

[flang] Use box for components with non-default lower bounds #138994

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
22 changes: 19 additions & 3 deletions flang/lib/Lower/ConvertExprToHLFIR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "flang/Optimizer/Builder/Runtime/Derived.h"
#include "flang/Optimizer/Builder/Runtime/Pointer.h"
#include "flang/Optimizer/Builder/Todo.h"
#include "flang/Optimizer/Dialect/FIRAttr.h"
#include "flang/Optimizer/HLFIR/HLFIROps.h"
#include "mlir/IR/IRMapping.h"
#include "llvm/ADT/TypeSwitch.h"
Expand Down Expand Up @@ -125,6 +126,19 @@ class HlfirDesignatorBuilder {
hlfir::ElementalAddrOp convertVectorSubscriptedExprToElementalAddr(
const Fortran::lower::SomeExpr &designatorExpr);

std::tuple<mlir::Type, fir::FortranVariableFlagsEnum>
genComponentDesignatorTypeAndAttributes(
const Fortran::semantics::Symbol &componentSym, mlir::Type fieldType,
bool isVolatile) {
if (mayHaveNonDefaultLowerBounds(componentSym)) {
mlir::Type boxType = fir::BoxType::get(fieldType, isVolatile);
return std::make_tuple(boxType,
fir::FortranVariableFlagsEnum::contiguous);
}
auto refType = fir::ReferenceType::get(fieldType, isVolatile);
return std::make_tuple(refType, fir::FortranVariableFlagsEnum{});
}

mlir::Value genComponentShape(const Fortran::semantics::Symbol &componentSym,
mlir::Type fieldType) {
// For pointers and allocatable components, the
Expand Down Expand Up @@ -1863,8 +1877,9 @@ class HlfirBuilder {
designatorBuilder.genComponentShape(sym, compType);
const bool isDesignatorVolatile =
fir::isa_volatile_type(baseOp.getType());
mlir::Type designatorType =
builder.getRefType(compType, isDesignatorVolatile);
auto [designatorType, extraAttributeFlags] =
designatorBuilder.genComponentDesignatorTypeAndAttributes(
sym, compType, isDesignatorVolatile);

mlir::Type fieldElemType = hlfir::getFortranElementType(compType);
llvm::SmallVector<mlir::Value, 1> typeParams;
Expand All @@ -1884,7 +1899,8 @@ class HlfirBuilder {

// Convert component symbol attributes to variable attributes.
fir::FortranVariableFlagsAttr attrs =
Fortran::lower::translateSymbolAttributes(builder.getContext(), sym);
Fortran::lower::translateSymbolAttributes(builder.getContext(), sym,
extraAttributeFlags);

// Get the component designator.
auto lhs = builder.create<hlfir::DesignateOp>(
Expand Down
10 changes: 10 additions & 0 deletions flang/test/Lower/HLFIR/designators-component-ref.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,16 @@ subroutine test_array_comp_non_contiguous_slice(a)
! CHECK: %[[VAL_19:.*]] = hlfir.designate %[[VAL_1]]#0{"array_comp"} <%[[VAL_9]]> (%[[VAL_10]]:%[[VAL_11]]:%[[VAL_12]], %[[VAL_14]]:%[[VAL_15]]:%[[VAL_16]]) shape %[[VAL_18]] : (!fir.ref<!fir.type<_QMcomp_refTt_array{scalar_i:i32,array_comp:!fir.array<10x20xf32>}>>, !fir.shape<2>, index, index, index, index, index, index, !fir.shape<2>) -> !fir.box<!fir.array<6x17xf32>>
end subroutine

subroutine test_array_lbs_array_ctor()
use comp_ref
type(t_array_lbs) :: a(-1:1)
real :: array_comp(2:11,3:22)
a = (/ (t_array_lbs(i, array_comp), i=-1,1) /)
! CHECK: hlfir.designate %{{.+}}#0{"array_comp_lbs"} <%{{.+}}> shape %{{.+}} {fortran_attrs = #fir.var_attrs<contiguous>}
! CHECK-SAME: (!fir.ref<!fir.type<_QMcomp_refTt_array_lbs{scalar_i:i32,array_comp_lbs:!fir.array<10x20xf32>}>>, !fir.shapeshift<2>, !fir.shapeshift<2>)
! CHECK-SAME: -> !fir.box<!fir.array<10x20xf32>>
end subroutine

subroutine test_array_lbs_comp_lbs_1(a)
use comp_ref
type(t_array_lbs) :: a
Expand Down