[clang][Basic] Optimize getDiagnosticSeverity() #141950
Merged
+21
−15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Try not to call getDiagInfo() as often and only do it if we really have to.
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Timm Baeder (tbaederr) ChangesTry not to call getDiagInfo() as often and only do it if we really have to. Full diff: https://github.com/llvm/llvm-project/pull/141950.diff 1 Files Affected:
diff --git a/clang/lib/Basic/DiagnosticIDs.cpp b/clang/lib/Basic/DiagnosticIDs.cpp
index f01ff4df84e6a..ae1484519e812 100644
--- a/clang/lib/Basic/DiagnosticIDs.cpp
+++ b/clang/lib/Basic/DiagnosticIDs.cpp
@@ -543,26 +543,32 @@ DiagnosticIDs::getDiagnosticSeverity(unsigned DiagID, SourceLocation Loc,
return Result;
const auto &SM = Diag.getSourceManager();
-
- bool ShowInSystemHeader =
- IsCustomDiag
- ? CustomDiagInfo->getDescription(DiagID).ShouldShowInSystemHeader()
- : !GetDiagInfo(DiagID) || GetDiagInfo(DiagID)->WarnShowInSystemHeader;
-
// 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 (State->SuppressSystemWarnings && !ShowInSystemHeader && Loc.isValid() &&
- SM.isInSystemHeader(SM.getExpansionLoc(Loc)))
- return diag::Severity::Ignored;
-
+ if (State->SuppressSystemWarnings && Loc.isValid() &&
+ SM.isInSystemHeader(SM.getExpansionLoc(Loc))) {
+ bool ShowInSystemHeader = false;
+ if (IsCustomDiag)
+ ShowInSystemHeader =
+ CustomDiagInfo->getDescription(DiagID).ShouldShowInSystemHeader();
+ else if (const StaticDiagInfoRec *Rec = GetDiagInfo(DiagID))
+ ShowInSystemHeader = Rec->WarnShowInSystemHeader;
+
+ if (!ShowInSystemHeader)
+ return diag::Severity::Ignored;
+ }
// We also ignore warnings due to system macros
- bool ShowInSystemMacro =
- !GetDiagInfo(DiagID) || GetDiagInfo(DiagID)->WarnShowInSystemMacro;
- if (State->SuppressSystemWarnings && !ShowInSystemMacro && Loc.isValid() &&
- SM.isInSystemMacro(Loc))
- return diag::Severity::Ignored;
+ if (State->SuppressSystemWarnings && Loc.isValid() &&
+ SM.isInSystemMacro(Loc)) {
+
+ bool ShowInSystemMacro = false;
+ if (const StaticDiagInfoRec *Rec = GetDiagInfo(DiagID))
+ ShowInSystemMacro = Rec->WarnShowInSystemMacro;
+ if (!ShowInSystemMacro)
+ return diag::Severity::Ignored;
+ }
// Clang-diagnostics pragmas always take precedence over suppression mapping.
if (!Mapping.isPragma() && Diag.isSuppressedViaMapping(DiagID, Loc))
return diag::Severity::Ignored;
|
cor3ntin
approved these changes
Jun 2, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/11/builds/16383 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Try not to call getDiagInfo() as often and only do it if we really have to.