From c3c4a89747e12ebc2eabe57265c8b69ab720ecbf Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Thu, 29 Sep 2011 01:25:14 +0000 Subject: [PATCH] Basic/Diagnostics: Eliminate getDiagnosticMappingInfo method, which wasn't worth methodizing. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140759 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/Diagnostic.h | 9 --------- lib/Basic/DiagnosticIDs.cpp | 3 +-- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/include/clang/Basic/Diagnostic.h b/include/clang/Basic/Diagnostic.h index 71240f4fdc..4136b5cc05 100644 --- a/include/clang/Basic/Diagnostic.h +++ b/include/clang/Basic/Diagnostic.h @@ -563,15 +563,6 @@ private: /// \brief Report the delayed diagnostic. void ReportDelayed(); - - /// getDiagnosticMappingInfo - Return the mapping info currently set for the - /// specified builtin diagnostic. This returns the high bit encoding, or zero - /// if the field is completely uninitialized. - diag::Mapping getDiagnosticMappingInfo(diag::kind Diag, - DiagState *State) const { - return State->getMapping(Diag); - } - void setDiagnosticMappingInternal(unsigned DiagId, unsigned Map, DiagState *State, bool isUser, bool isPragma) const { diff --git a/lib/Basic/DiagnosticIDs.cpp b/lib/Basic/DiagnosticIDs.cpp index 1e76a26de7..d8a0afc1cc 100644 --- a/lib/Basic/DiagnosticIDs.cpp +++ b/lib/Basic/DiagnosticIDs.cpp @@ -507,8 +507,7 @@ DiagnosticIDs::getDiagnosticLevel(unsigned DiagID, unsigned DiagClass, DiagnosticsEngine::DiagState *State = Pos->State; // Get the mapping information, if unset, compute it lazily. - unsigned MappingInfo = Diag.getDiagnosticMappingInfo((diag::kind)DiagID, - State); + unsigned MappingInfo = State->getMapping((diag::kind) DiagID); if (MappingInfo == 0) { MappingInfo = GetDefaultDiagMapping(DiagID); Diag.setDiagnosticMappingInternal(DiagID, MappingInfo, State, false, false); -- 2.40.0