Skip to content

Commit 44daa88

Browse files
author
David Ungar
committed
Format
1 parent 9cc3a4a commit 44daa88

20 files changed

+107
-79
lines changed

‎include/swift/AST/DiagnosticConsumer.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,12 @@ class DiagnosticConsumer {
9494
/// \param FormatArgs The diagnostic format string arguments.
9595
///
9696
/// \param Info Extra information associated with the diagnostic.
97-
virtual void handleDiagnostic(SourceManager &SM, SourceLoc Loc,
98-
DiagnosticKind Kind, StringRef FormatString,
99-
ArrayRef<DiagnosticArgument> FormatArgs,
100-
const DiagnosticInfo &Info,
101-
SourceLoc bufferIndirectlyCausingDiagnostic) = 0;
97+
virtual void
98+
handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
99+
StringRef FormatString,
100+
ArrayRef<DiagnosticArgument> FormatArgs,
101+
const DiagnosticInfo &Info,
102+
SourceLoc bufferIndirectlyCausingDiagnostic) = 0;
102103

103104
/// \returns true if an error occurred while finishing-up.
104105
virtual bool finishProcessing() { return false; }
@@ -310,9 +311,8 @@ class FileSpecificDiagnosticConsumer : public DiagnosticConsumer {
310311
subconsumerForLocation(SourceManager &SM, SourceLoc loc);
311312

312313
Optional<FileSpecificDiagnosticConsumer::Subconsumer *>
313-
findSubconsumer(SourceManager &SM, SourceLoc loc,
314-
DiagnosticKind Kind,
315-
SourceLoc bufferIndirectlyCausingDiagnostic);
314+
findSubconsumer(SourceManager &SM, SourceLoc loc, DiagnosticKind Kind,
315+
SourceLoc bufferIndirectlyCausingDiagnostic);
316316

317317
Optional<FileSpecificDiagnosticConsumer::Subconsumer *>
318318
findSubconsumerForNonNote(SourceManager &SM, SourceLoc loc,

‎include/swift/AST/DiagnosticEngine.h

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -811,9 +811,12 @@ namespace swift {
811811
/// In particular, in batch mode when a diagnostic is located in
812812
/// a non-primary file, use this affordance to place it in the .dia
813813
/// file for the primary that is currently being worked on.
814-
void setBufferIndirectlyCausingDiagnosticToInput(StringRef defaultDiagnosticInputFile);
814+
void setBufferIndirectlyCausingDiagnosticToInput(
815+
StringRef defaultDiagnosticInputFile);
815816
void resetBufferIndirectlyCausingDiagnostic();
816-
SourceLoc getDefaultDiagnostLoc() const { return bufferIndirectlyCausingDiagnostic; }
817+
SourceLoc getDefaultDiagnostLoc() const {
818+
return bufferIndirectlyCausingDiagnostic;
819+
}
817820
};
818821

819822
class BufferIndirectlyCausingDiagnosticRAII {
@@ -822,11 +825,14 @@ namespace swift {
822825

823826
public:
824827
BufferIndirectlyCausingDiagnosticRAII(DiagnosticEngine &Diags,
825-
StringRef defaultDiagnosticInputFile)
828+
StringRef defaultDiagnosticInputFile)
826829
: Diags(Diags) {
827-
Diags.setBufferIndirectlyCausingDiagnosticToInput(defaultDiagnosticInputFile);
830+
Diags.setBufferIndirectlyCausingDiagnosticToInput(
831+
defaultDiagnosticInputFile);
832+
}
833+
~BufferIndirectlyCausingDiagnosticRAII() {
834+
Diags.resetBufferIndirectlyCausingDiagnostic();
828835
}
829-
~BufferIndirectlyCausingDiagnosticRAII() { Diags.resetBufferIndirectlyCausingDiagnostic(); }
830836
};
831837

832838
/// Represents a diagnostic transaction. While a transaction is

‎include/swift/Frontend/PrintingDiagnosticConsumer.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@ class PrintingDiagnosticConsumer : public DiagnosticConsumer {
3535
PrintingDiagnosticConsumer(llvm::raw_ostream &stream = llvm::errs()) :
3636
Stream(stream) { }
3737

38-
virtual void handleDiagnostic(SourceManager &SM, SourceLoc Loc,
39-
DiagnosticKind Kind, StringRef FormatString,
40-
ArrayRef<DiagnosticArgument> FormatArgs,
41-
const DiagnosticInfo &Info,
42-
SourceLoc bufferIndirectlyCausingDiagnostic) override;
38+
virtual void
39+
handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
40+
StringRef FormatString,
41+
ArrayRef<DiagnosticArgument> FormatArgs,
42+
const DiagnosticInfo &Info,
43+
SourceLoc bufferIndirectlyCausingDiagnostic) override;
4344

4445
void forceColors() {
4546
ForceColors = true;

‎lib/AST/DiagnosticConsumer.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,17 @@ FileSpecificDiagnosticConsumer::subconsumerForLocation(SourceManager &SM,
165165
void FileSpecificDiagnosticConsumer::handleDiagnostic(
166166
SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
167167
StringRef FormatString, ArrayRef<DiagnosticArgument> FormatArgs,
168-
const DiagnosticInfo &Info, const SourceLoc bufferIndirectlyCausingDiagnostic) {
168+
const DiagnosticInfo &Info,
169+
const SourceLoc bufferIndirectlyCausingDiagnostic) {
169170

170171
HasAnErrorBeenConsumed |= Kind == DiagnosticKind::Error;
171172

172173
auto subconsumer =
173174
findSubconsumer(SM, Loc, Kind, bufferIndirectlyCausingDiagnostic);
174175
if (subconsumer) {
175-
subconsumer.getValue()->handleDiagnostic(
176-
SM, Loc, Kind, FormatString, FormatArgs, Info, bufferIndirectlyCausingDiagnostic);
176+
subconsumer.getValue()->handleDiagnostic(SM, Loc, Kind, FormatString,
177+
FormatArgs, Info,
178+
bufferIndirectlyCausingDiagnostic);
177179
return;
178180
}
179181
// Last resort: spray it everywhere
@@ -191,7 +193,8 @@ FileSpecificDiagnosticConsumer::findSubconsumer(
191193
case DiagnosticKind::Error:
192194
case DiagnosticKind::Warning:
193195
case DiagnosticKind::Remark: {
194-
auto subconsumer = findSubconsumerForNonNote(SM, loc, bufferIndirectlyCausingDiagnostic);
196+
auto subconsumer =
197+
findSubconsumerForNonNote(SM, loc, bufferIndirectlyCausingDiagnostic);
195198
SubconsumerForSubsequentNotes = subconsumer;
196199
return subconsumer;
197200
}
@@ -252,7 +255,8 @@ ForwardingDiagnosticConsumer::ForwardingDiagnosticConsumer(DiagnosticEngine &Tar
252255
void ForwardingDiagnosticConsumer::handleDiagnostic(
253256
SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
254257
StringRef FormatString, ArrayRef<DiagnosticArgument> FormatArgs,
255-
const DiagnosticInfo &Info, const SourceLoc bufferIndirectlyCausingDiagnostic) {
258+
const DiagnosticInfo &Info,
259+
const SourceLoc bufferIndirectlyCausingDiagnostic) {
256260
LLVM_DEBUG({
257261
llvm::dbgs() << "ForwardingDiagnosticConsumer received diagnostic: ";
258262
DiagnosticEngine::formatDiagnosticText(llvm::dbgs(), FormatString,

‎lib/AST/DiagnosticEngine.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,8 @@ const char *DiagnosticEngine::diagnosticStringFor(const DiagID id) {
847847
return diagnosticStrings[(unsigned)id];
848848
}
849849

850-
void DiagnosticEngine::setBufferIndirectlyCausingDiagnosticToInput(StringRef input) {
850+
void DiagnosticEngine::setBufferIndirectlyCausingDiagnosticToInput(
851+
StringRef input) {
851852
if (input.empty()) {
852853
resetBufferIndirectlyCausingDiagnostic();
853854
return;

‎lib/Frontend/PrintingDiagnosticConsumer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ namespace {
6666
void PrintingDiagnosticConsumer::handleDiagnostic(
6767
SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
6868
StringRef FormatString, ArrayRef<DiagnosticArgument> FormatArgs,
69-
const DiagnosticInfo &Info, const SourceLoc bufferIndirectlyCausingDiagnostic) {
69+
const DiagnosticInfo &Info,
70+
const SourceLoc bufferIndirectlyCausingDiagnostic) {
7071
// Determine what kind of diagnostic we're emitting.
7172
llvm::SourceMgr::DiagKind SMKind;
7273
switch (Kind) {

‎lib/Frontend/SerializedDiagnosticConsumer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,8 @@ emitDiagnosticMessage(SourceManager &SM,
545545
void SerializedDiagnosticConsumer::handleDiagnostic(
546546
SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
547547
StringRef FormatString, ArrayRef<DiagnosticArgument> FormatArgs,
548-
const DiagnosticInfo &Info, const SourceLoc bufferIndirectlyCausingDiagnostic) {
548+
const DiagnosticInfo &Info,
549+
const SourceLoc bufferIndirectlyCausingDiagnostic) {
549550

550551
// Enter the block for a non-note diagnostic immediately, rather
551552
// than waiting for beginDiagnostic, in case associated notes

‎lib/FrontendTool/FrontendTool.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -406,11 +406,12 @@ class JSONFixitWriter
406406
FixitAll(DiagOpts.FixitCodeForAllDiagnostics) {}
407407

408408
private:
409-
void handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
410-
StringRef FormatString,
411-
ArrayRef<DiagnosticArgument> FormatArgs,
412-
const DiagnosticInfo &Info,
413-
const SourceLoc bufferIndirectlyCausingDiagnostic) override {
409+
void
410+
handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
411+
StringRef FormatString,
412+
ArrayRef<DiagnosticArgument> FormatArgs,
413+
const DiagnosticInfo &Info,
414+
const SourceLoc bufferIndirectlyCausingDiagnostic) override {
414415
if (!(FixitAll || shouldTakeFixit(Kind, Info)))
415416
return;
416417
for (const auto &Fix : Info.FixIts) {
@@ -1219,7 +1220,7 @@ static bool performCompileStepsPostSILGen(
12191220
IRGenOptions &IRGenOpts = Invocation.getIRGenOptions();
12201221

12211222
BufferIndirectlyCausingDiagnosticRAII cpi(Context.Diags,
1222-
PSPs.MainInputFilenameForDebugInfo);
1223+
PSPs.MainInputFilenameForDebugInfo);
12231224

12241225
if (Stats)
12251226
countStatsPostSILGen(*Stats, *SM);

‎lib/Migrator/FixitApplyDiagnosticConsumer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ void FixitApplyDiagnosticConsumer::printResult(llvm::raw_ostream &OS) const {
3434
void FixitApplyDiagnosticConsumer::handleDiagnostic(
3535
SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
3636
StringRef FormatString, ArrayRef<DiagnosticArgument> FormatArgs,
37-
const DiagnosticInfo &Info, const SourceLoc bufferIndirectlyCausingDiagnostic) {
37+
const DiagnosticInfo &Info,
38+
const SourceLoc bufferIndirectlyCausingDiagnostic) {
3839
if (Loc.isInvalid()) {
3940
return;
4041
}

‎lib/Sema/InstrumenterSupport.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@ class ErrorGatherer : public DiagnosticConsumer {
3333
diags.addConsumer(*this);
3434
}
3535
~ErrorGatherer() override { diags.takeConsumers(); }
36-
void handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
37-
StringRef FormatString,
38-
ArrayRef<DiagnosticArgument> FormatArgs,
39-
const DiagnosticInfo &Info,
40-
const SourceLoc bufferIndirectlyCausingDiagnostic) override {
36+
void
37+
handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
38+
StringRef FormatString,
39+
ArrayRef<DiagnosticArgument> FormatArgs,
40+
const DiagnosticInfo &Info,
41+
const SourceLoc bufferIndirectlyCausingDiagnostic) override {
4142
if (Kind == swift::DiagnosticKind::Error) {
4243
error = true;
4344
}

0 commit comments

Comments
 (0)