From: Alp Toker Date: Mon, 16 Jun 2014 13:56:47 +0000 (+0000) Subject: Use the ShowInSystemHeader bit consistently for all diagnostics X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0860a908c0094e3d9d780edba99de486daa77963;p=clang Use the ShowInSystemHeader bit consistently for all diagnostics By describing system header suppressions directly in tablegen we eliminate special cases in getDiagnosticSeverity(). Dropping the reliance on builtin diagnostic classes when mapping also gets us closer to the goal of reusing the diagnostic machinery for custom diagnostics. No change in functionality. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@211023 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Basic/Diagnostic.h b/include/clang/Basic/Diagnostic.h index b0f52165bb..b9da131de3 100644 --- a/include/clang/Basic/Diagnostic.h +++ b/include/clang/Basic/Diagnostic.h @@ -651,8 +651,8 @@ public: /// \param Loc The source location we are interested in finding out the /// diagnostic state. Can be null in order to query the latest state. bool isIgnored(unsigned DiagID, SourceLocation Loc) const { - return Diags->getDiagnosticLevel(DiagID, Loc, *this) == - DiagnosticIDs::Ignored; + return Diags->getDiagnosticSeverity(DiagID, Loc, *this) == + diag::Severity::Ignored; } /// \brief Based on the way the client configured the DiagnosticsEngine diff --git a/include/clang/Basic/Diagnostic.td b/include/clang/Basic/Diagnostic.td index dd16a6a78c..978fd59ad8 100644 --- a/include/clang/Basic/Diagnostic.td +++ b/include/clang/Basic/Diagnostic.td @@ -69,7 +69,7 @@ class Diagnostic { SFINAEResponse SFINAE = SFINAE_Suppress; bit AccessControl = 0; bit WarningNoWerror = 0; - bit WarningShowInSystemHeader = 0; + bit ShowInSystemHeader = 0; Severity DefaultSeverity = defaultmapping; DiagGroup Group; string CategoryName = ""; @@ -85,8 +85,14 @@ class AccessControl { SFINAEResponse SFINAE = SFINAE_AccessControl; } +class ShowInSystemHeader { + bit ShowInSystemHeader = 1; +} + // FIXME: ExtWarn and Extension should also be SFINAEFailure by default. -class Error : Diagnostic, SFINAEFailure; +class Error : Diagnostic, SFINAEFailure { + bit ShowInSystemHeader = 1; +} class Warning : Diagnostic; class Remark : Diagnostic; class Extension : Diagnostic; @@ -101,9 +107,6 @@ class DefaultFatal { Severity DefaultSeverity = SEV_Fatal; } class DefaultWarnNoWerror { bit WarningNoWerror = 1; } -class DefaultWarnShowInSystemHeader { - bit WarningShowInSystemHeader = 1; -} class DefaultRemark { Severity DefaultSeverity = SEV_Remark; } // Definitions for Diagnostics. diff --git a/include/clang/Basic/DiagnosticFrontendKinds.td b/include/clang/Basic/DiagnosticFrontendKinds.td index c084254b0f..2d6ca69695 100644 --- a/include/clang/Basic/DiagnosticFrontendKinds.td +++ b/include/clang/Basic/DiagnosticFrontendKinds.td @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -class BackendInfo : CatBackend, DefaultWarnShowInSystemHeader; +class BackendInfo : CatBackend, ShowInSystemHeader; let Component = "Frontend" in { diff --git a/include/clang/Basic/DiagnosticIDs.h b/include/clang/Basic/DiagnosticIDs.h index 8b670500cf..c28f195b22 100644 --- a/include/clang/Basic/DiagnosticIDs.h +++ b/include/clang/Basic/DiagnosticIDs.h @@ -254,10 +254,8 @@ private: getDiagnosticLevel(unsigned DiagID, SourceLocation Loc, const DiagnosticsEngine &Diag) const LLVM_READONLY; - /// \brief An internal implementation helper used when \p DiagClass is - /// already known. diag::Severity - getDiagnosticSeverity(unsigned DiagID, unsigned DiagClass, SourceLocation Loc, + getDiagnosticSeverity(unsigned DiagID, SourceLocation Loc, const DiagnosticsEngine &Diag) const LLVM_READONLY; /// \brief Used to report a diagnostic that is finally fully formed. diff --git a/include/clang/Basic/DiagnosticLexKinds.td b/include/clang/Basic/DiagnosticLexKinds.td index 88b4da5d37..4aceaf5e4f 100644 --- a/include/clang/Basic/DiagnosticLexKinds.td +++ b/include/clang/Basic/DiagnosticLexKinds.td @@ -247,7 +247,7 @@ def err_invalid_pth_file : Error< let CategoryName = "User Defined Issues" in { def pp_hash_warning : Warning<"%0">, - InGroup, DefaultWarnShowInSystemHeader; + InGroup, ShowInSystemHeader; def err_pp_hash_error : Error<"%0">; } @@ -544,7 +544,7 @@ def err_pp_eof_in_arc_cf_code_audited : Error< def warn_pp_date_time : Warning< "expansion of date or time macro is not reproducible">, - DefaultWarnShowInSystemHeader, DefaultIgnore, InGroup>; + ShowInSystemHeader, DefaultIgnore, InGroup>; // Module map parsing def err_mmap_unknown_token : Error<"skipping stray token">; diff --git a/lib/Basic/DiagnosticIDs.cpp b/lib/Basic/DiagnosticIDs.cpp index 6bc230a33c..8fae207e8e 100644 --- a/lib/Basic/DiagnosticIDs.cpp +++ b/lib/Basic/DiagnosticIDs.cpp @@ -394,7 +394,7 @@ DiagnosticIDs::getDiagnosticLevel(unsigned DiagID, SourceLocation Loc, unsigned DiagClass = getBuiltinDiagClass(DiagID); if (DiagClass == CLASS_NOTE) return DiagnosticIDs::Note; - return toLevel(getDiagnosticSeverity(DiagID, DiagClass, Loc, Diag)); + return toLevel(getDiagnosticSeverity(DiagID, Loc, Diag)); } /// \brief Based on the way the client configured the Diagnostic @@ -404,10 +404,9 @@ DiagnosticIDs::getDiagnosticLevel(unsigned DiagID, SourceLocation Loc, /// \param Loc The source location we are interested in finding out the /// diagnostic state. Can be null in order to query the latest state. diag::Severity -DiagnosticIDs::getDiagnosticSeverity(unsigned DiagID, unsigned DiagClass, - SourceLocation Loc, +DiagnosticIDs::getDiagnosticSeverity(unsigned DiagID, SourceLocation Loc, const DiagnosticsEngine &Diag) const { - assert(DiagClass != CLASS_NOTE); + assert(getBuiltinDiagClass(DiagID) != CLASS_NOTE); // Specific non-error diagnostics may be mapped to various levels from ignored // to error. Errors can only be mapped to fatal. @@ -431,7 +430,9 @@ DiagnosticIDs::getDiagnosticSeverity(unsigned DiagID, unsigned DiagClass, // Diagnostics of class REMARK are either printed as remarks or in case they // have been added to -Werror they are printed as errors. - if (DiagClass == CLASS_REMARK && Result == diag::Severity::Warning) + // FIXME: Disregarding user-requested remark mappings like this is bogus. + if (Result == diag::Severity::Warning && + getBuiltinDiagClass(DiagID) == CLASS_REMARK) Result = diag::Severity::Remark; // Ignore -pedantic diagnostics inside __extension__ blocks. @@ -491,8 +492,7 @@ DiagnosticIDs::getDiagnosticSeverity(unsigned DiagID, unsigned DiagClass, // If we are in a system header, we ignore it. We look at the diagnostic class // because we also want to ignore extensions and warnings in -Werror and // -pedantic-errors modes, which *map* warnings/extensions to errors. - if (Result >= diag::Severity::Warning && DiagClass != CLASS_ERROR && - !ShowInSystemHeader && Diag.SuppressSystemWarnings && Loc.isValid() && + if (Diag.SuppressSystemWarnings && !ShowInSystemHeader && Loc.isValid() && Diag.getSourceManager().isInSystemHeader( Diag.getSourceManager().getExpansionLoc(Loc))) return diag::Severity::Ignored; diff --git a/utils/TableGen/ClangDiagnosticsEmitter.cpp b/utils/TableGen/ClangDiagnosticsEmitter.cpp index 76b484e783..e517755417 100644 --- a/utils/TableGen/ClangDiagnosticsEmitter.cpp +++ b/utils/TableGen/ClangDiagnosticsEmitter.cpp @@ -571,8 +571,7 @@ void EmitClangDiagsDefs(RecordKeeper &Records, raw_ostream &OS, else OS << ", false"; - // Default warning show in system header bit. - if (R.getValueAsBit("WarningShowInSystemHeader")) + if (R.getValueAsBit("ShowInSystemHeader")) OS << ", true"; else OS << ", false";