https://github.com/anutosh491 created https://github.com/llvm/llvm-project/pull/155400
See https://github.com/llvm/llvm-project/pull/137458#discussion_r2300649286 >From ef003a25307a467d4b9f9e22498c9ac8851c5a02 Mon Sep 17 00:00:00 2001 From: anutosh491 <andersonbhat...@gmail.com> Date: Tue, 26 Aug 2025 17:42:48 +0530 Subject: [PATCH] Put Compiler Instance from IncrementalAction to use for non-assert/assert builds --- clang/lib/Interpreter/IncrementalAction.cpp | 14 +++++++------- clang/lib/Interpreter/IncrementalAction.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/clang/lib/Interpreter/IncrementalAction.cpp b/clang/lib/Interpreter/IncrementalAction.cpp index 67313a8cd2a8c..bf804bd24a959 100644 --- a/clang/lib/Interpreter/IncrementalAction.cpp +++ b/clang/lib/Interpreter/IncrementalAction.cpp @@ -22,25 +22,25 @@ #include "llvm/Support/ErrorHandling.h" namespace clang { -IncrementalAction::IncrementalAction(CompilerInstance &CI, +IncrementalAction::IncrementalAction(CompilerInstance &Instance, llvm::LLVMContext &LLVMCtx, llvm::Error &Err, Interpreter &I, std::unique_ptr<ASTConsumer> Consumer) : WrapperFrontendAction([&]() { llvm::ErrorAsOutParameter EAO(&Err); std::unique_ptr<FrontendAction> Act; - switch (CI.getFrontendOpts().ProgramAction) { + switch (Instance.getFrontendOpts().ProgramAction) { default: Err = llvm::createStringError( std::errc::state_not_recoverable, "Driver initialization failed. " "Incremental mode for action %d is not supported", - CI.getFrontendOpts().ProgramAction); + Instance.getFrontendOpts().ProgramAction); return Act; case frontend::ASTDump: case frontend::ASTPrint: case frontend::ParseSyntaxOnly: - Act = CreateFrontendAction(CI); + Act = CreateFrontendAction(Instance); break; case frontend::PluginAction: case frontend::EmitAssembly: @@ -53,12 +53,12 @@ IncrementalAction::IncrementalAction(CompilerInstance &CI, } return Act; }()), - Interp(I), CI(CI), Consumer(std::move(Consumer)) {} + Interp(I), CI(Instance), Consumer(std::move(Consumer)) {} std::unique_ptr<ASTConsumer> -IncrementalAction::CreateASTConsumer(CompilerInstance &CI, StringRef InFile) { +IncrementalAction::CreateASTConsumer(CompilerInstance & /*CI*/, StringRef InFile) { std::unique_ptr<ASTConsumer> C = - WrapperFrontendAction::CreateASTConsumer(CI, InFile); + WrapperFrontendAction::CreateASTConsumer(this->CI, InFile); if (Consumer) { std::vector<std::unique_ptr<ASTConsumer>> Cs; diff --git a/clang/lib/Interpreter/IncrementalAction.h b/clang/lib/Interpreter/IncrementalAction.h index 92eabacd40074..83cec24caf274 100644 --- a/clang/lib/Interpreter/IncrementalAction.h +++ b/clang/lib/Interpreter/IncrementalAction.h @@ -42,7 +42,7 @@ class IncrementalAction : public WrapperFrontendAction { std::unique_ptr<llvm::Module> CachedInCodeGenModule; public: - IncrementalAction(CompilerInstance &CI, llvm::LLVMContext &LLVMCtx, + IncrementalAction(CompilerInstance &Instance, llvm::LLVMContext &LLVMCtx, llvm::Error &Err, Interpreter &I, std::unique_ptr<ASTConsumer> Consumer = nullptr); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
