[CIR][NFC] Rename variables to avoid gcc compilation error

Author: koparasy

clang/lib/CIR/FrontendAction/CIRGenAction.cpp

@@ -110,12 +110,12 @@ class CIRGenConsumer : public clang::ASTConsumer {
 
   CIRGenAction::OutputType Action;
 
-  CompilerInstance &CompilerInstance;
-  DiagnosticsEngine &DiagnosticsEngine;
-  [[maybe_unused]] const HeaderSearchOptions &HeaderSearchOptions;
-  CodeGenOptions &CodeGenOptions;
-  [[maybe_unused]] const TargetOptions &TargetOptions;
-  [[maybe_unused]] const LangOptions &LangOptions;
+  CompilerInstance &CompInstance;
+  DiagnosticsEngine &DiagEngine;
+  [[maybe_unused]] const HeaderSearchOptions &HdrSearchOptions;
+  CodeGenOptions &CGenOptions;
+  [[maybe_unused]] const TargetOptions &TgtOptions;
+  [[maybe_unused]] const LangOptions &LOptions;
   const FrontendOptions &FeOptions;
 
   std::unique_ptr<raw_pwrite_stream> OutputStream;
@@ -126,23 +126,21 @@ class CIRGenConsumer : public clang::ASTConsumer {
 
 public:
   CIRGenConsumer(CIRGenAction::OutputType Action,
-                 class CompilerInstance &CompilerInstance,
-                 class DiagnosticsEngine &DiagnosticsEngine,
+                 class CompilerInstance &CompInstance,
+                 class DiagnosticsEngine &DiagEngine,
                  IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS,
-                 const class HeaderSearchOptions &HeaderSearchOptions,
-                 class CodeGenOptions &CodeGenOptions,
-                 const class TargetOptions &TargetOptions,
-                 const class LangOptions &LangOptions,
+                 const class HeaderSearchOptions &HdrSearchOptions,
+                 class CodeGenOptions &CGenOptions,
+                 const class TargetOptions &TgtOptions,
+                 const class LangOptions &LOptions,
                  const FrontendOptions &FeOptions,
                  std::unique_ptr<raw_pwrite_stream> Os)
-      : Action(Action), CompilerInstance(CompilerInstance),
-        DiagnosticsEngine(DiagnosticsEngine),
-        HeaderSearchOptions(HeaderSearchOptions),
-        CodeGenOptions(CodeGenOptions), TargetOptions(TargetOptions),
-        LangOptions(LangOptions), FeOptions(FeOptions),
+      : Action(Action), CompInstance(CompInstance), DiagEngine(DiagEngine),
+        HdrSearchOptions(HdrSearchOptions), CGenOptions(CGenOptions),
+        TgtOptions(TgtOptions), LOptions(LOptions), FeOptions(FeOptions),
         OutputStream(std::move(Os)), FS(VFS),
-        Gen(std::make_unique<CIRGenerator>(DiagnosticsEngine, std::move(VFS),
-                                           CodeGenOptions)) {}
+        Gen(std::make_unique<CIRGenerator>(DiagEngine, std::move(VFS),
+                                           CGenOptions)) {}
 
   void Initialize(ASTContext &Ctx) override {
     assert(!AstContext && "initialized multiple times");
@@ -217,12 +215,12 @@ class CIRGenConsumer : public clang::ASTConsumer {
               FeOptions.ClangIRLifetimeCheck, LifetimeOpts,
               FeOptions.ClangIRIdiomRecognizer, IdiomRecognizerOpts,
               FeOptions.ClangIRLibOpt, LibOptOpts, PassOptParsingFailure,
-              CodeGenOptions.OptimizationLevel > 0, FlattenCir,
+              CGenOptions.OptimizationLevel > 0, FlattenCir,
               !FeOptions.ClangIRDirectLowering, EnableCcLowering,
               FeOptions.ClangIREnableMem2Reg)
               .failed()) {
         if (!PassOptParsingFailure.empty()) {
-          auto D = DiagnosticsEngine.Report(diag::err_drv_cir_pass_opt_parsing);
+          auto D = DiagEngine.Report(diag::err_drv_cir_pass_opt_parsing);
           D << FeOptions.ClangIRLifetimeCheckOpts;
         } else
           llvm::report_fatal_error("CIR codegen: MLIR pass manager fails "
@@ -306,18 +304,17 @@ class CIRGenConsumer : public clang::ASTConsumer {
     case CIRGenAction::OutputType::EmitAssembly: {
       llvm::LLVMContext LlvmCtx;
       bool DisableDebugInfo =
-          CodeGenOptions.getDebugInfo() == llvm::codegenoptions::NoDebugInfo;
+          CGenOptions.getDebugInfo() == llvm::codegenoptions::NoDebugInfo;
       auto LlvmModule = lowerFromCIRToLLVMIR(
           FeOptions, MlirMod, std::move(MlirCtx), LlvmCtx,
           FeOptions.ClangIRDisableCIRVerifier,
           !FeOptions.ClangIRCallConvLowering, DisableDebugInfo);
 
       BackendAction BackendAction = getBackendActionFromOutputType(Action);
 
-      emitBackendOutput(CompilerInstance, CodeGenOptions,
-                        C.getTargetInfo().getDataLayoutString(),
-                        LlvmModule.get(), BackendAction, FS,
-                        std::move(OutputStream));
+      emitBackendOutput(
+          CompInstance, CGenOptions, C.getTargetInfo().getDataLayoutString(),
+          LlvmModule.get(), BackendAction, FS, std::move(OutputStream));
       break;
     }
     case CIRGenAction::OutputType::None: