Fix rebase issues

Author: Leporacanthicus

flang/include/flang/Optimizer/Transforms/Passes.h

@@ -54,6 +54,8 @@ namespace fir {
 #define GEN_PASS_DECL_OMPMAPINFOFINALIZATIONPASS
 #define GEN_PASS_DECL_OMPMARKDECLARETARGETPASS
 #define GEN_PASS_DECL_OMPFUNCTIONFILTERING
+#define GEN_PASS_DECL_CONSTANTARGUMENTGLOBALISATIONOPT
+
 #include "flang/Optimizer/Transforms/Passes.h.inc"
 
 std::unique_ptr<mlir::Pass> createAffineDemotionPass();
@@ -77,6 +79,8 @@ std::unique_ptr<mlir::Pass> createVScaleAttrPass();
 std::unique_ptr<mlir::Pass>
 createVScaleAttrPass(std::pair<unsigned, unsigned> vscaleAttr);
 
+std::unique_ptr<mlir::Pass> createConstantArgumentGlobalisationPass();
+
 struct FunctionAttrTypes {
   mlir::LLVM::framePointerKind::FramePointerKind framePointerKind =
       mlir::LLVM::framePointerKind::FramePointerKind::None;

flang/include/flang/Tools/CLOptions.inc

@@ -288,6 +288,10 @@ inline void createDefaultFIROptimizerPassPipeline(
   else
     fir::addMemoryAllocationOpt(pm);
 
+  // FIR Inliner Callback
+  pc.invokeFIRInlinerCallback(pm, pc.OptLevel);
+
+  pm.addPass(fir::createSimplifyRegionLite());
   pm.addPass(mlir::createCSEPass());
 
   // Polymorphic types