[flang][hlfir] clean up intrinsic arg extended values

[tblah]

Summary

Depends on D145502

[luporl]

Looks good to me, but can't approve to commit.

[clementval]

Can you add some tests?

[tblah]

In D145503#4189416, @clementval wrote:

Can you add some tests?

Is https://reviews.llvm.org/D145504 enough?

[clementval]

In D145503#4189646, @tblah wrote:

In D145503#4189416, @clementval wrote:

Can you add some tests?

Is https://reviews.llvm.org/D145504 enough?

I guess it's enough for now.

[jeanPerier]

LGTM

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

lowerArguments(mlir::Operation *op,
                  const llvm::ArrayRef<IntrinsicArgument> &args,
                  mlir::PatternRewriter &rewriter,
                  const fir::IntrinsicArgumentLoweringRules *argLowering) const {
     mlir::Location loc = op->getLoc();
     fir::KindMapping kindMapping{rewriter.getContext()};
     fir::FirOpBuilder builder{rewriter, kindMapping};
 
     llvm::SmallVector<fir::ExtendedValue, 3> ret;
+    llvm::SmallVector<std::function<void()>, 2> cleanupFns;
 
     for (size_t i = 0; i < args.size(); ++i) {
       mlir::Value arg = args[i].val;
       mlir::Type desiredType = args[i].desiredType;
       if (!arg) {
         ret.emplace_back(fir::getAbsentIntrinsicArgument());
         continue;
       }
       hlfir::Entity entity{arg};
 
       fir::ArgLoweringRule argRules =
           fir::lowerIntrinsicArgumentAs(*argLowering, i);
       switch (argRules.lowerAs) {
       case fir::LowerIntrinsicArgAs::Value: {
         if (args[i].desiredType != arg.getType()) {
           arg = builder.createConvert(loc, desiredType, arg);
           entity = hlfir::Entity{arg};
         }
         auto [exv, cleanup] = hlfir::convertToValue(loc, builder, entity);
         if (cleanup)
-          TODO(loc, "extended value cleanup");
+          cleanupFns.push_back(*cleanup);
         ret.emplace_back(exv);
       } break;
       case fir::LowerIntrinsicArgAs::Addr: {
         auto [exv, cleanup] =
             hlfir::convertToAddress(loc, builder, entity, desiredType);
         if (cleanup)
-          TODO(loc, "extended value cleanup");
+          cleanupFns.push_back(*cleanup);
         ret.emplace_back(exv);
       } break;
       case fir::LowerIntrinsicArgAs::Box: {
         auto [box, cleanup] =
             hlfir::convertToBox(loc, builder, entity, desiredType);
         if (cleanup)
-          TODO(loc, "extended value cleanup");
+          cleanupFns.push_back(*cleanup);
         ret.emplace_back(box);
       } break;
       case fir::LowerIntrinsicArgAs::Inquired: {
         if (args[i].desiredType != arg.getType()) {
           arg = builder.createConvert(loc, desiredType, arg);
           entity = hlfir::Entity{arg};
         }
         // Place hlfir.expr in memory, and unbox fir.boxchar. Other entities
         // are translated to fir::ExtendedValue without transofrmation (notably,
         // pointers/allocatable are not dereferenced).
         // TODO: once lowering to FIR retires, UBOUND and LBOUND can be
         // simplified since the fir.box lowered here are now guarenteed to
         // contain the local lower bounds thanks to the hlfir.declare (the extra
         // rebox can be removed).
         auto [exv, cleanup] =
             hlfir::translateToExtendedValue(loc, builder, entity);
         if (cleanup)
-          TODO(loc, "extended value cleanup");
+          cleanupFns.push_back(*cleanup);
         ret.emplace_back(exv);
       } break;
       }
     }
 
+    if (cleanupFns.size()) {
+      auto oldInsertionPoint = builder.saveInsertionPoint();
+      builder.setInsertionPointAfter(op);
+      for (std::function<void()> cleanup : cleanupFns)
+        cleanup();
+      builder.restoreInsertionPoint(oldInsertionPoint);
+    }
+
     return ret;
   }
 
   void processReturnValue(mlir::Operation *op,
                           const fir::ExtendedValue &resultExv, bool mustBeFreed,
                           fir::FirOpBuilder &builder,
                           mlir::PatternRewriter &rewriter) const {
     mlir::Location loc = op->getLoc();