diff --git a/flang/lib/Optimizer/HLFIR/Transforms/OptimizedBufferization.cpp b/flang/lib/Optimizer/HLFIR/Transforms/OptimizedBufferization.cpp index 96a3622f4afee..c489450384a35 100644 --- a/flang/lib/Optimizer/HLFIR/Transforms/OptimizedBufferization.cpp +++ b/flang/lib/Optimizer/HLFIR/Transforms/OptimizedBufferization.cpp @@ -988,8 +988,15 @@ class ReductionConversion : public mlir::OpRewritePattern { op, "Currently minloc/maxloc is not handled"); } else if constexpr (std::is_same_v || std::is_same_v) { + mlir::Type ty = op.getType(); + if (!(mlir::isa(ty) || + mlir::isa(ty))) { + return rewriter.notifyMatchFailure( + op, "Type is not supported for Maxval or Minval yet"); + } + bool isMax = std::is_same_v; - init = makeMinMaxInitValGenerator(isMax)(builder, loc, op.getType()); + init = makeMinMaxInitValGenerator(isMax)(builder, loc, ty); genBodyFn = [inlineSource, isMax]( fir::FirOpBuilder builder, mlir::Location loc, mlir::Value reduction, diff --git a/flang/test/HLFIR/minval-maxval-issue-134308.fir b/flang/test/HLFIR/minval-maxval-issue-134308.fir new file mode 100644 index 0000000000000..9108a70be0fe7 --- /dev/null +++ b/flang/test/HLFIR/minval-maxval-issue-134308.fir @@ -0,0 +1,54 @@ +// Test to assure we don't hit assertion when passing characters to maxval +// RUN: fir-opt %s -opt-bufferization | FileCheck %s + + +// This simplified `fir` is derived from this test program: +// program FlangOptimizerBug +// character(len=*), parameter :: values(*) = & +// [ "To be ","or not " & +// , "to ","be. " & +// , "that ","is " & +// , "the ","question"] +// integer :: me, ni, i +// character(len=len(values)) :: my_val, expected +// +// me = 1 +// ni = 8 +// +// my_val = values(mod(me-1, size(values))+1) +// expected = maxval([(values(mod(i-1,size(values))+1), i = 1, ni)]) +// +// print *, my_val, expected +// end program + +func.func @_QQmain() { + %c8 = arith.constant 8 : index + %1 = fir.alloca !fir.char<1, 8> + %24 = fir.shape %c8 : (index) -> !fir.shape<1> + %25 = hlfir.elemental %24 typeparams %c8 unordered : (!fir.shape<1>, index) -> !hlfir.expr> { + ^bb0(%arg0: index): + %dummy = fir.string_lit "A"(8) : !fir.char<1, 8> + hlfir.yield_element %dummy : !fir.char<1, 8> + } + %26 = hlfir.maxval %25 {fastmath = #arith.fastmath} : (!hlfir.expr>) -> !hlfir.expr> + hlfir.assign %26 to %1 : !hlfir.expr>, !fir.ref> // Assign to %1 directly + hlfir.destroy %26 : !hlfir.expr> + hlfir.destroy %25 : !hlfir.expr> + return +} + +// CHECK-LABEL: func.func @_QQmain() { +// CHECK-NEXT: %c8 = arith.constant 8 : index +// CHECK-NEXT: %[[V0:.*]] = fir.alloca !fir.char<1,8> +// CHECK-NEXT: %[[V1:.*]] = fir.shape %c8 : (index) -> !fir.shape<1> +// CHECK-NEXT: %[[V2:.*]] = hlfir.elemental %1 typeparams %c8 unordered : (!fir.shape<1>, index) -> !hlfir.expr> { +// CHECK-NEXT: ^bb0(%arg0: index): +// CHECK-NEXT: %[[V4:.*]] = fir.string_lit "A"(8) : !fir.char<1,8> +// CHECK-NEXT: hlfir.yield_element %[[V4]] : !fir.char<1,8> +// CHECK-NEXT: } +// CHECK-NEXT: %[[V3:.*]] = hlfir.maxval %[[V2]] {fastmath = #arith.fastmath} : (!hlfir.expr>) -> !hlfir.expr> +// CHECK-NEXT: hlfir.assign %[[V3]] to %[[V0]] : !hlfir.expr>, !fir.ref> +// CHECK-NEXT: hlfir.destroy %[[V3]] : !hlfir.expr> +// CHECK-NEXT: hlfir.destroy %[[V2]] : !hlfir.expr> +// CHECK-NEXT: return +// CHECK-NEXT: }