cc15219fb1
The frontend currently groups diagnostics from the command line according to diagnostic level, but that places all notes last. Fix that by emitting such diagnostics in the order they were generated. Patch by Joel E. Denny, thanks! Differential Revision: https://reviews.llvm.org/D40995 llvm-svn: 320904
75 lines
2.5 KiB
C++
75 lines
2.5 KiB
C++
//===--- TextDiagnosticBuffer.cpp - Buffer Text Diagnostics ---------------===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This is a concrete diagnostic client, which buffers the diagnostic messages.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "clang/Frontend/TextDiagnosticBuffer.h"
|
|
#include "llvm/ADT/SmallString.h"
|
|
#include "llvm/Support/ErrorHandling.h"
|
|
using namespace clang;
|
|
|
|
/// HandleDiagnostic - Store the errors, warnings, and notes that are
|
|
/// reported.
|
|
///
|
|
void TextDiagnosticBuffer::HandleDiagnostic(DiagnosticsEngine::Level Level,
|
|
const Diagnostic &Info) {
|
|
// Default implementation (Warnings/errors count).
|
|
DiagnosticConsumer::HandleDiagnostic(Level, Info);
|
|
|
|
SmallString<100> Buf;
|
|
Info.FormatDiagnostic(Buf);
|
|
switch (Level) {
|
|
default: llvm_unreachable(
|
|
"Diagnostic not handled during diagnostic buffering!");
|
|
case DiagnosticsEngine::Note:
|
|
All.emplace_back(Level, Notes.size());
|
|
Notes.emplace_back(Info.getLocation(), Buf.str());
|
|
break;
|
|
case DiagnosticsEngine::Warning:
|
|
All.emplace_back(Level, Warnings.size());
|
|
Warnings.emplace_back(Info.getLocation(), Buf.str());
|
|
break;
|
|
case DiagnosticsEngine::Remark:
|
|
All.emplace_back(Level, Remarks.size());
|
|
Remarks.emplace_back(Info.getLocation(), Buf.str());
|
|
break;
|
|
case DiagnosticsEngine::Error:
|
|
case DiagnosticsEngine::Fatal:
|
|
All.emplace_back(Level, Errors.size());
|
|
Errors.emplace_back(Info.getLocation(), Buf.str());
|
|
break;
|
|
}
|
|
}
|
|
|
|
void TextDiagnosticBuffer::FlushDiagnostics(DiagnosticsEngine &Diags) const {
|
|
for (auto it = All.begin(), ie = All.end(); it != ie; ++it) {
|
|
auto Diag = Diags.Report(Diags.getCustomDiagID(it->first, "%0"));
|
|
switch (it->first) {
|
|
default: llvm_unreachable(
|
|
"Diagnostic not handled during diagnostic flushing!");
|
|
case DiagnosticsEngine::Note:
|
|
Diag << Notes[it->second].second;
|
|
break;
|
|
case DiagnosticsEngine::Warning:
|
|
Diag << Warnings[it->second].second;
|
|
break;
|
|
case DiagnosticsEngine::Remark:
|
|
Diag << Remarks[it->second].second;
|
|
break;
|
|
case DiagnosticsEngine::Error:
|
|
case DiagnosticsEngine::Fatal:
|
|
Diag << Errors[it->second].second;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|