Skip to content

Commit 2b93431

Browse files
davidungargraydon
davidungar
authored and
graydon
committed
Remove now-unneeded argument from finishProcessing.
1 parent 1c31ce1 commit 2b93431

File tree

7 files changed

+23
-22
lines changed

7 files changed

+23
-22
lines changed

‎include/swift/AST/DiagnosticConsumer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class DiagnosticConsumer {
100100
const DiagnosticInfo &Info) = 0;
101101

102102
/// \returns true if an error occurred while finishing-up.
103-
virtual bool finishProcessing(SourceManager &SM) { return false; }
103+
virtual bool finishProcessing() { return false; }
104104

105105
/// In batch mode, any error causes failure for all primary files, but
106106
/// anyone consulting .dia files will only see an error for a particular
@@ -202,7 +202,7 @@ class FileSpecificDiagnosticConsumer : public DiagnosticConsumer {
202202
ArrayRef<DiagnosticArgument> FormatArgs,
203203
const DiagnosticInfo &Info) override;
204204

205-
bool finishProcessing(SourceManager &) override;
205+
bool finishProcessing() override;
206206

207207
private:
208208
/// In batch mode, any error causes failure for all primary files, but

‎include/swift/AST/DiagnosticEngine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ namespace swift {
759759

760760
/// \returns true if any diagnostic consumer gave an error while invoking
761761
//// \c finishProcessing.
762-
bool finishProcessing(SourceManager &);
762+
bool finishProcessing();
763763

764764
/// \brief Format the given diagnostic text and place the result in the given
765765
/// buffer.

‎lib/AST/DiagnosticConsumer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ void FileSpecificDiagnosticConsumer::handleDiagnostic(
189189
Kind == DiagnosticKind::Error;
190190
}
191191

192-
bool FileSpecificDiagnosticConsumer::finishProcessing(SourceManager &SM) {
192+
bool FileSpecificDiagnosticConsumer::finishProcessing() {
193193
tellSubconsumersToInformDriverOfIncompleteBatchModeCompilation();
194194

195195
// Deliberately don't use std::any_of here because we don't want early-exit
196196
// behavior.
197197

198198
bool hadError = false;
199199
for (auto &subConsumer : SubConsumers)
200-
hadError |= subConsumer.second && subConsumer.second->finishProcessing(SM);
200+
hadError |= subConsumer.second && subConsumer.second->finishProcessing();
201201
return hadError;
202202
}
203203

‎lib/AST/DiagnosticEngine.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,10 @@ bool DiagnosticEngine::isDiagnosticPointsToFirstBadToken(DiagID ID) const {
251251
return storedDiagnosticInfos[(unsigned) ID].pointsToFirstBadToken;
252252
}
253253

254-
bool DiagnosticEngine::finishProcessing(SourceManager &SM) {
254+
bool DiagnosticEngine::finishProcessing() {
255255
bool hadError = false;
256256
for (auto &Consumer : Consumers) {
257-
hadError |= Consumer->finishProcessing(SM);
257+
hadError |= Consumer->finishProcessing();
258258
}
259259
return hadError;
260260
}

‎lib/Frontend/SerializedDiagnosticConsumer.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class SerializedDiagnosticConsumer : public DiagnosticConsumer {
142142
assert(CalledFinishProcessing && "did not call finishProcessing()");
143143
}
144144

145-
bool finishProcessing(SourceManager &SM) override {
145+
bool finishProcessing() override {
146146
assert(!CalledFinishProcessing &&
147147
"called finishProcessing() multiple times");
148148
CalledFinishProcessing = true;
@@ -162,7 +162,8 @@ class SerializedDiagnosticConsumer : public DiagnosticConsumer {
162162
llvm::sys::fs::F_None));
163163
if (EC) {
164164
// Create a temporary diagnostics engine to print the error to stderr.
165-
DiagnosticEngine DE(SM);
165+
SourceManager dummyMgr;
166+
DiagnosticEngine DE(dummyMgr);
166167
PrintingDiagnosticConsumer PDC;
167168
DE.addConsumer(PDC);
168169
DE.diagnose(SourceLoc(), diag::cannot_open_serialized_file,

‎lib/FrontendTool/FrontendTool.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ class JSONFixitWriter
404404
}
405405
}
406406

407-
bool finishProcessing(SourceManager &) override {
407+
bool finishProcessing() override {
408408
std::error_code EC;
409409
std::unique_ptr<llvm::raw_fd_ostream> OS;
410410
OS.reset(new llvm::raw_fd_ostream(FixitsOutputPath,
@@ -1651,7 +1651,7 @@ int swift::performFrontend(ArrayRef<const char *> Args,
16511651

16521652
auto finishDiagProcessing = [&](int retValue) -> int {
16531653
FinishDiagProcessingCheckRAII.CalledFinishDiagProcessing = true;
1654-
bool err = Instance->getDiags().finishProcessing(Instance->getSourceMgr());
1654+
bool err = Instance->getDiags().finishProcessing();
16551655
return retValue ? retValue : err;
16561656
};
16571657

‎unittests/AST/DiagnosticConsumerTests.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace {
4343
expected.erase(expected.begin());
4444
}
4545

46-
bool finishProcessing(SourceManager &) override {
46+
bool finishProcessing() override {
4747
EXPECT_FALSE(hasFinished);
4848
if (previous)
4949
EXPECT_TRUE(previous->hasFinished);
@@ -68,7 +68,7 @@ TEST(FileSpecificDiagnosticConsumer, SubConsumersFinishInOrder) {
6868
consumers.emplace_back("", std::move(consumerUnaffiliated));
6969

7070
FileSpecificDiagnosticConsumer topConsumer(consumers);
71-
topConsumer.finishProcessing(sourceMgr);
71+
topConsumer.finishProcessing();
7272
}
7373

7474
TEST(FileSpecificDiagnosticConsumer, InvalidLocDiagsGoToEveryConsumer) {
@@ -89,7 +89,7 @@ TEST(FileSpecificDiagnosticConsumer, InvalidLocDiagsGoToEveryConsumer) {
8989
FileSpecificDiagnosticConsumer topConsumer(consumers);
9090
topConsumer.handleDiagnostic(sourceMgr, SourceLoc(), DiagnosticKind::Error,
9191
"dummy", {}, DiagnosticInfo());
92-
topConsumer.finishProcessing(sourceMgr);
92+
topConsumer.finishProcessing();
9393
}
9494

9595
TEST(FileSpecificDiagnosticConsumer, ErrorsWithLocationsGoToExpectedConsumers) {
@@ -139,7 +139,7 @@ TEST(FileSpecificDiagnosticConsumer, ErrorsWithLocationsGoToExpectedConsumers) {
139139
"back", {}, DiagnosticInfo());
140140
topConsumer.handleDiagnostic(sourceMgr, backOfB, DiagnosticKind::Error,
141141
"back", {}, DiagnosticInfo());
142-
topConsumer.finishProcessing(sourceMgr);
142+
topConsumer.finishProcessing();
143143
}
144144

145145
TEST(FileSpecificDiagnosticConsumer,
@@ -193,7 +193,7 @@ TEST(FileSpecificDiagnosticConsumer,
193193
"back", {}, DiagnosticInfo());
194194
topConsumer.handleDiagnostic(sourceMgr, backOfB, DiagnosticKind::Error,
195195
"back", {}, DiagnosticInfo());
196-
topConsumer.finishProcessing(sourceMgr);
196+
topConsumer.finishProcessing();
197197
}
198198

199199
TEST(FileSpecificDiagnosticConsumer, WarningsAndRemarksAreTreatedLikeErrors) {
@@ -234,7 +234,7 @@ TEST(FileSpecificDiagnosticConsumer, WarningsAndRemarksAreTreatedLikeErrors) {
234234
"remark", {}, DiagnosticInfo());
235235
topConsumer.handleDiagnostic(sourceMgr, frontOfB, DiagnosticKind::Remark,
236236
"remark", {}, DiagnosticInfo());
237-
topConsumer.finishProcessing(sourceMgr);
237+
topConsumer.finishProcessing();
238238
}
239239

240240
TEST(FileSpecificDiagnosticConsumer, NotesAreAttachedToErrors) {
@@ -296,7 +296,7 @@ TEST(FileSpecificDiagnosticConsumer, NotesAreAttachedToErrors) {
296296
"note", {}, DiagnosticInfo());
297297
topConsumer.handleDiagnostic(sourceMgr, backOfA, DiagnosticKind::Note,
298298
"note", {}, DiagnosticInfo());
299-
topConsumer.finishProcessing(sourceMgr);
299+
topConsumer.finishProcessing();
300300
}
301301

302302
TEST(FileSpecificDiagnosticConsumer, NotesAreAttachedToWarningsAndRemarks) {
@@ -358,7 +358,7 @@ TEST(FileSpecificDiagnosticConsumer, NotesAreAttachedToWarningsAndRemarks) {
358358
"note", {}, DiagnosticInfo());
359359
topConsumer.handleDiagnostic(sourceMgr, backOfA, DiagnosticKind::Note,
360360
"note", {}, DiagnosticInfo());
361-
topConsumer.finishProcessing(sourceMgr);
361+
topConsumer.finishProcessing();
362362
}
363363

364364
TEST(FileSpecificDiagnosticConsumer, NotesAreAttachedToErrorsEvenAcrossFiles) {
@@ -417,7 +417,7 @@ TEST(FileSpecificDiagnosticConsumer, NotesAreAttachedToErrorsEvenAcrossFiles) {
417417
"note", {}, DiagnosticInfo());
418418
topConsumer.handleDiagnostic(sourceMgr, backOfA, DiagnosticKind::Note,
419419
"note", {}, DiagnosticInfo());
420-
topConsumer.finishProcessing(sourceMgr);
420+
topConsumer.finishProcessing();
421421
}
422422

423423
TEST(FileSpecificDiagnosticConsumer,
@@ -480,7 +480,7 @@ TEST(FileSpecificDiagnosticConsumer,
480480
"note", {}, DiagnosticInfo());
481481
topConsumer.handleDiagnostic(sourceMgr, backOfA, DiagnosticKind::Note,
482482
"note", {}, DiagnosticInfo());
483-
topConsumer.finishProcessing(sourceMgr);
483+
topConsumer.finishProcessing();
484484
}
485485

486486

@@ -529,5 +529,5 @@ TEST(FileSpecificDiagnosticConsumer,
529529
"error", {}, DiagnosticInfo());
530530
topConsumer.handleDiagnostic(sourceMgr, SourceLoc(), DiagnosticKind::Note,
531531
"note", {}, DiagnosticInfo());
532-
topConsumer.finishProcessing(sourceMgr);
532+
topConsumer.finishProcessing();
533533
}

0 commit comments

Comments
 (0)