From 9a85eb6cbc966636b60b207cf693ab4220594a91 Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Sun, 26 Jan 2014 05:07:02 +0000 Subject: [PATCH] Remove flawed diagnostic mapping functions These haven't been usable since the early return was accidentally removed some years ago causing all cases to fall through to the !Enabled condition. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200123 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/Diagnostic.h | 10 --------- lib/Basic/Diagnostic.cpp | 35 -------------------------------- 2 files changed, 45 deletions(-) diff --git a/include/clang/Basic/Diagnostic.h b/include/clang/Basic/Diagnostic.h index c04d2fd9b7..ef30c474bc 100644 --- a/include/clang/Basic/Diagnostic.h +++ b/include/clang/Basic/Diagnostic.h @@ -546,11 +546,6 @@ public: bool setDiagnosticGroupMapping(StringRef Group, diag::Mapping Map, SourceLocation Loc = SourceLocation()); - /// \brief Set the warning-as-error flag for the given diagnostic. - /// - /// This function always only operates on the current diagnostic state. - void setDiagnosticWarningAsError(diag::kind Diag, bool Enabled); - /// \brief Set the warning-as-error flag for the given diagnostic group. /// /// This function always only operates on the current diagnostic state. @@ -558,11 +553,6 @@ public: /// \returns True if the given group is unknown, false otherwise. bool setDiagnosticGroupWarningAsError(StringRef Group, bool Enabled); - /// \brief Set the error-as-fatal flag for the given diagnostic. - /// - /// This function always only operates on the current diagnostic state. - void setDiagnosticErrorAsFatal(diag::kind Diag, bool Enabled); - /// \brief Set the error-as-fatal flag for the given diagnostic group. /// /// This function always only operates on the current diagnostic state. diff --git a/lib/Basic/Diagnostic.cpp b/lib/Basic/Diagnostic.cpp index f515965fa7..9bb7478dff 100644 --- a/lib/Basic/Diagnostic.cpp +++ b/lib/Basic/Diagnostic.cpp @@ -245,24 +245,6 @@ bool DiagnosticsEngine::setDiagnosticGroupMapping( return false; } -void DiagnosticsEngine::setDiagnosticWarningAsError(diag::kind Diag, - bool Enabled) { - // If we are enabling this feature, just set the diagnostic mappings to map to - // errors. - if (Enabled) - setDiagnosticMapping(Diag, diag::MAP_ERROR, SourceLocation()); - - // Otherwise, we want to set the diagnostic mapping's "no Werror" bit, and - // potentially downgrade anything already mapped to be a warning. - DiagnosticMappingInfo &Info = GetCurDiagState()->getOrAddMappingInfo(Diag); - - if (Info.getMapping() == diag::MAP_ERROR || - Info.getMapping() == diag::MAP_FATAL) - Info.setMapping(diag::MAP_WARNING); - - Info.setNoWarningAsError(true); -} - bool DiagnosticsEngine::setDiagnosticGroupWarningAsError(StringRef Group, bool Enabled) { // If we are enabling this feature, just set the diagnostic mappings to map to @@ -293,23 +275,6 @@ bool DiagnosticsEngine::setDiagnosticGroupWarningAsError(StringRef Group, return false; } -void DiagnosticsEngine::setDiagnosticErrorAsFatal(diag::kind Diag, - bool Enabled) { - // If we are enabling this feature, just set the diagnostic mappings to map to - // errors. - if (Enabled) - setDiagnosticMapping(Diag, diag::MAP_FATAL, SourceLocation()); - - // Otherwise, we want to set the diagnostic mapping's "no Werror" bit, and - // potentially downgrade anything already mapped to be a warning. - DiagnosticMappingInfo &Info = GetCurDiagState()->getOrAddMappingInfo(Diag); - - if (Info.getMapping() == diag::MAP_FATAL) - Info.setMapping(diag::MAP_ERROR); - - Info.setNoErrorAsFatal(true); -} - bool DiagnosticsEngine::setDiagnosticGroupErrorAsFatal(StringRef Group, bool Enabled) { // If we are enabling this feature, just set the diagnostic mappings to map to -- 2.40.0