maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clang] Let PPCallbacks::PragmaWarning() pass specifier as enum instead of string 

Differential Revision: https://reviews.llvm.org/D110635
This commit is contained in:
Nico Weber 2021-09-28 11:55:11 -04:00
parent a36227cb2b
commit 5cf0606140
8 changed files with 63 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.cpp
View File

@ -234,7 +234,8 @@ void ExpandModularHeadersPPCallbacks::PragmaOpenCLExtension(
parseToLocation(NameLoc);
}
void ExpandModularHeadersPPCallbacks::PragmaWarning(SourceLocation Loc,
StringRef, ArrayRef<int>) {
PragmaWarningSpecifier,
ArrayRef<int>) {
parseToLocation(Loc);
}
void ExpandModularHeadersPPCallbacks::PragmaWarningPush(SourceLocation Loc,

3
clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h
View File

@ -94,7 +94,8 @@ private:
SrcMgr::CharacteristicKind) override;
void PragmaOpenCLExtension(SourceLocation NameLoc, const IdentifierInfo *,
SourceLocation StateLoc, unsigned) override;
void PragmaWarning(SourceLocation Loc, StringRef, ArrayRef<int>) override;
void PragmaWarning(SourceLocation Loc, PragmaWarningSpecifier,
ArrayRef<int>) override;
void PragmaWarningPush(SourceLocation Loc, int) override;
void PragmaWarningPop(SourceLocation Loc) override;
void PragmaAssumeNonNullBegin(SourceLocation Loc) override;

10
clang-tools-extra/pp-trace/PPCallbacksTracker.cpp
View File

@ -78,6 +78,12 @@ static const char *const PragmaMessageKindStrings[] = {
"PMK_Message", "PMK_Warning", "PMK_Error"
};
// PragmaWarningSpecifier strings.
static const char *const PragmaWarningSpecifierStrings[] = {
"PWS_Default", "PWS_Disable", "PWS_Error", "PWS_Once", "PWS_Suppress",
"PWS_Level1", "PWS_Level2", "PWS_Level3", "PWS_Level4",
};
// ConditionValueKind strings.
static const char *const ConditionValueKindStrings[] = {
"CVK_NotEvaluated", "CVK_False", "CVK_True"
@ -267,11 +273,11 @@ void PPCallbacksTracker::PragmaOpenCLExtension(SourceLocation NameLoc,
// Callback invoked when a #pragma warning directive is read.
void PPCallbacksTracker::PragmaWarning(SourceLocation Loc,
llvm::StringRef WarningSpec,
PragmaWarningSpecifier WarningSpec,
llvm::ArrayRef<int> Ids) {
beginCallback("PragmaWarning");
appendArgument("Loc", Loc);
appendArgument("WarningSpec", WarningSpec);
appendArgument("WarningSpec", WarningSpec, PragmaWarningSpecifierStrings);
std::string Str;
llvm::raw_string_ostream SS(Str);

2
clang-tools-extra/pp-trace/PPCallbacksTracker.h
View File

@ -121,7 +121,7 @@ public:
diag::Severity mapping, llvm::StringRef Str) override;
void PragmaOpenCLExtension(SourceLocation NameLoc, const IdentifierInfo *Name,
SourceLocation StateLoc, unsigned State) override;
void PragmaWarning(SourceLocation Loc, llvm::StringRef WarningSpec,
void PragmaWarning(SourceLocation Loc, PragmaWarningSpecifier WarningSpec,
llvm::ArrayRef<int> Ids) override;
void PragmaWarningPush(SourceLocation Loc, int Level) override;
void PragmaWarningPop(SourceLocation Loc) override;

6
clang-tools-extra/test/pp-trace/pp-trace-pragma-ms.cpp
View File

@ -86,15 +86,15 @@
// CHECK-NEXT: Introducer: PIK_HashPragma
// CHECK-NEXT: - Callback: PragmaWarning
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-pragma-ms.cpp:17:9"
// CHECK-NEXT: WarningSpec: disable
// CHECK-NEXT: WarningSpec: PWS_Disable
// CHECK-NEXT: Ids: [1, 2, 3]
// CHECK-NEXT: - Callback: PragmaWarning
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-pragma-ms.cpp:17:9"
// CHECK-NEXT: WarningSpec: error
// CHECK-NEXT: WarningSpec: PWS_Error
// CHECK-NEXT: Ids: [4, 5, 6]
// CHECK-NEXT: - Callback: PragmaWarning
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-pragma-ms.cpp:17:9"
// CHECK-NEXT: WarningSpec: suppress
// CHECK-NEXT: WarningSpec: PWS_Suppress
// CHECK-NEXT: Ids: [7, 8, 9]
// CHECK-NEXT: - Callback: EndOfMainFile
// CHECK-NEXT: ...

19
clang/include/clang/Lex/PPCallbacks.h
View File

@ -252,9 +252,20 @@ public:
}
/// Callback invoked when a \#pragma warning directive is read.
virtual void PragmaWarning(SourceLocation Loc, StringRef WarningSpec,
ArrayRef<int> Ids) {
}
enum PragmaWarningSpecifier {
PWS_Default,
PWS_Disable,
PWS_Error,
PWS_Once,
PWS_Suppress,
PWS_Level1,
PWS_Level2,
PWS_Level3,
PWS_Level4,
};
virtual void PragmaWarning(SourceLocation Loc,
PragmaWarningSpecifier WarningSpec,
ArrayRef<int> Ids) {}
/// Callback invoked when a \#pragma warning(push) directive is read.
virtual void PragmaWarningPush(SourceLocation Loc, int Level) {
@ -540,7 +551,7 @@ public:
Second->PragmaOpenCLExtension(NameLoc, Name, StateLoc, State);
}
void PragmaWarning(SourceLocation Loc, StringRef WarningSpec,
void PragmaWarning(SourceLocation Loc, PragmaWarningSpecifier WarningSpec,
ArrayRef<int> Ids) override {
First->PragmaWarning(Loc, WarningSpec, Ids);
Second->PragmaWarning(Loc, WarningSpec, Ids);

20
clang/lib/Frontend/PrintPreprocessedOutput.cpp
View File

@ -155,7 +155,7 @@ public:
void PragmaDiagnosticPop(SourceLocation Loc, StringRef Namespace) override;
void PragmaDiagnostic(SourceLocation Loc, StringRef Namespace,
diag::Severity Map, StringRef Str) override;
void PragmaWarning(SourceLocation Loc, StringRef WarningSpec,
void PragmaWarning(SourceLocation Loc, PragmaWarningSpecifier WarningSpec,
ArrayRef<int> Ids) override;
void PragmaWarningPush(SourceLocation Loc, int Level) override;
void PragmaWarningPop(SourceLocation Loc) override;
@ -580,10 +580,24 @@ void PrintPPOutputPPCallbacks::PragmaDiagnostic(SourceLocation Loc,
}
void PrintPPOutputPPCallbacks::PragmaWarning(SourceLocation Loc,
StringRef WarningSpec,
PragmaWarningSpecifier WarningSpec,
ArrayRef<int> Ids) {
MoveToLine(Loc, /*RequireStartOfLine=*/true);
OS << "#pragma warning(" << WarningSpec << ':';
OS << "#pragma warning(";
switch(WarningSpec) {
case PWS_Default: OS << "default"; break;
case PWS_Disable: OS << "disable"; break;
case PWS_Error: OS << "error"; break;
case PWS_Once: OS << "once"; break;
case PWS_Suppress: OS << "suppress"; break;
case PWS_Level1: OS << '1'; break;
case PWS_Level2: OS << '2'; break;
case PWS_Level3: OS << '3'; break;
case PWS_Level4: OS << '4'; break;
}
OS << ':';
for (ArrayRef<int>::iterator I = Ids.begin(), E = Ids.end(); I != E; ++I)
OS << ' ' << *I;
OS << ')';

24
clang/lib/Lex/Pragma.cpp
View File

@ -1432,14 +1432,19 @@ struct PragmaWarningHandler : public PragmaHandler {
// Figure out which warning specifier this is.
bool SpecifierValid;
StringRef Specifier;
llvm::SmallString<1> SpecifierBuf;
PPCallbacks::PragmaWarningSpecifier Specifier;
if (II) {
Specifier = II->getName();
SpecifierValid = llvm::StringSwitch<bool>(Specifier)
.Cases("default", "disable", "error", "once",
"suppress", true)
.Default(false);
int SpecifierInt = llvm::StringSwitch<int>(II->getName())
.Case("default", PPCallbacks::PWS_Default)
.Case("disable", PPCallbacks::PWS_Disable)
.Case("error", PPCallbacks::PWS_Error)
.Case("once", PPCallbacks::PWS_Once)
.Case("suppress", PPCallbacks::PWS_Suppress)
.Default(-1);
if ((SpecifierValid = SpecifierInt != -1))
Specifier =
static_cast<PPCallbacks::PragmaWarningSpecifier>(SpecifierInt);
// If we read a correct specifier, snatch next token (that should be
// ":", checked later).
if (SpecifierValid)
@ -1447,9 +1452,10 @@ struct PragmaWarningHandler : public PragmaHandler {
} else {
// Token is a numeric constant. It should be either 1, 2, 3 or 4.
uint64_t Value;
Specifier = PP.getSpelling(Tok, SpecifierBuf);
if (PP.parseSimpleIntegerLiteral(Tok, Value)) {
SpecifierValid = (Value >= 1) && (Value <= 4);
if ((SpecifierValid = (Value >= 1) && (Value <= 4)))
Specifier = static_cast<PPCallbacks::PragmaWarningSpecifier>(
PPCallbacks::PWS_Level1 + Value - 1);
} else
SpecifierValid = false;
// Next token already snatched by parseSimpleIntegerLiteral.