Skip to content

[clang-repl] Put CompilerInstance from IncrementalAction to use for non-assert/assert builds #155400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 27, 2025
Merged

[clang-repl] Put CompilerInstance from IncrementalAction to use for non-assert/assert builds #155400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef003a2
Put Compiler Instance from IncrementalAction to use for non-assert/as…
anutosh491 Aug 26, 2025
94cedbf
formatting
anutosh491 Aug 26, 2025
5b08588
Merge branch 'main' into fix_ci_warning
anutosh491 Aug 26, 2025
3a8692e
Merge branch 'main' into fix_ci_warning
anutosh491 Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions clang/lib/Interpreter/IncrementalAction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -53,12 +53,13 @@ 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;
Expand Down Expand Up @@ -148,4 +149,4 @@ bool InProcessPrintingASTConsumer::HandleTopLevelDecl(DeclGroupRef DGR) {
return MultiplexConsumer::HandleTopLevelDecl(DGR);
}

} // namespace clang
} // namespace clang
2 changes: 1 addition & 1 deletion clang/lib/Interpreter/IncrementalAction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down