diff --git a/flang/lib/Optimizer/Builder/FIRBuilder.cpp b/flang/lib/Optimizer/Builder/FIRBuilder.cpp index 584f3c8ee310e..6ac87067f6511 100644 --- a/flang/lib/Optimizer/Builder/FIRBuilder.cpp +++ b/flang/lib/Optimizer/Builder/FIRBuilder.cpp @@ -283,6 +283,9 @@ mlir::Block *fir::FirOpBuilder::getAllocaBlock() { if (auto doConcurentOp = getRegion().getParentOfType()) return doConcurentOp.getBody(); + if (auto firLocalOp = getRegion().getParentOfType()) + return &getRegion().front(); + return getEntryBlock(); } diff --git a/flang/test/HLFIR/fir-local-alloca-block.fir b/flang/test/HLFIR/fir-local-alloca-block.fir new file mode 100644 index 0000000000000..9d76e86fec3d9 --- /dev/null +++ b/flang/test/HLFIR/fir-local-alloca-block.fir @@ -0,0 +1,34 @@ +// Tests that `fir.local` ops are able to provide an alloca block when required. + +// RUN: fir-opt %s -convert-hlfir-to-fir | FileCheck %s + +fir.local {type = local_init} @localizer : !fir.box> copy { +^bb0(%arg0: !fir.ref>>, %arg1: !fir.ref>>): + %0 = fir.load %arg0 : !fir.ref>> + hlfir.assign %0 to %arg1 : !fir.box>, !fir.ref>> + fir.yield(%arg1 : !fir.ref>>) +} + +func.func @foo() { + %c1 = arith.constant 1 : index + %0 = fir.alloca !fir.box> + fir.do_concurrent { + fir.do_concurrent.loop (%arg0) = (%c1) to (%c1) step (%c1) local(@localizer %0 -> %arg1 : !fir.ref>>) { + } + } + return +} + +// CHECK: fir.local {type = local_init} @localizer : ![[TYPE:fir.box>]] copy { +// CHECK: ^bb0(%[[VAL_0:.*]]: !fir.ref, %[[VAL_1:.*]]: !fir.ref): +// CHECK: %[[VAL_2:.*]] = fir.alloca ![[TYPE]] +// CHECK: %[[VAL_3:.*]] = fir.load %[[VAL_0]] : !fir.ref +// CHECK: %[[VAL_4:.*]] = arith.constant 0 : index +// CHECK: %[[VAL_5:.*]]:3 = fir.box_dims %[[VAL_3]], %[[VAL_4]] : (![[TYPE]], index) -> (index, index, index) +// CHECK: %[[VAL_6:.*]] = fir.load %[[VAL_1]] : !fir.ref +// CHECK: fir.store %[[VAL_6]] to %[[VAL_2]] : !fir.ref +// CHECK: %[[VAL_10:.*]] = fir.convert %[[VAL_2]] : (!fir.ref) -> !fir.ref> +// CHECK: %[[VAL_11:.*]] = fir.convert %[[VAL_3]] : (![[TYPE]]) -> !fir.box +// CHECK: fir.call @_FortranAAssign(%[[VAL_10]], %[[VAL_11]], %{{.*}}, %{{.*}}) +// CHECK: fir.yield(%[[VAL_1]] : !fir.ref) +// CHECK: }