Keep the copy-out to deallocate the temporary

Signed-off-by: Kajetan Puchalski <[email protected]>

Author: mrkajetanp

flang/lib/Optimizer/HLFIR/Transforms/InlineHLFIRCopyIn.cpp

@@ -139,21 +139,15 @@ InlineCopyInConversion::matchAndRewrite(hlfir::CopyInOp copyIn,
           })
           .getResults();
 
-  mlir::OpResult addr = results[0];
+  mlir::OpResult resultBox = results[0];
   mlir::OpResult needsCleanup = results[1];
 
-  builder.setInsertionPoint(copyOut);
-  builder.genIfOp(loc, {}, needsCleanup, /*withElseRegion=*/false).genThen([&] {
-    auto boxAddr = builder.create<fir::BoxAddrOp>(loc, addr);
-    fir::HeapType heapType =
-        fir::HeapType::get(fir::BoxValue(addr).getBaseTy());
-    mlir::Value heapVal =
-        builder.createConvert(loc, heapType, boxAddr.getResult());
-    builder.create<fir::FreeMemOp>(loc, heapVal);
-  });
-  rewriter.eraseOp(copyOut);
-
-  rewriter.replaceOp(copyIn, {addr, builder.genNot(loc, isContiguous)});
+  auto alloca = builder.create<fir::AllocaOp>(loc, resultBox.getType());
+  auto store = builder.create<fir::StoreOp>(loc, resultBox, alloca);
+  copyOut->setOperand(0, store.getMemref());
+  copyOut->setOperand(1, needsCleanup);
+
+  rewriter.replaceOp(copyIn, {resultBox, builder.genNot(loc, isContiguous)});
   return mlir::success();
 }
 

flang/test/HLFIR/inline-hlfir-copy-in.fir

@@ -73,11 +73,7 @@ func.func private @_test_inline_copy_in(%arg0: !fir.box<!fir.array<?x?x?xf64>> {
 // CHECK:    %[[VAL_22:.*]] = fir.box_addr %[[VAL_21:.*]]#0 : (!fir.box<!fir.array<?xf64>>) -> !fir.ref<!fir.array<?xf64>>
 // CHECK:    %[[VAL_23:.*]]:3 = hlfir.associate %[[VAL_5:.*]] {adapt.valuebyref} : (i32) -> (!fir.ref<i32>, !fir.ref<i32>, i1)
 // CHECK:    fir.call @_QFPsb(%[[VAL_22:.*]], %[[VAL_23:.*]]#0) fastmath<contract> : (!fir.ref<!fir.array<?xf64>>, !fir.ref<i32>) -> ()
-// CHECK:    fir.if %[[VAL_21:.*]]#1 {
-// CHECK:      %[[VAL_24:.*]] = fir.box_addr %[[VAL_21:.*]]#0 : (!fir.box<!fir.array<?xf64>>) -> !fir.ref<!fir.array<?xf64>>
-// CHECK:      %[[VAL_25:.*]] = fir.convert %[[VAL_24:.*]] : (!fir.ref<!fir.array<?xf64>>) -> !fir.heap<!fir.array<?xf64>>
-// CHECK:      fir.freemem %[[VAL_25:.*]] : !fir.heap<!fir.array<?xf64>>
-// CHECK:    }
+// CHECK:    hlfir.copy_out %16, %15#1 : (!fir.ref<!fir.box<!fir.array<?xf64>>>, i1) -> ()
 // CHECK:    hlfir.end_associate %[[VAL_23:.*]]#1, %[[VAL_23:.*]]#2 : !fir.ref<i32>, i1
 // CHECK:    return
 // CHECK:  }