Skip to content

Commit 7b45d90

Browse files
jansvoboda11jansvoboda11
committed
[clang][frontend] Require invocation for CompilerInstance construction
1 parent 4c0ea47 commit 7b45d90

33 files changed

+102
-143
lines changed

‎clang-tools-extra/clang-include-fixer/IncludeFixer.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ bool IncludeFixerActionFactory::runInvocation(
8989
assert(Invocation->getFrontendOpts().Inputs.size() == 1);
9090

9191
// Set up Clang.
92-
clang::CompilerInstance Compiler(PCHContainerOps);
93-
Compiler.setInvocation(std::move(Invocation));
92+
CompilerInstance Compiler(std::move(Invocation), std::move(PCHContainerOps));
9493
Compiler.setFileManager(Files);
9594

9695
// Create the compiler's actual diagnostics engine. We want to drop all

‎clang-tools-extra/clangd/Compiler.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,7 @@ prepareCompilerInstance(std::unique_ptr<clang::CompilerInvocation> CI,
145145
CI->getFrontendOpts().Inputs[0].getFile(), Buffer.get());
146146
}
147147

148-
auto Clang = std::make_unique<CompilerInstance>(
149-
std::make_shared<PCHContainerOperations>());
150-
Clang->setInvocation(std::move(CI));
148+
auto Clang = std::make_unique<CompilerInstance>(std::move(CI));
151149
Clang->createDiagnostics(*VFS, &DiagsClient, false);
152150

153151
if (auto VFSWithRemapping = createVFSFromCompilerInvocation(

‎clang-tools-extra/include-cleaner/unittests/RecordTest.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -618,14 +618,14 @@ TEST_F(PragmaIncludeTest, ExportInUnnamedBuffer) {
618618
llvm::MemoryBuffer::getMemBufferCopy(Extra.getValue(),
619619
/*BufferName=*/""));
620620

621-
auto Clang = std::make_unique<CompilerInstance>(
622-
std::make_shared<PCHContainerOperations>());
623-
Clang->createDiagnostics(*VFS);
621+
auto DiagOpts = llvm::makeIntrusiveRefCnt<DiagnosticOptions>();
622+
auto Diags = CompilerInstance::createDiagnostics(*VFS, DiagOpts.get());
623+
auto Invocation = std::make_unique<CompilerInvocation>();
624+
ASSERT_TRUE(CompilerInvocation::CreateFromArgs(*Invocation, {Filename.data()},
625+
*Diags, "clang"));
624626

625-
Clang->setInvocation(std::make_unique<CompilerInvocation>());
626-
ASSERT_TRUE(CompilerInvocation::CreateFromArgs(
627-
Clang->getInvocation(), {Filename.data()}, Clang->getDiagnostics(),
628-
"clang"));
627+
auto Clang = std::make_unique<CompilerInstance>(std::move(Invocation));
628+
Clang->createDiagnostics(*VFS);
629629

630630
auto *FM = Clang->createFileManager(VFS);
631631
ASSERT_TRUE(Clang->ExecuteAction(*Inputs.MakeAction()));

‎clang/include/clang/Frontend/CompilerInstance.h‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@ class CompilerInstance : public ModuleLoader {
197197
void operator=(const CompilerInstance &) = delete;
198198
public:
199199
explicit CompilerInstance(
200+
std::shared_ptr<CompilerInvocation> Invocation =
201+
std::make_shared<CompilerInvocation>(),
200202
std::shared_ptr<PCHContainerOperations> PCHContainerOps =
201203
std::make_shared<PCHContainerOperations>(),
202204
ModuleCache *ModCache = nullptr);
@@ -244,18 +246,10 @@ class CompilerInstance : public ModuleLoader {
244246
/// @name Compiler Invocation and Options
245247
/// @{
246248

247-
bool hasInvocation() const { return Invocation != nullptr; }
248-
249-
CompilerInvocation &getInvocation() {
250-
assert(Invocation && "Compiler instance has no invocation!");
251-
return *Invocation;
252-
}
249+
CompilerInvocation &getInvocation() { return *Invocation; }
253250

254251
std::shared_ptr<CompilerInvocation> getInvocationPtr() { return Invocation; }
255252

256-
/// setInvocation - Replace the current invocation.
257-
void setInvocation(std::shared_ptr<CompilerInvocation> Value);
258-
259253
/// Indicates whether we should (re)build the global module index.
260254
bool shouldBuildGlobalModuleIndex() const;
261255

‎clang/lib/Frontend/ASTUnit.cpp‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,9 +1162,8 @@ bool ASTUnit::Parse(std::shared_ptr<PCHContainerOperations> PCHContainerOps,
11621162
}
11631163

11641164
// Create the compiler instance to use for building the AST.
1165-
std::unique_ptr<CompilerInstance> Clang(
1166-
new CompilerInstance(std::move(PCHContainerOps)));
1167-
Clang->setInvocation(CCInvocation);
1165+
auto Clang = std::make_unique<CompilerInstance>(CCInvocation,
1166+
std::move(PCHContainerOps));
11681167

11691168
// Clean up on error, disengage it if the function returns successfully.
11701169
auto CleanOnError = llvm::make_scope_exit([&]() {
@@ -1486,7 +1485,6 @@ void ASTUnit::RealizeTopLevelDeclsFromPreamble() {
14861485
void ASTUnit::transferASTDataFromCompilerInstance(CompilerInstance &CI) {
14871486
// Steal the created target, context, and preprocessor if they have been
14881487
// created.
1489-
assert(CI.hasInvocation() && "missing invocation");
14901488
LangOpts = CI.getInvocation().LangOpts;
14911489
TheSema = CI.takeSema();
14921490
Consumer = CI.takeASTConsumer();
@@ -1596,14 +1594,13 @@ ASTUnit *ASTUnit::LoadFromCompilerInvocationAction(
15961594
AST->getFileManager().getVirtualFileSystem());
15971595

15981596
// Create the compiler instance to use for building the AST.
1599-
std::unique_ptr<CompilerInstance> Clang(
1600-
new CompilerInstance(std::move(PCHContainerOps)));
1597+
auto Clang = std::make_unique<CompilerInstance>(std::move(CI),
1598+
std::move(PCHContainerOps));
16011599

16021600
// Recover resources if we crash before exiting this method.
16031601
llvm::CrashRecoveryContextCleanupRegistrar<CompilerInstance>
16041602
CICleanup(Clang.get());
16051603

1606-
Clang->setInvocation(std::move(CI));
16071604
AST->OriginalSourceFile =
16081605
std::string(Clang->getFrontendOpts().Inputs[0].getFile());
16091606

@@ -2227,15 +2224,14 @@ void ASTUnit::CodeComplete(
22272224
LangOpts.SpellChecking = false;
22282225
CCInvocation->getDiagnosticOpts().IgnoreWarnings = true;
22292226

2230-
std::unique_ptr<CompilerInstance> Clang(
2231-
new CompilerInstance(PCHContainerOps));
2227+
auto Clang = std::make_unique<CompilerInstance>(std::move(CCInvocation),
2228+
PCHContainerOps);
22322229

22332230
// Recover resources if we crash before exiting this method.
22342231
llvm::CrashRecoveryContextCleanupRegistrar<CompilerInstance>
22352232
CICleanup(Clang.get());
22362233

2237-
auto &Inv = *CCInvocation;
2238-
Clang->setInvocation(std::move(CCInvocation));
2234+
auto &Inv = Clang->getInvocation();
22392235
OriginalSourceFile =
22402236
std::string(Clang->getFrontendOpts().Inputs[0].getFile());
22412237

@@ -2249,7 +2245,6 @@ void ASTUnit::CodeComplete(
22492245

22502246
// Create the target instance.
22512247
if (!Clang->createTarget()) {
2252-
Clang->setInvocation(nullptr);
22532248
return;
22542249
}
22552250

‎clang/lib/Frontend/ChainedIncludesSource.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,8 @@ IntrusiveRefCntPtr<ExternalSemaSource> clang::createChainedIncludesSource(
122122
IntrusiveRefCntPtr<DiagnosticsEngine> Diags(
123123
new DiagnosticsEngine(DiagID, &CI.getDiagnosticOpts(), DiagClient));
124124

125-
std::unique_ptr<CompilerInstance> Clang(
126-
new CompilerInstance(CI.getPCHContainerOperations()));
127-
Clang->setInvocation(std::move(CInvok));
125+
auto Clang = std::make_unique<CompilerInstance>(
126+
std::move(CInvok), CI.getPCHContainerOperations());
128127
Clang->setDiagnostics(Diags.get());
129128
Clang->setTarget(TargetInfo::CreateTargetInfo(
130129
Clang->getDiagnostics(), Clang->getInvocation().TargetOpts));

‎clang/lib/Frontend/CompilerInstance.cpp‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,20 @@
6767
using namespace clang;
6868

6969
CompilerInstance::CompilerInstance(
70+
std::shared_ptr<CompilerInvocation> Invocation,
7071
std::shared_ptr<PCHContainerOperations> PCHContainerOps,
7172
ModuleCache *ModCache)
7273
: ModuleLoader(/*BuildingModule=*/ModCache),
73-
Invocation(new CompilerInvocation()),
74+
Invocation(std::move(Invocation)),
7475
ModCache(ModCache ? ModCache : createCrossProcessModuleCache()),
75-
ThePCHContainerOperations(std::move(PCHContainerOps)) {}
76+
ThePCHContainerOperations(std::move(PCHContainerOps)) {
77+
assert(this->Invocation && "Invocation must not be null");
78+
}
7679

7780
CompilerInstance::~CompilerInstance() {
7881
assert(OutputFiles.empty() && "Still output files in flight?");
7982
}
8083

81-
void CompilerInstance::setInvocation(
82-
std::shared_ptr<CompilerInvocation> Value) {
83-
Invocation = std::move(Value);
84-
}
85-
8684
bool CompilerInstance::shouldBuildGlobalModuleIndex() const {
8785
return (BuildGlobalModuleIndex ||
8886
(TheASTReader && TheASTReader->isGlobalIndexUnavailable() &&
@@ -1207,11 +1205,10 @@ std::unique_ptr<CompilerInstance> CompilerInstance::cloneForModuleCompileImpl(
12071205
// CompilerInstance::CompilerInstance is responsible for finalizing the
12081206
// buffers to prevent use-after-frees.
12091207
auto InstancePtr = std::make_unique<CompilerInstance>(
1210-
getPCHContainerOperations(), &getModuleCache());
1208+
std::move(Invocation), getPCHContainerOperations(), &getModuleCache());
12111209
auto &Instance = *InstancePtr;
12121210

1213-
auto &Inv = *Invocation;
1214-
Instance.setInvocation(std::move(Invocation));
1211+
auto &Inv = Instance.getInvocation();
12151212

12161213
if (VFS) {
12171214
Instance.createFileManager(std::move(VFS));

‎clang/lib/Frontend/PrecompiledPreamble.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,14 +454,13 @@ llvm::ErrorOr<PrecompiledPreamble> PrecompiledPreamble::Build(
454454
PreprocessorOpts.GeneratePreamble = true;
455455

456456
// Create the compiler instance to use for building the precompiled preamble.
457-
std::unique_ptr<CompilerInstance> Clang(
458-
new CompilerInstance(std::move(PCHContainerOps)));
457+
auto Clang = std::make_unique<CompilerInstance>(
458+
std::move(PreambleInvocation), std::move(PCHContainerOps));
459459

460460
// Recover resources if we crash before exiting this method.
461461
llvm::CrashRecoveryContextCleanupRegistrar<CompilerInstance> CICleanup(
462462
Clang.get());
463463

464-
Clang->setInvocation(std::move(PreambleInvocation));
465464
Clang->setDiagnostics(&Diagnostics);
466465

467466
// Create the target instance.

‎clang/lib/Frontend/Rewrite/FrontendActions.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,9 @@ class RewriteIncludesAction::RewriteImportsListener : public ASTReaderListener {
242242
(*OS) << '\n';
243243

244244
// Rewrite the contents of the module in a separate compiler instance.
245-
CompilerInstance Instance(CI.getPCHContainerOperations(),
245+
CompilerInstance Instance(std::make_shared<CompilerInvocation>(CI.getInvocation()),
246+
CI.getPCHContainerOperations(),
246247
&CI.getModuleCache());
247-
Instance.setInvocation(
248-
std::make_shared<CompilerInvocation>(CI.getInvocation()));
249248
Instance.createDiagnostics(
250249
CI.getVirtualFileSystem(),
251250
new ForwardingDiagnosticConsumer(CI.getDiagnosticClient()),

‎clang/lib/StaticAnalyzer/Frontend/ModelInjector.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ void ModelInjector::onBodySynthesis(const NamedDecl *D) {
7575

7676
// Modules are parsed by a separate CompilerInstance, so this code mimics that
7777
// behavior for models
78-
CompilerInstance Instance(CI.getPCHContainerOperations());
79-
Instance.setInvocation(std::move(Invocation));
78+
CompilerInstance Instance(std::move(Invocation),
79+
CI.getPCHContainerOperations());
8080
Instance.createDiagnostics(
8181
CI.getVirtualFileSystem(),
8282
new ForwardingDiagnosticConsumer(CI.getDiagnosticClient()),

0 commit comments

Comments
 (0)