PR1302 fix: lost minus one on DIM in lbound

I forgot to push a PR fix that makes DIM zero based before
using it in a fir.coordinate_of in LBOUND implementation.

Author: jeanPerier

flang/lib/Lower/IntrinsicCall.cpp

@@ -3087,8 +3087,12 @@ IntrinsicLibrary::genLbound(mlir::Type resultType,
     mlir::Value lbValue = builder.createConvert(loc, resultType, lb.value());
     builder.create<fir::StoreOp>(loc, lbValue, lbAddr);
   }
-  mlir::Value resAddr = builder.create<fir::CoordinateOp>(
-      loc, lbAddrType, lbArray, fir::getBase(args[1]));
+  mlir::Value dimArg = fir::getBase(args[1]);
+  mlir::Value one = builder.createIntegerConstant(loc, dimArg.getType(), 1);
+  mlir::Value zeroBasedDim =
+      builder.create<mlir::arith::SubIOp>(loc, dimArg, one);
+  mlir::Value resAddr =
+      builder.create<fir::CoordinateOp>(loc, lbAddrType, lbArray, zeroBasedDim);
   return builder.create<fir::LoadOp>(loc, resAddr);
 }
 

flang/test/Lower/intrinsic-procedures/lbound.f90

@@ -34,9 +34,11 @@ subroutine lbound_test_2(a, dim, res)
 ! CHECK:         %[[VAL_13:.*]] = fir.coordinate_of %[[VAL_3]], %[[VAL_12]] : (!fir.ref<!fir.array<2xi64>>, index) -> !fir.ref<i64>
 ! CHECK:         %[[VAL_14:.*]] = fir.convert %[[VAL_7]] : (index) -> i64
 ! CHECK:         fir.store %[[VAL_14]] to %[[VAL_13]] : !fir.ref<i64>
-! CHECK:         %[[VAL_15:.*]] = fir.coordinate_of %[[VAL_3]], %[[VAL_8]] : (!fir.ref<!fir.array<2xi64>>, i64) -> !fir.ref<i64>
-! CHECK:         %[[VAL_16:.*]] = fir.load %[[VAL_15]] : !fir.ref<i64>
-! CHECK:         fir.store %[[VAL_16]] to %[[VAL_2]] : !fir.ref<i64>
+! CHECK:         %[[VAL_15:.*]] = arith.constant 1 : i64
+! CHECK:         %[[VAL_16:.*]] = arith.subi %[[VAL_8]], %[[VAL_15]] : i64
+! CHECK:         %[[VAL_17:.*]] = fir.coordinate_of %[[VAL_3]], %[[VAL_16]] : (!fir.ref<!fir.array<2xi64>>, i64) -> !fir.ref<i64>
+! CHECK:         %[[VAL_18:.*]] = fir.load %[[VAL_17]] : !fir.ref<i64>
+! CHECK:         fir.store %[[VAL_18]] to %[[VAL_2]] : !fir.ref<i64>
   res = lbound(a, dim, 8)
 end subroutine
 
@@ -59,8 +61,10 @@ subroutine lbound_test_3(a, dim, res)
 ! CHECK:         %[[VAL_11:.*]] = fir.coordinate_of %[[VAL_3]], %[[VAL_10]] : (!fir.ref<!fir.array<2xi64>>, index) -> !fir.ref<i64>
 ! CHECK:         %[[VAL_12:.*]] = fir.convert %[[VAL_5]] : (index) -> i64
 ! CHECK:         fir.store %[[VAL_12]] to %[[VAL_11]] : !fir.ref<i64>
-! CHECK:         %[[VAL_13:.*]] = fir.coordinate_of %[[VAL_3]], %[[VAL_6]] : (!fir.ref<!fir.array<2xi64>>, i64) -> !fir.ref<i64>
-! CHECK:         %[[VAL_14:.*]] = fir.load %[[VAL_13]] : !fir.ref<i64>
-! CHECK:         fir.store %[[VAL_14]] to %[[VAL_2]] : !fir.ref<i64>
+! CHECK:         %[[VAL_13:.*]] = arith.constant 1 : i64
+! CHECK:         %[[VAL_14:.*]] = arith.subi %[[VAL_6]], %[[VAL_13]] : i64
+! CHECK:         %[[VAL_15:.*]] = fir.coordinate_of %[[VAL_3]], %[[VAL_14]] : (!fir.ref<!fir.array<2xi64>>, i64) -> !fir.ref<i64>
+! CHECK:         %[[VAL_16:.*]] = fir.load %[[VAL_15]] : !fir.ref<i64>
+! CHECK:         fir.store %[[VAL_16]] to %[[VAL_2]] : !fir.ref<i64>
   res = lbound(a, dim, 8)
 end subroutine

flang/test/Lower/intrinsic-procedures/ubound.f90

@@ -48,12 +48,14 @@ subroutine ubound_test_2(a, dim, res)
 ! CHECK:         %[[VAL_18:.*]] = fir.coordinate_of %[[VAL_3]], %[[VAL_17]] : (!fir.ref<!fir.array<2xi64>>, index) -> !fir.ref<i64>
 ! CHECK:         %[[VAL_19:.*]] = fir.convert %[[VAL_7]] : (index) -> i64
 ! CHECK:         fir.store %[[VAL_19]] to %[[VAL_18]] : !fir.ref<i64>
-! CHECK:         %[[VAL_20:.*]] = fir.coordinate_of %[[VAL_3]], %[[VAL_8]] : (!fir.ref<!fir.array<2xi64>>, i64) -> !fir.ref<i64>
-! CHECK:         %[[VAL_21:.*]] = fir.load %[[VAL_20]] : !fir.ref<i64>
-! CHECK:         %[[VAL_22:.*]] = arith.constant 1 : i64
-! CHECK:         %[[VAL_23:.*]] = arith.subi %[[VAL_21]], %[[VAL_22]] : i64
-! CHECK:         %[[VAL_24:.*]] = arith.addi %[[VAL_23]], %[[VAL_13]] : i64
-! CHECK:         fir.store %[[VAL_24]] to %[[VAL_2]] : !fir.ref<i64>
+! CHECK:         %[[VAL_20:.*]] = arith.constant 1 : i64
+! CHECK:         %[[VAL_21:.*]] = arith.subi %[[VAL_8]], %[[VAL_20]] : i64
+! CHECK:         %[[VAL_22:.*]] = fir.coordinate_of %[[VAL_3]], %[[VAL_21]] : (!fir.ref<!fir.array<2xi64>>, i64) -> !fir.ref<i64>
+! CHECK:         %[[VAL_23:.*]] = fir.load %[[VAL_22]] : !fir.ref<i64>
+! CHECK:         %[[VAL_24:.*]] = arith.constant 1 : i64
+! CHECK:         %[[VAL_25:.*]] = arith.subi %[[VAL_23]], %[[VAL_24]] : i64
+! CHECK:         %[[VAL_26:.*]] = arith.addi %[[VAL_25]], %[[VAL_13]] : i64
+! CHECK:         fir.store %[[VAL_26]] to %[[VAL_2]] : !fir.ref<i64>
   res = ubound(a, dim, 8)
 end subroutine