From 400e7e3b39f31ef597e06e02fa413b87977db74c Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Thu, 29 Sep 2011 01:20:28 +0000 Subject: Basic/Diagnostic: Eliminate the extra "mapping" out-parameter now that I killed the sole client. llvm-svn: 140756 --- clang/lib/Basic/DiagnosticIDs.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'clang/lib/Basic/DiagnosticIDs.cpp') diff --git a/clang/lib/Basic/DiagnosticIDs.cpp b/clang/lib/Basic/DiagnosticIDs.cpp index 9347f9cb170..1e76a26de72 100644 --- a/clang/lib/Basic/DiagnosticIDs.cpp +++ b/clang/lib/Basic/DiagnosticIDs.cpp @@ -478,15 +478,14 @@ StringRef DiagnosticIDs::getDescription(unsigned DiagID) const { /// by consumable the DiagnosticClient. DiagnosticIDs::Level DiagnosticIDs::getDiagnosticLevel(unsigned DiagID, SourceLocation Loc, - const DiagnosticsEngine &Diag, - diag::Mapping *mapping) const { + const DiagnosticsEngine &Diag) const { // Handle custom diagnostics, which cannot be mapped. if (DiagID >= diag::DIAG_UPPER_LIMIT) return CustomDiagInfo->getLevel(DiagID); unsigned DiagClass = getBuiltinDiagClass(DiagID); assert(DiagClass != CLASS_NOTE && "Cannot get diagnostic level of a note!"); - return getDiagnosticLevel(DiagID, DiagClass, Loc, Diag, mapping); + return getDiagnosticLevel(DiagID, DiagClass, Loc, Diag); } /// \brief Based on the way the client configured the Diagnostic @@ -498,8 +497,7 @@ DiagnosticIDs::getDiagnosticLevel(unsigned DiagID, SourceLocation Loc, DiagnosticIDs::Level DiagnosticIDs::getDiagnosticLevel(unsigned DiagID, unsigned DiagClass, SourceLocation Loc, - const DiagnosticsEngine &Diag, - diag::Mapping *mapping) const { + const DiagnosticsEngine &Diag) const { // Specific non-error diagnostics may be mapped to various levels from ignored // to error. Errors can only be mapped to fatal. DiagnosticIDs::Level Result = DiagnosticIDs::Fatal; @@ -515,9 +513,6 @@ DiagnosticIDs::getDiagnosticLevel(unsigned DiagID, unsigned DiagClass, MappingInfo = GetDefaultDiagMapping(DiagID); Diag.setDiagnosticMappingInternal(DiagID, MappingInfo, State, false, false); } - - if (mapping) - *mapping = (diag::Mapping) (MappingInfo & 7); bool ShouldEmitInSystemHeader = false; -- cgit v1.2.3