Skip to content

Commit 9b0c0ff

Browse files
kadircetSterling-Augustine
kadircet
authored and
Sterling-Augustine
committed
Revert "[clang] Extend diagnose_if to accept more detailed warning information (llvm#70976)"
This reverts commit e392056. There are further discussions in llvm#70976, happening for past two weeks. Since there were no responses for couple weeks now, reverting until author is back.
1 parent 9befaba commit 9b0c0ff

29 files changed

+225
-548
lines changed

‎clang-tools-extra/clangd/Diagnostics.cpp

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -577,17 +577,7 @@ std::vector<Diag> StoreDiags::take(const clang::tidy::ClangTidyContext *Tidy) {
577577
for (auto &Diag : Output) {
578578
if (const char *ClangDiag = getDiagnosticCode(Diag.ID)) {
579579
// Warnings controlled by -Wfoo are better recognized by that name.
580-
const StringRef Warning = [&] {
581-
if (OrigSrcMgr) {
582-
return OrigSrcMgr->getDiagnostics()
583-
.getDiagnosticIDs()
584-
->getWarningOptionForDiag(Diag.ID);
585-
}
586-
if (!DiagnosticIDs::IsCustomDiag(Diag.ID))
587-
return DiagnosticIDs{}.getWarningOptionForDiag(Diag.ID);
588-
return StringRef{};
589-
}();
590-
580+
StringRef Warning = DiagnosticIDs::getWarningOptionForDiag(Diag.ID);
591581
if (!Warning.empty()) {
592582
Diag.Name = ("-W" + Warning).str();
593583
} else {
@@ -904,23 +894,20 @@ void StoreDiags::flushLastDiag() {
904894
Output.push_back(std::move(*LastDiag));
905895
}
906896

907-
bool isDiagnosticSuppressed(const clang::Diagnostic &Diag,
908-
const llvm::StringSet<> &Suppress,
909-
const LangOptions &LangOpts) {
897+
bool isBuiltinDiagnosticSuppressed(unsigned ID,
898+
const llvm::StringSet<> &Suppress,
899+
const LangOptions &LangOpts) {
910900
// Don't complain about header-only stuff in mainfiles if it's a header.
911901
// FIXME: would be cleaner to suppress in clang, once we decide whether the
912902
// behavior should be to silently-ignore or respect the pragma.
913-
if (Diag.getID() == diag::pp_pragma_sysheader_in_main_file &&
914-
LangOpts.IsHeaderFile)
903+
if (ID == diag::pp_pragma_sysheader_in_main_file && LangOpts.IsHeaderFile)
915904
return true;
916905

917-
if (const char *CodePtr = getDiagnosticCode(Diag.getID())) {
906+
if (const char *CodePtr = getDiagnosticCode(ID)) {
918907
if (Suppress.contains(normalizeSuppressedCode(CodePtr)))
919908
return true;
920909
}
921-
StringRef Warning =
922-
Diag.getDiags()->getDiagnosticIDs()->getWarningOptionForDiag(
923-
Diag.getID());
910+
StringRef Warning = DiagnosticIDs::getWarningOptionForDiag(ID);
924911
if (!Warning.empty() && Suppress.contains(Warning))
925912
return true;
926913
return false;

‎clang-tools-extra/clangd/Diagnostics.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,11 @@ class StoreDiags : public DiagnosticConsumer {
181181
};
182182

183183
/// Determine whether a (non-clang-tidy) diagnostic is suppressed by config.
184-
bool isDiagnosticSuppressed(const clang::Diagnostic &Diag,
185-
const llvm::StringSet<> &Suppressed,
186-
const LangOptions &);
184+
bool isBuiltinDiagnosticSuppressed(unsigned ID,
185+
const llvm::StringSet<> &Suppressed,
186+
const LangOptions &);
187187
/// Take a user-specified diagnostic code, and convert it to a normalized form
188-
/// stored in the config and consumed by isDiagnosticsSuppressed.
188+
/// stored in the config and consumed by isBuiltinDiagnosticsSuppressed.
189189
///
190190
/// (This strips err_ and -W prefix so we can match with or without them.)
191191
llvm::StringRef normalizeSuppressedCode(llvm::StringRef);

‎clang-tools-extra/clangd/ParsedAST.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ void applyWarningOptions(llvm::ArrayRef<std::string> ExtraArgs,
342342
if (Enable) {
343343
if (Diags.getDiagnosticLevel(ID, SourceLocation()) <
344344
DiagnosticsEngine::Warning) {
345-
auto Group = Diags.getDiagnosticIDs()->getGroupForDiag(ID);
345+
auto Group = DiagnosticIDs::getGroupForDiag(ID);
346346
if (!Group || !EnabledGroups(*Group))
347347
continue;
348348
Diags.setSeverity(ID, diag::Severity::Warning, SourceLocation());
@@ -585,8 +585,8 @@ ParsedAST::build(llvm::StringRef Filename, const ParseInputs &Inputs,
585585
ASTDiags.setLevelAdjuster([&](DiagnosticsEngine::Level DiagLevel,
586586
const clang::Diagnostic &Info) {
587587
if (Cfg.Diagnostics.SuppressAll ||
588-
isDiagnosticSuppressed(Info, Cfg.Diagnostics.Suppress,
589-
Clang->getLangOpts()))
588+
isBuiltinDiagnosticSuppressed(Info.getID(), Cfg.Diagnostics.Suppress,
589+
Clang->getLangOpts()))
590590
return DiagnosticsEngine::Ignored;
591591

592592
auto It = OverriddenSeverity.find(Info.getID());

‎clang-tools-extra/clangd/Preamble.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,8 @@ buildPreamble(PathRef FileName, CompilerInvocation CI,
621621
PreambleDiagnostics.setLevelAdjuster([&](DiagnosticsEngine::Level DiagLevel,
622622
const clang::Diagnostic &Info) {
623623
if (Cfg.Diagnostics.SuppressAll ||
624-
isDiagnosticSuppressed(Info, Cfg.Diagnostics.Suppress,
625-
CI.getLangOpts()))
624+
isBuiltinDiagnosticSuppressed(Info.getID(), Cfg.Diagnostics.Suppress,
625+
CI.getLangOpts()))
626626
return DiagnosticsEngine::Ignored;
627627
switch (Info.getID()) {
628628
case diag::warn_no_newline_eof:

‎clang-tools-extra/clangd/unittests/ConfigCompileTests.cpp

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -298,41 +298,20 @@ TEST_F(ConfigCompileTests, DiagnosticSuppression) {
298298
"unreachable-code", "unused-variable",
299299
"typecheck_bool_condition",
300300
"unexpected_friend", "warn_alloca"));
301-
clang::DiagnosticsEngine DiagEngine(new DiagnosticIDs, nullptr,
302-
new clang::IgnoringDiagConsumer);
303-
304-
using Diag = clang::Diagnostic;
305-
{
306-
auto D = DiagEngine.Report(diag::warn_unreachable);
307-
EXPECT_TRUE(isDiagnosticSuppressed(
308-
Diag{&DiagEngine, D}, Conf.Diagnostics.Suppress, LangOptions()));
309-
}
301+
EXPECT_TRUE(isBuiltinDiagnosticSuppressed(
302+
diag::warn_unreachable, Conf.Diagnostics.Suppress, LangOptions()));
310303
// Subcategory not respected/suppressed.
311-
{
312-
auto D = DiagEngine.Report(diag::warn_unreachable_break);
313-
EXPECT_FALSE(isDiagnosticSuppressed(
314-
Diag{&DiagEngine, D}, Conf.Diagnostics.Suppress, LangOptions()));
315-
}
316-
{
317-
auto D = DiagEngine.Report(diag::warn_unused_variable);
318-
EXPECT_TRUE(isDiagnosticSuppressed(
319-
Diag{&DiagEngine, D}, Conf.Diagnostics.Suppress, LangOptions()));
320-
}
321-
{
322-
auto D = DiagEngine.Report(diag::err_typecheck_bool_condition);
323-
EXPECT_TRUE(isDiagnosticSuppressed(
324-
Diag{&DiagEngine, D}, Conf.Diagnostics.Suppress, LangOptions()));
325-
}
326-
{
327-
auto D = DiagEngine.Report(diag::err_unexpected_friend);
328-
EXPECT_TRUE(isDiagnosticSuppressed(
329-
Diag{&DiagEngine, D}, Conf.Diagnostics.Suppress, LangOptions()));
330-
}
331-
{
332-
auto D = DiagEngine.Report(diag::warn_alloca);
333-
EXPECT_TRUE(isDiagnosticSuppressed(
334-
Diag{&DiagEngine, D}, Conf.Diagnostics.Suppress, LangOptions()));
335-
}
304+
EXPECT_FALSE(isBuiltinDiagnosticSuppressed(
305+
diag::warn_unreachable_break, Conf.Diagnostics.Suppress, LangOptions()));
306+
EXPECT_TRUE(isBuiltinDiagnosticSuppressed(
307+
diag::warn_unused_variable, Conf.Diagnostics.Suppress, LangOptions()));
308+
EXPECT_TRUE(isBuiltinDiagnosticSuppressed(diag::err_typecheck_bool_condition,
309+
Conf.Diagnostics.Suppress,
310+
LangOptions()));
311+
EXPECT_TRUE(isBuiltinDiagnosticSuppressed(
312+
diag::err_unexpected_friend, Conf.Diagnostics.Suppress, LangOptions()));
313+
EXPECT_TRUE(isBuiltinDiagnosticSuppressed(
314+
diag::warn_alloca, Conf.Diagnostics.Suppress, LangOptions()));
336315

337316
Frag.Diagnostics.Suppress.emplace_back("*");
338317
EXPECT_TRUE(compileAndApply());

‎clang/include/clang/Basic/Attr.td

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3366,16 +3366,18 @@ def DiagnoseIf : InheritableAttr {
33663366
let Spellings = [GNU<"diagnose_if">];
33673367
let Subjects = SubjectList<[Function, ObjCMethod, ObjCProperty]>;
33683368
let Args = [ExprArgument<"Cond">, StringArgument<"Message">,
3369-
EnumArgument<"DefaultSeverity",
3370-
"DefaultSeverity",
3369+
EnumArgument<"DiagnosticType", "DiagnosticType",
33713370
/*is_string=*/true,
3372-
["error", "warning"],
3373-
["DS_error", "DS_warning"]>,
3374-
StringArgument<"WarningGroup", /*optional*/ 1>,
3371+
["error", "warning"],
3372+
["DT_Error", "DT_Warning"]>,
33753373
BoolArgument<"ArgDependent", 0, /*fake*/ 1>,
33763374
DeclArgument<Named, "Parent", 0, /*fake*/ 1>];
33773375
let InheritEvenIfAlreadyPresent = 1;
33783376
let LateParsed = LateAttrParseStandard;
3377+
let AdditionalMembers = [{
3378+
bool isError() const { return diagnosticType == DT_Error; }
3379+
bool isWarning() const { return diagnosticType == DT_Warning; }
3380+
}];
33793381
let TemplateDependent = 1;
33803382
let Documentation = [DiagnoseIfDocs];
33813383
}

‎clang/include/clang/Basic/Diagnostic.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -371,12 +371,10 @@ class DiagnosticsEngine : public RefCountedBase<DiagnosticsEngine> {
371371
// Map extensions to warnings or errors?
372372
diag::Severity ExtBehavior = diag::Severity::Ignored;
373373

374-
DiagnosticIDs &DiagIDs;
375-
376-
DiagState(DiagnosticIDs &DiagIDs)
374+
DiagState()
377375
: IgnoreAllWarnings(false), EnableAllWarnings(false),
378376
WarningsAsErrors(false), ErrorsAsFatal(false),
379-
SuppressSystemWarnings(false), DiagIDs(DiagIDs) {}
377+
SuppressSystemWarnings(false) {}
380378

381379
using iterator = llvm::DenseMap<unsigned, DiagnosticMapping>::iterator;
382380
using const_iterator =
@@ -886,8 +884,6 @@ class DiagnosticsEngine : public RefCountedBase<DiagnosticsEngine> {
886884
/// \param FormatString A fixed diagnostic format string that will be hashed
887885
/// and mapped to a unique DiagID.
888886
template <unsigned N>
889-
// TODO: Deprecate this once all uses are removed from LLVM
890-
// [[deprecated("Use a CustomDiagDesc instead of a Level")]]
891887
unsigned getCustomDiagID(Level L, const char (&FormatString)[N]) {
892888
return Diags->getCustomDiagID((DiagnosticIDs::Level)L,
893889
StringRef(FormatString, N - 1));

‎clang/include/clang/Basic/DiagnosticCategories.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ namespace clang {
2121
};
2222

2323
enum class Group {
24-
#define DIAG_ENTRY(GroupName, FlagNameOffset, Members, SubGroups, Docs) \
25-
GroupName,
24+
#define DIAG_ENTRY(GroupName, FlagNameOffset, Members, SubGroups, Docs) \
25+
GroupName,
2626
#include "clang/Basic/DiagnosticGroups.inc"
2727
#undef CATEGORY
2828
#undef DIAG_ENTRY
29-
NUM_GROUPS
3029
};
3130
} // end namespace diag
3231
} // end namespace clang

0 commit comments

Comments
 (0)