Skip to content

Commit 5fa1d9b

Browse files
jansvoboda11jansvoboda11
committed
Make check-clang build
1 parent 858846b commit 5fa1d9b

File tree

64 files changed

+233
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+233
-190
lines changed

‎clang/lib/Interpreter/Interpreter.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ CreateCI(const llvm::opt::ArgStringList &Argv) {
9595

9696
// Buffer diagnostics from argument parsing so that we can output them using
9797
// a well formed diagnostic object.
98-
IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
98+
DiagnosticOptions DiagOpts;
9999
TextDiagnosticBuffer *DiagsBuffer = new TextDiagnosticBuffer;
100-
DiagnosticsEngine Diags(DiagID, &*DiagOpts, DiagsBuffer);
100+
DiagnosticsEngine Diags(DiagID, DiagOpts, DiagsBuffer);
101101
bool Success = CompilerInvocation::CreateFromArgs(
102102
Clang->getInvocation(), llvm::ArrayRef(Argv.begin(), Argv.size()), Diags);
103103

@@ -173,10 +173,10 @@ IncrementalCompilerBuilder::create(std::string TT,
173173
// Buffer diagnostics from argument parsing so that we can output them using a
174174
// well formed diagnostic object.
175175
IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
176-
IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts =
176+
std::unique_ptr<DiagnosticOptions> DiagOpts =
177177
CreateAndPopulateDiagOpts(ClangArgv);
178178
TextDiagnosticBuffer *DiagsBuffer = new TextDiagnosticBuffer;
179-
DiagnosticsEngine Diags(DiagID, &*DiagOpts, DiagsBuffer);
179+
DiagnosticsEngine Diags(DiagID, *DiagOpts, DiagsBuffer);
180180

181181
driver::Driver Driver(/*MainBinaryName=*/ClangArgv[0], TT, Diags);
182182
Driver.setCheckInputsExist(false); // the input comes from mem buffers

‎clang/lib/Testing/TestAST.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class StoreDiagnostics : public DiagnosticConsumer {
4444
std::string Text;
4545
llvm::raw_string_ostream OS(Text);
4646
TextDiagnostic Renderer(OS, LangOpts,
47-
&Info.getDiags()->getDiagnosticOptions());
47+
Info.getDiags()->getDiagnosticOptions());
4848
Renderer.emitStoredDiagnostic(Out.back());
4949
ADD_FAILURE() << Text;
5050
}

‎clang/lib/Tooling/CompilationDatabase.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,13 @@ std::string GetClangToolCommand() {
243243
static bool stripPositionalArgs(std::vector<const char *> Args,
244244
std::vector<std::string> &Result,
245245
std::string &ErrorMsg) {
246-
IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
246+
DiagnosticOptions DiagOpts;
247247
llvm::raw_string_ostream Output(ErrorMsg);
248-
TextDiagnosticPrinter DiagnosticPrinter(Output, &*DiagOpts);
248+
TextDiagnosticPrinter DiagnosticPrinter(Output, DiagOpts);
249249
UnusedInputDiagConsumer DiagClient(DiagnosticPrinter);
250250
DiagnosticsEngine Diagnostics(
251251
IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()),
252-
&*DiagOpts, &DiagClient, false);
252+
DiagOpts, &DiagClient, false);
253253

254254
// The clang executable path isn't required since the jobs the driver builds
255255
// will not be executed.

‎clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ llvm::Error DependencyScanningWorker::computeDependencies(
642642
std::string DiagnosticOutput;
643643
llvm::raw_string_ostream DiagnosticsOS(DiagnosticOutput);
644644
auto DiagOpts = createDiagOptions(CommandLine);
645-
TextDiagnosticPrinter DiagPrinter(DiagnosticsOS, DiagOpts.release());
645+
TextDiagnosticPrinter DiagPrinter(DiagnosticsOS, *DiagOpts);
646646

647647
if (computeDependencies(WorkingDirectory, CommandLine, Consumer, Controller,
648648
DiagPrinter, TUBuffer))
@@ -660,7 +660,7 @@ llvm::Error DependencyScanningWorker::computeDependencies(
660660
std::string DiagnosticOutput;
661661
llvm::raw_string_ostream DiagnosticsOS(DiagnosticOutput);
662662
auto DiagOpts = createDiagOptions(CommandLine);
663-
TextDiagnosticPrinter DiagPrinter(DiagnosticsOS, DiagOpts.release());
663+
TextDiagnosticPrinter DiagPrinter(DiagnosticsOS, *DiagOpts);
664664

665665
if (computeDependencies(WorkingDirectory, CommandLine, Consumer, Controller,
666666
DiagPrinter, ModuleName))
@@ -744,7 +744,7 @@ bool DependencyScanningWorker::scanDependencies(
744744
sanitizeDiagOpts(*DiagOpts);
745745
IntrusiveRefCntPtr<DiagnosticsEngine> Diags =
746746
CompilerInstance::createDiagnostics(FileMgr->getVirtualFileSystem(),
747-
DiagOpts.release(), &DC,
747+
*DiagOpts, &DC,
748748
/*ShouldOwnClient=*/false);
749749

750750
// Although `Diagnostics` are used only for command-line parsing, the

‎clang/lib/Tooling/Refactoring.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ int RefactoringTool::runAndSave(FrontendActionFactory *ActionFactory) {
3939
}
4040

4141
LangOptions DefaultLangOptions;
42-
IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
43-
TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), &*DiagOpts);
42+
DiagnosticOptions DiagOpts;
43+
TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), DiagOpts);
4444
DiagnosticsEngine Diagnostics(
4545
IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()),
46-
&*DiagOpts, &DiagnosticPrinter, false);
46+
DiagOpts, &DiagnosticPrinter, false);
4747
SourceManager Sources(Diagnostics, getFiles());
4848
Rewriter Rewrite(Sources, DefaultLangOptions);
4949

‎clang/lib/Tooling/Tooling.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,17 +377,17 @@ bool ToolInvocation::run() {
377377

378378
// Parse diagnostic options from the driver command-line only if none were
379379
// explicitly set.
380-
IntrusiveRefCntPtr<DiagnosticOptions> ParsedDiagOpts;
380+
std::unique_ptr<DiagnosticOptions> ParsedDiagOpts;
381381
DiagnosticOptions *DiagOpts = this->DiagOpts;
382382
if (!DiagOpts) {
383383
ParsedDiagOpts = CreateAndPopulateDiagOpts(Argv);
384384
DiagOpts = &*ParsedDiagOpts;
385385
}
386386

387-
TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), DiagOpts);
387+
TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), *DiagOpts);
388388
IntrusiveRefCntPtr<DiagnosticsEngine> Diagnostics =
389389
CompilerInstance::createDiagnostics(
390-
Files->getVirtualFileSystem(), &*DiagOpts,
390+
Files->getVirtualFileSystem(), *DiagOpts,
391391
DiagConsumer ? DiagConsumer : &DiagnosticPrinter, false);
392392
// Although `Diagnostics` are used only for command-line parsing, the custom
393393
// `DiagConsumer` might expect a `SourceManager` to be present.
@@ -654,7 +654,7 @@ class ASTBuilderAction : public ToolAction {
654654
std::unique_ptr<ASTUnit> AST = ASTUnit::LoadFromCompilerInvocation(
655655
Invocation, std::move(PCHContainerOps),
656656
CompilerInstance::createDiagnostics(Files->getVirtualFileSystem(),
657-
&Invocation->getDiagnosticOpts(),
657+
Invocation->getDiagnosticOpts(),
658658
DiagConsumer,
659659
/*ShouldOwnClient=*/false),
660660
Files);

‎clang/tools/c-index-test/core_main.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,10 @@ static bool printSourceSymbols(const char *Executable,
220220
SmallVector<const char *, 4> ArgsWithProgName;
221221
ArgsWithProgName.push_back(Executable);
222222
ArgsWithProgName.append(Args.begin(), Args.end());
223+
DiagnosticOptions DiagOpts;
223224
IntrusiveRefCntPtr<DiagnosticsEngine> Diags(
224225
CompilerInstance::createDiagnostics(*llvm::vfs::getRealFileSystem(),
225-
new DiagnosticOptions));
226+
DiagOpts));
226227
CreateInvocationOptions CIOpts;
227228
CIOpts.Diags = Diags;
228229
CIOpts.ProbePrecompiled = true; // FIXME: historical default. Needed?
@@ -274,9 +275,10 @@ static bool printSourceSymbolsFromModule(StringRef modulePath,
274275

275276
HeaderSearchOptions HSOpts;
276277

278+
DiagnosticOptions DiagOpts;
277279
IntrusiveRefCntPtr<DiagnosticsEngine> Diags =
278280
CompilerInstance::createDiagnostics(*llvm::vfs::getRealFileSystem(),
279-
new DiagnosticOptions());
281+
DiagOpts);
280282
std::unique_ptr<ASTUnit> AU =
281283
ASTUnit::LoadFromASTFile(modulePath, *pchRdr, ASTUnit::LoadASTOnly, Diags,
282284
FileSystemOpts, HSOpts, /*LangOpts=*/nullptr,

‎clang/tools/clang-extdef-mapping/ClangExtDefMapGen.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,21 +123,21 @@ static cl::extrahelp CommonHelp(CommonOptionsParser::HelpMessage);
123123

124124
static IntrusiveRefCntPtr<DiagnosticsEngine> Diags;
125125

126-
IntrusiveRefCntPtr<DiagnosticsEngine> GetDiagnosticsEngine() {
126+
IntrusiveRefCntPtr<DiagnosticsEngine>
127+
GetDiagnosticsEngine(DiagnosticOptions &DiagOpts) {
127128
if (Diags) {
128129
// Call reset to make sure we don't mix errors
129130
Diags->Reset(false);
130131
return Diags;
131132
}
132133

133-
IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
134134
TextDiagnosticPrinter *DiagClient =
135-
new TextDiagnosticPrinter(llvm::errs(), &*DiagOpts);
135+
new TextDiagnosticPrinter(llvm::errs(), DiagOpts);
136136
DiagClient->setPrefix("clang-extdef-mappping");
137137
IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
138138

139139
IntrusiveRefCntPtr<DiagnosticsEngine> DiagEngine(
140-
new DiagnosticsEngine(DiagID, &*DiagOpts, DiagClient));
140+
new DiagnosticsEngine(DiagID, DiagOpts, DiagClient));
141141
Diags.swap(DiagEngine);
142142

143143
// Retain this one time so it's not destroyed by ASTUnit::LoadFromASTFile
@@ -152,7 +152,9 @@ static bool HandleAST(StringRef AstPath) {
152152
if (!CI)
153153
CI = new CompilerInstance();
154154

155-
IntrusiveRefCntPtr<DiagnosticsEngine> DiagEngine = GetDiagnosticsEngine();
155+
DiagnosticOptions DiagOpts;
156+
IntrusiveRefCntPtr<DiagnosticsEngine> DiagEngine =
157+
GetDiagnosticsEngine(DiagOpts);
156158

157159
std::unique_ptr<ASTUnit> Unit = ASTUnit::LoadFromASTFile(
158160
AstPath, CI->getPCHContainerOperations()->getRawReader(),

‎clang/tools/clang-format/ClangFormat.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,10 @@ static bool fillRanges(MemoryBuffer *Code,
240240
IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
241241
new llvm::vfs::InMemoryFileSystem);
242242
FileManager Files(FileSystemOptions(), InMemoryFileSystem);
243+
DiagnosticOptions DiagOpts;
243244
DiagnosticsEngine Diagnostics(
244245
IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs),
245-
new DiagnosticOptions);
246+
DiagOpts);
246247
SourceManager Sources(Diagnostics, Files);
247248
FileID ID = createInMemoryFile("<irrelevant>", *Code, Sources, Files,
248249
InMemoryFileSystem.get());
@@ -520,10 +521,10 @@ static bool format(StringRef FileName, bool ErrorOnIncompleteFormat = false) {
520521
new llvm::vfs::InMemoryFileSystem);
521522
FileManager Files(FileSystemOptions(), InMemoryFileSystem);
522523

523-
IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts(new DiagnosticOptions());
524+
DiagnosticOptions DiagOpts;
524525
ClangFormatDiagConsumer IgnoreDiagnostics;
525526
DiagnosticsEngine Diagnostics(
526-
IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs), &*DiagOpts,
527+
IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs), DiagOpts,
527528
&IgnoreDiagnostics, false);
528529
SourceManager Sources(Diagnostics, Files);
529530
FileID ID = createInMemoryFile(AssumedFileName, *Code, Sources, Files,

‎clang/tools/clang-import-test/clang-import-test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ class TestDiagnosticConsumer : public DiagnosticConsumer {
162162
};
163163

164164
std::unique_ptr<CompilerInstance> BuildCompilerInstance() {
165-
auto DiagOpts = llvm::makeIntrusiveRefCnt<DiagnosticOptions>();
165+
DiagnosticOptions DiagOpts;
166166
auto DC = std::make_unique<TestDiagnosticConsumer>();
167167
auto Diags = CompilerInstance::createDiagnostics(
168-
*llvm::vfs::getRealFileSystem(), DiagOpts.get(), DC.get(),
168+
*llvm::vfs::getRealFileSystem(), DiagOpts, DC.get(),
169169
/*ShouldOwnClient=*/false);
170170

171171
auto Inv = std::make_unique<CompilerInvocation>();

0 commit comments

Comments
 (0)