Second update for review comments

Author: Leporacanthicus

flang/include/flang/Tools/CrossToolHelpers.h

@@ -13,6 +13,7 @@
 #ifndef FORTRAN_TOOLS_CROSS_TOOL_HELPERS_H
 #define FORTRAN_TOOLS_CROSS_TOOL_HELPERS_H
 
+#include "flang/Frontend/CodeGenOptions.h"
 #include "flang/Frontend/LangOptions.h"
 #include <cstdint>
 
@@ -26,6 +27,15 @@ struct MLIRToLLVMPassPipelineConfig {
   explicit MLIRToLLVMPassPipelineConfig(llvm::OptimizationLevel level) {
     OptLevel = level;
   }
+  explicit MLIRToLLVMPassPipelineConfig(llvm::OptimizationLevel level,
+      const Fortran::frontend::CodeGenOptions &opts) {
+    OptLevel = level;
+    StackArrays = opts.StackArrays;
+    Underscoring = opts.Underscoring;
+    LoopVersioning = opts.LoopVersioning;
+    DebugInfo = opts.getDebugInfo();
+  }
+
   llvm::OptimizationLevel OptLevel; ///< optimisation level
   bool StackArrays = false; ///< convert memory allocations to alloca.
   bool Underscoring = true; ///< add underscores to function names.

flang/lib/Frontend/FrontendActions.cpp

@@ -713,15 +713,7 @@ void CodeGenAction::generateLLVMIR() {
   pm.addPass(std::make_unique<Fortran::lower::VerifierPass>());
   pm.enableVerifier(/*verifyPasses=*/true);
 
-  const auto targetOpts = ci.getInvocation().getTargetOpts();
-  const llvm::Triple triple(targetOpts.triple);
-
-  MLIRToLLVMPassPipelineConfig config(level);
-
-  config.StackArrays = opts.StackArrays;
-  config.Underscoring = opts.Underscoring;
-  config.LoopVersioning = opts.LoopVersioning;
-  config.DebugInfo = opts.getDebugInfo();
+  MLIRToLLVMPassPipelineConfig config(level, opts);
 
   // Create the pass pipeline
   fir::createMLIRToLLVMPassPipeline(pm, config);