From: Alp Toker Date: Thu, 12 Jun 2014 11:13:52 +0000 (+0000) Subject: DiagnosticsEngine: update severity setters to new terminology X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=144ea43e24e6e5c7bb01df2ae51cd9159b24d433;p=clang DiagnosticsEngine: update severity setters to new terminology git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@210764 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Basic/Diagnostic.h b/include/clang/Basic/Diagnostic.h index 45a337d0ce..f16c0d391f 100644 --- a/include/clang/Basic/Diagnostic.h +++ b/include/clang/Basic/Diagnostic.h @@ -544,8 +544,7 @@ public: /// /// \param Loc The source location that this change of diagnostic state should /// take affect. It can be null if we are setting the latest state. - void setDiagnosticMapping(diag::kind Diag, diag::Severity Map, - SourceLocation Loc); + void setSeverity(diag::kind Diag, diag::Severity Map, SourceLocation Loc); /// \brief Change an entire diagnostic group (e.g. "unknown-pragmas") to /// have the specified mapping. @@ -555,8 +554,8 @@ public: /// /// \param Loc The source location that this change of diagnostic state should /// take affect. It can be null if we are setting the state from command-line. - bool setDiagnosticGroupMapping(StringRef Group, diag::Severity Map, - SourceLocation Loc = SourceLocation()); + bool setSeverityForGroup(StringRef Group, diag::Severity Map, + SourceLocation Loc = SourceLocation()); /// \brief Set the warning-as-error flag for the given diagnostic group. /// @@ -576,8 +575,8 @@ public: /// /// Mainly to be used by -Wno-everything to disable all warnings but allow /// subsequent -W options to enable specific warnings. - void setMappingForAllDiagnostics(diag::Severity Map, - SourceLocation Loc = SourceLocation()); + void setSeverityForAll(diag::Severity Map, + SourceLocation Loc = SourceLocation()); bool hasErrorOccurred() const { return ErrorOccurred; } diff --git a/lib/ARCMigrate/ARCMT.cpp b/lib/ARCMigrate/ARCMT.cpp index 6032b001d3..8a13b2ee4f 100644 --- a/lib/ARCMigrate/ARCMT.cpp +++ b/lib/ARCMigrate/ARCMT.cpp @@ -312,8 +312,8 @@ bool arcmt::checkForManualIssues(CompilerInvocation &origCI, ARCMTMacroLocs); pass.setNoFinalizeRemoval(NoFinalizeRemoval); if (!NoNSAllocReallocError) - Diags->setDiagnosticMapping(diag::warn_arcmt_nsalloc_realloc, - diag::Severity::Error, SourceLocation()); + Diags->setSeverity(diag::warn_arcmt_nsalloc_realloc, diag::Severity::Error, + SourceLocation()); for (unsigned i=0, e = transforms.size(); i != e; ++i) transforms[i](pass); diff --git a/lib/Basic/Diagnostic.cpp b/lib/Basic/Diagnostic.cpp index 9882688289..686e50496e 100644 --- a/lib/Basic/Diagnostic.cpp +++ b/lib/Basic/Diagnostic.cpp @@ -160,9 +160,8 @@ DiagnosticsEngine::GetDiagStatePointForLoc(SourceLocation L) const { return Pos; } -void DiagnosticsEngine::setDiagnosticMapping(diag::kind Diag, - diag::Severity Map, - SourceLocation L) { +void DiagnosticsEngine::setSeverity(diag::kind Diag, diag::Severity Map, + SourceLocation L) { assert(Diag < diag::DIAG_UPPER_LIMIT && "Can only map builtin diagnostics"); assert((Diags->isBuiltinWarningOrExtension(Diag) || @@ -229,9 +228,8 @@ void DiagnosticsEngine::setDiagnosticMapping(diag::kind Diag, FullSourceLoc(Loc, *SourceMgr))); } -bool DiagnosticsEngine::setDiagnosticGroupMapping(StringRef Group, - diag::Severity Map, - SourceLocation Loc) { +bool DiagnosticsEngine::setSeverityForGroup(StringRef Group, diag::Severity Map, + SourceLocation Loc) { // Get the diagnostics in this group. SmallVector GroupDiags; if (Diags->getDiagnosticsInGroup(Group, GroupDiags)) @@ -239,7 +237,7 @@ bool DiagnosticsEngine::setDiagnosticGroupMapping(StringRef Group, // Set the mapping. for (unsigned i = 0, e = GroupDiags.size(); i != e; ++i) - setDiagnosticMapping(GroupDiags[i], Map, Loc); + setSeverity(GroupDiags[i], Map, Loc); return false; } @@ -249,7 +247,7 @@ bool DiagnosticsEngine::setDiagnosticGroupWarningAsError(StringRef Group, // If we are enabling this feature, just set the diagnostic mappings to map to // errors. if (Enabled) - return setDiagnosticGroupMapping(Group, diag::Severity::Error); + return setSeverityForGroup(Group, diag::Severity::Error); // Otherwise, we want to set the diagnostic mapping's "no Werror" bit, and // potentially downgrade anything already mapped to be a warning. @@ -278,7 +276,7 @@ bool DiagnosticsEngine::setDiagnosticGroupErrorAsFatal(StringRef Group, // If we are enabling this feature, just set the diagnostic mappings to map to // fatal errors. if (Enabled) - return setDiagnosticGroupMapping(Group, diag::Severity::Fatal); + return setSeverityForGroup(Group, diag::Severity::Fatal); // Otherwise, we want to set the diagnostic mapping's "no Werror" bit, and // potentially downgrade anything already mapped to be an error. @@ -301,8 +299,8 @@ bool DiagnosticsEngine::setDiagnosticGroupErrorAsFatal(StringRef Group, return false; } -void DiagnosticsEngine::setMappingForAllDiagnostics(diag::Severity Map, - SourceLocation Loc) { +void DiagnosticsEngine::setSeverityForAll(diag::Severity Map, + SourceLocation Loc) { // Get all the diagnostics. SmallVector AllDiags; Diags->getAllDiagnostics(AllDiags); @@ -310,7 +308,7 @@ void DiagnosticsEngine::setMappingForAllDiagnostics(diag::Severity Map, // Set the mapping. for (unsigned i = 0, e = AllDiags.size(); i != e; ++i) if (Diags->isBuiltinWarningOrExtension(AllDiags[i])) - setDiagnosticMapping(AllDiags[i], Map, Loc); + setSeverity(AllDiags[i], Map, Loc); } void DiagnosticsEngine::Report(const StoredDiagnostic &storedDiag) { diff --git a/lib/Basic/Warnings.cpp b/lib/Basic/Warnings.cpp index a0a2164423..98f85a053b 100644 --- a/lib/Basic/Warnings.cpp +++ b/lib/Basic/Warnings.cpp @@ -125,7 +125,7 @@ void clang::ProcessWarningOptions(DiagnosticsEngine &Diags, Diags.setEnableAllWarnings(true); } else { Diags.setEnableAllWarnings(false); - Diags.setMappingForAllDiagnostics(diag::Severity::Ignored); + Diags.setSeverityForAll(diag::Severity::Ignored); } } continue; @@ -194,7 +194,7 @@ void clang::ProcessWarningOptions(DiagnosticsEngine &Diags, EmitUnknownDiagWarning(Diags, isPositive ? "-W" : "-Wno-", Opt, isPositive); } else { - Diags.setDiagnosticGroupMapping(Opt, Mapping); + Diags.setSeverityForGroup(Opt, Mapping); } } } diff --git a/lib/Lex/Pragma.cpp b/lib/Lex/Pragma.cpp index f1b96f8b55..a5f1a62a70 100644 --- a/lib/Lex/Pragma.cpp +++ b/lib/Lex/Pragma.cpp @@ -998,8 +998,8 @@ public: return; } - if (PP.getDiagnostics().setDiagnosticGroupMapping(WarningName.substr(2), SV, - DiagLoc)) + if (PP.getDiagnostics().setSeverityForGroup(WarningName.substr(2), SV, + DiagLoc)) PP.Diag(StringLoc, diag::warn_pragma_diagnostic_unknown_warning) << WarningName; else if (Callbacks) diff --git a/lib/Parse/ParsePragma.cpp b/lib/Parse/ParsePragma.cpp index 723d414015..08e396a276 100644 --- a/lib/Parse/ParsePragma.cpp +++ b/lib/Parse/ParsePragma.cpp @@ -1215,9 +1215,8 @@ PragmaNoOpenMPHandler::HandlePragma(Preprocessor &PP, FirstTok.getLocation()) != DiagnosticsEngine::Ignored) { PP.Diag(FirstTok, diag::warn_pragma_omp_ignored); - PP.getDiagnostics().setDiagnosticMapping(diag::warn_pragma_omp_ignored, - diag::Severity::Ignored, - SourceLocation()); + PP.getDiagnostics().setSeverity(diag::warn_pragma_omp_ignored, + diag::Severity::Ignored, SourceLocation()); } PP.DiscardUntilEndOfDirective(); }