[Lldb-commits] [clang] [clang-tools-extra] [lldb] [clang][PrintingPolicy][NFC] Rename SuppressTagKeyword to SuppressTagKeywordInElaboratedNames (PR #171989)
Michael Buch via lldb-commits
lldb-commits at lists.llvm.org
Fri Dec 12 03:12:11 PST 2025
https://github.com/Michael137 created https://github.com/llvm/llvm-project/pull/171989
In https://github.com/llvm/llvm-project/pull/169445 we're introducing a new policy (`SuppressTagKeywordInAnonNames`) to suppress tag keywords which applies in different situations. This patch renames `SuppressTagKeyword` to more accurately describe the situation in which it applies, to avoid confusion with the aforementioned new policy.
>From 902d9691d818b77d90d685865cf043005c5f8af1 Mon Sep 17 00:00:00 2001
From: Michael Buch <michaelbuch12 at gmail.com>
Date: Fri, 12 Dec 2025 10:55:56 +0000
Subject: [PATCH] [clang][PrintingPolicy][NFC] Rename SuppressTagKeyword to
SuppressTagKeywordInElaboratedNames
---
.../performance/MoveConstArgCheck.cpp | 2 +-
.../StaticAccessedThroughInstanceCheck.cpp | 2 +-
.../clang-tidy/utils/Matchers.cpp | 2 +-
clang-tools-extra/clangd/AST.cpp | 2 +-
clang-tools-extra/clangd/Hover.cpp | 3 +-
clang/include/clang/AST/PrettyPrinter.h | 9 +-
clang/lib/AST/Expr.cpp | 2 +-
clang/lib/AST/InferAlloc.cpp | 2 +-
clang/lib/AST/NestedNameSpecifier.cpp | 2 +-
clang/lib/AST/TypePrinter.cpp | 13 +--
clang/lib/CIR/CodeGen/CIRGenTypes.cpp | 2 +-
clang/lib/Index/USRGeneration.cpp | 2 +-
clang/tools/libclang/CIndex.cpp | 6 +-
clang/unittests/AST/DeclPrinterTest.cpp | 82 ++++++++++---------
clang/unittests/AST/TypePrinterTest.cpp | 10 +--
.../Clang/ClangExpressionParser.cpp | 2 +-
.../TypeSystem/Clang/TypeSystemClang.cpp | 4 +-
17 files changed, 80 insertions(+), 67 deletions(-)
diff --git a/clang-tools-extra/clang-tidy/performance/MoveConstArgCheck.cpp b/clang-tools-extra/clang-tidy/performance/MoveConstArgCheck.cpp
index 4d26c39fcbd18..8e93130e3757c 100644
--- a/clang-tools-extra/clang-tidy/performance/MoveConstArgCheck.cpp
+++ b/clang-tools-extra/clang-tidy/performance/MoveConstArgCheck.cpp
@@ -187,7 +187,7 @@ void MoveConstArgCheck::check(const MatchFinder::MatchResult &Result) {
QualType NoRefType = (*InvocationParmType)->getPointeeType();
PrintingPolicy PolicyWithSuppressedTag(getLangOpts());
- PolicyWithSuppressedTag.SuppressTagKeyword = true;
+ PolicyWithSuppressedTag.SuppressTagKeywordInElaboratedNames = true;
PolicyWithSuppressedTag.SuppressUnwrittenScope = true;
std::string ExpectParmTypeName =
NoRefType.getAsString(PolicyWithSuppressedTag);
diff --git a/clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.cpp b/clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.cpp
index 7ef8ef3d947f3..8c646ca5dd110 100644
--- a/clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.cpp
@@ -72,7 +72,7 @@ void StaticAccessedThroughInstanceCheck::check(
const ASTContext *AstContext = Result.Context;
PrintingPolicy PrintingPolicyWithSuppressedTag(AstContext->getLangOpts());
- PrintingPolicyWithSuppressedTag.SuppressTagKeyword = true;
+ PrintingPolicyWithSuppressedTag.SuppressTagKeywordInElaboratedNames = true;
PrintingPolicyWithSuppressedTag.SuppressUnwrittenScope = true;
PrintingPolicyWithSuppressedTag.PrintAsCanonical =
diff --git a/clang-tools-extra/clang-tidy/utils/Matchers.cpp b/clang-tools-extra/clang-tidy/utils/Matchers.cpp
index b1591fb8e3619..e7c38dd8b56b9 100644
--- a/clang-tools-extra/clang-tidy/utils/Matchers.cpp
+++ b/clang-tools-extra/clang-tidy/utils/Matchers.cpp
@@ -35,7 +35,7 @@ bool MatchesAnyListedTypeNameMatcher::matches(
PrintingPolicyWithSuppressedTag.PrintAsCanonical = CanonicalTypes;
PrintingPolicyWithSuppressedTag.FullyQualifiedName = true;
PrintingPolicyWithSuppressedTag.SuppressScope = false;
- PrintingPolicyWithSuppressedTag.SuppressTagKeyword = true;
+ PrintingPolicyWithSuppressedTag.SuppressTagKeywordInElaboratedNames = true;
PrintingPolicyWithSuppressedTag.SuppressUnwrittenScope = true;
std::string TypeName =
Node.getUnqualifiedType().getAsString(PrintingPolicyWithSuppressedTag);
diff --git a/clang-tools-extra/clangd/AST.cpp b/clang-tools-extra/clangd/AST.cpp
index 0dcff2eae05e7..ae50193da1ecc 100644
--- a/clang-tools-extra/clangd/AST.cpp
+++ b/clang-tools-extra/clangd/AST.cpp
@@ -419,7 +419,7 @@ std::string printType(const QualType QT, const DeclContext &CurContext,
std::string Result;
llvm::raw_string_ostream OS(Result);
PrintingPolicy PP(CurContext.getParentASTContext().getPrintingPolicy());
- PP.SuppressTagKeyword = true;
+ PP.SuppressTagKeywordInElaboratedNames = true;
PP.SuppressUnwrittenScope = true;
PP.FullyQualifiedName = FullyQualify;
diff --git a/clang-tools-extra/clangd/Hover.cpp b/clang-tools-extra/clangd/Hover.cpp
index 34369e188d4ec..cfaf9a86101e2 100644
--- a/clang-tools-extra/clangd/Hover.cpp
+++ b/clang-tools-extra/clangd/Hover.cpp
@@ -176,7 +176,8 @@ HoverInfo::PrintedType printType(QualType QT, ASTContext &ASTCtx,
// tag for extra clarity. This isn't very idiomatic, so don't attempt it for
// complex cases, including pointers/references, template specializations,
// etc.
- if (!QT.isNull() && !QT.hasQualifiers() && PP.SuppressTagKeyword) {
+ if (!QT.isNull() && !QT.hasQualifiers() &&
+ PP.SuppressTagKeywordInElaboratedNames) {
if (auto *TT = llvm::dyn_cast<TagType>(QT.getTypePtr());
TT && TT->isCanonicalUnqualified())
OS << TT->getDecl()->getKindName() << " ";
diff --git a/clang/include/clang/AST/PrettyPrinter.h b/clang/include/clang/AST/PrettyPrinter.h
index 48105b3b9d4cd..bdf50f2a91a5f 100644
--- a/clang/include/clang/AST/PrettyPrinter.h
+++ b/clang/include/clang/AST/PrettyPrinter.h
@@ -61,8 +61,9 @@ struct PrintingPolicy {
/// Create a default printing policy for the specified language.
PrintingPolicy(const LangOptions &LO)
: Indentation(2), SuppressSpecifiers(false),
- SuppressTagKeyword(LO.CPlusPlus), IncludeTagDefinition(false),
- SuppressScope(false), SuppressUnwrittenScope(false),
+ SuppressTagKeywordInElaboratedNames(LO.CPlusPlus),
+ IncludeTagDefinition(false), SuppressScope(false),
+ SuppressUnwrittenScope(false),
SuppressInlineNamespace(
llvm::to_underlying(SuppressInlineNamespaceMode::Redundant)),
SuppressInitializers(false), ConstantArraySizeAsWritten(false),
@@ -88,7 +89,7 @@ struct PrintingPolicy {
/// construct). This should not be used if a real LangOptions object is
/// available.
void adjustForCPlusPlus() {
- SuppressTagKeyword = true;
+ SuppressTagKeywordInElaboratedNames = true;
Bool = true;
UseVoidForZeroParams = false;
}
@@ -122,7 +123,7 @@ struct PrintingPolicy {
/// struct Geometry::Point;
/// \endcode
LLVM_PREFERRED_TYPE(bool)
- unsigned SuppressTagKeyword : 1;
+ unsigned SuppressTagKeywordInElaboratedNames : 1;
/// When true, include the body of a tag definition.
///
diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp
index ca7f3e16a9276..c747c03f5d528 100644
--- a/clang/lib/AST/Expr.cpp
+++ b/clang/lib/AST/Expr.cpp
@@ -759,7 +759,7 @@ std::string PredefinedExpr::ComputeName(PredefinedIdentKind IK,
PrettyCallbacks PrettyCB(Context.getLangOpts());
Policy.Callbacks = &PrettyCB;
if (IK == PredefinedIdentKind::Function && ForceElaboratedPrinting)
- Policy.SuppressTagKeyword = !LO.MSVCCompat;
+ Policy.SuppressTagKeywordInElaboratedNames = !LO.MSVCCompat;
std::string Proto;
llvm::raw_string_ostream POut(Proto);
diff --git a/clang/lib/AST/InferAlloc.cpp b/clang/lib/AST/InferAlloc.cpp
index e439ed4dbb386..d3f60bae1f8ed 100644
--- a/clang/lib/AST/InferAlloc.cpp
+++ b/clang/lib/AST/InferAlloc.cpp
@@ -184,7 +184,7 @@ infer_alloc::getAllocTokenMetadata(QualType T, const ASTContext &Ctx) {
// Get unique type name.
PrintingPolicy Policy(Ctx.getLangOpts());
- Policy.SuppressTagKeyword = true;
+ Policy.SuppressTagKeywordInElaboratedNames = true;
Policy.FullyQualifiedName = true;
llvm::raw_svector_ostream TypeNameOS(ATMD.TypeName);
T.getCanonicalType().print(TypeNameOS, Policy);
diff --git a/clang/lib/AST/NestedNameSpecifier.cpp b/clang/lib/AST/NestedNameSpecifier.cpp
index c6af91f5c0083..240b34e9423ca 100644
--- a/clang/lib/AST/NestedNameSpecifier.cpp
+++ b/clang/lib/AST/NestedNameSpecifier.cpp
@@ -111,7 +111,7 @@ void NestedNameSpecifier::print(raw_ostream &OS, const PrintingPolicy &Policy,
break;
case Kind::Type: {
PrintingPolicy InnerPolicy(Policy);
- InnerPolicy.SuppressTagKeyword = true;
+ InnerPolicy.SuppressTagKeywordInElaboratedNames = true;
QualType(getAsType(), 0).print(OS, InnerPolicy);
break;
}
diff --git a/clang/lib/AST/TypePrinter.cpp b/clang/lib/AST/TypePrinter.cpp
index d2881d5ac518a..3b61dc0cfe80c 100644
--- a/clang/lib/AST/TypePrinter.cpp
+++ b/clang/lib/AST/TypePrinter.cpp
@@ -92,19 +92,21 @@ class DefaultTemplateArgsPolicyRAII {
class ElaboratedTypePolicyRAII {
PrintingPolicy &Policy;
- bool SuppressTagKeyword;
+ bool SuppressTagKeywordInElaboratedNames;
bool SuppressScope;
public:
explicit ElaboratedTypePolicyRAII(PrintingPolicy &Policy) : Policy(Policy) {
- SuppressTagKeyword = Policy.SuppressTagKeyword;
+ SuppressTagKeywordInElaboratedNames =
+ Policy.SuppressTagKeywordInElaboratedNames;
SuppressScope = Policy.SuppressScope;
- Policy.SuppressTagKeyword = true;
+ Policy.SuppressTagKeywordInElaboratedNames = true;
Policy.SuppressScope = true;
}
~ElaboratedTypePolicyRAII() {
- Policy.SuppressTagKeyword = SuppressTagKeyword;
+ Policy.SuppressTagKeywordInElaboratedNames =
+ SuppressTagKeywordInElaboratedNames;
Policy.SuppressScope = SuppressScope;
}
};
@@ -1521,7 +1523,8 @@ void TypePrinter::printTagType(const TagType *T, raw_ostream &OS) {
bool HasKindDecoration = false;
if (T->isCanonicalUnqualified()) {
- if (!Policy.SuppressTagKeyword && !D->getTypedefNameForAnonDecl()) {
+ if (!Policy.SuppressTagKeywordInElaboratedNames &&
+ !D->getTypedefNameForAnonDecl()) {
HasKindDecoration = true;
OS << D->getKindName();
OS << ' ';
diff --git a/clang/lib/CIR/CodeGen/CIRGenTypes.cpp b/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
index 7f000ece8a494..2303b6a87f92e 100644
--- a/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
@@ -101,7 +101,7 @@ std::string CIRGenTypes::getRecordTypeName(const clang::RecordDecl *recordDecl,
llvm::to_underlying(PrintingPolicy::SuppressInlineNamespaceMode::None);
policy.AlwaysIncludeTypeForTemplateArgument = true;
policy.PrintAsCanonical = true;
- policy.SuppressTagKeyword = true;
+ policy.SuppressTagKeywordInElaboratedNames = true;
if (recordDecl->getIdentifier())
QualType(astContext.getCanonicalTagType(recordDecl))
diff --git a/clang/lib/Index/USRGeneration.cpp b/clang/lib/Index/USRGeneration.cpp
index 08835ea786997..ca11c00e7e150 100644
--- a/clang/lib/Index/USRGeneration.cpp
+++ b/clang/lib/Index/USRGeneration.cpp
@@ -656,7 +656,7 @@ static void printQualifier(llvm::raw_ostream &Out, const LangOptions &LangOpts,
NestedNameSpecifier NNS) {
// FIXME: Encode the qualifier, don't just print it.
PrintingPolicy PO(LangOpts);
- PO.SuppressTagKeyword = true;
+ PO.SuppressTagKeywordInElaboratedNames = true;
PO.SuppressUnwrittenScope = true;
PO.ConstantArraySizeAsWritten = false;
PO.AnonymousTagLocations = false;
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp
index 32e84248c1b27..74207495033d3 100644
--- a/clang/tools/libclang/CIndex.cpp
+++ b/clang/tools/libclang/CIndex.cpp
@@ -5342,7 +5342,7 @@ CXString clang_getCursorSpelling(CXCursor C) {
PrintingPolicy Policy = Ctx.getPrintingPolicy();
Policy.FullyQualifiedName = true;
- Policy.SuppressTagKeyword = false;
+ Policy.SuppressTagKeywordInElaboratedNames = false;
return cxstring::createDup(T.getAsString(Policy));
}
case CXCursor_TemplateRef: {
@@ -5642,7 +5642,7 @@ clang_PrintingPolicy_getProperty(CXPrintingPolicy Policy,
case CXPrintingPolicy_SuppressSpecifiers:
return P->SuppressSpecifiers;
case CXPrintingPolicy_SuppressTagKeyword:
- return P->SuppressTagKeyword;
+ return P->SuppressTagKeywordInElaboratedNames;
case CXPrintingPolicy_IncludeTagDefinition:
return P->IncludeTagDefinition;
case CXPrintingPolicy_SuppressScope:
@@ -5710,7 +5710,7 @@ void clang_PrintingPolicy_setProperty(CXPrintingPolicy Policy,
P->SuppressSpecifiers = Value;
return;
case CXPrintingPolicy_SuppressTagKeyword:
- P->SuppressTagKeyword = Value;
+ P->SuppressTagKeywordInElaboratedNames = Value;
return;
case CXPrintingPolicy_IncludeTagDefinition:
P->IncludeTagDefinition = Value;
diff --git a/clang/unittests/AST/DeclPrinterTest.cpp b/clang/unittests/AST/DeclPrinterTest.cpp
index a412a9813b470..acb343504e711 100644
--- a/clang/unittests/AST/DeclPrinterTest.cpp
+++ b/clang/unittests/AST/DeclPrinterTest.cpp
@@ -356,40 +356,41 @@ TEST(DeclPrinter, TestCXXRecordDecl11) {
}
TEST(DeclPrinter, TestCXXRecordDecl12) {
- ASSERT_TRUE(PrintedDeclCXX98Matches("struct S { int x; };"
- "namespace NS { class C {};}"
- "void foo() {using namespace NS; C c;}",
- "foo",
- "void foo() {\nusing namespace NS;\n"
- "C c;\n}\n",
- [](PrintingPolicy &Policy) {
- Policy.SuppressTagKeyword = false;
- Policy.SuppressScope = true;
- Policy.TerseOutput = false;
- }));
+ ASSERT_TRUE(PrintedDeclCXX98Matches(
+ "struct S { int x; };"
+ "namespace NS { class C {};}"
+ "void foo() {using namespace NS; C c;}",
+ "foo",
+ "void foo() {\nusing namespace NS;\n"
+ "C c;\n}\n",
+ [](PrintingPolicy &Policy) {
+ Policy.SuppressTagKeywordInElaboratedNames = false;
+ Policy.SuppressScope = true;
+ Policy.TerseOutput = false;
+ }));
}
TEST(DeclPrinter, TestCXXRecordDecl13) {
- ASSERT_TRUE(PrintedDeclCXX98Matches("struct S { int x; };"
- "S s1;"
- "S foo() {return s1;}",
- "foo", "S foo() {\nreturn s1;\n}\n",
- [](PrintingPolicy &Policy) {
- Policy.SuppressTagKeyword = false;
- Policy.SuppressScope = true;
- Policy.TerseOutput = false;
- }));
+ ASSERT_TRUE(PrintedDeclCXX98Matches(
+ "struct S { int x; };"
+ "S s1;"
+ "S foo() {return s1;}",
+ "foo", "S foo() {\nreturn s1;\n}\n", [](PrintingPolicy &Policy) {
+ Policy.SuppressTagKeywordInElaboratedNames = false;
+ Policy.SuppressScope = true;
+ Policy.TerseOutput = false;
+ }));
}
TEST(DeclPrinter, TestCXXRecordDecl14) {
- ASSERT_TRUE(PrintedDeclCXX98Matches("struct S { int x; };"
- "S foo(S s1) {return s1;}",
- "foo", "S foo(S s1) {\nreturn s1;\n}\n",
- [](PrintingPolicy &Policy) {
- Policy.SuppressTagKeyword = false;
- Policy.SuppressScope = true;
- Policy.TerseOutput = false;
- }));
+ ASSERT_TRUE(PrintedDeclCXX98Matches(
+ "struct S { int x; };"
+ "S foo(S s1) {return s1;}",
+ "foo", "S foo(S s1) {\nreturn s1;\n}\n", [](PrintingPolicy &Policy) {
+ Policy.SuppressTagKeywordInElaboratedNames = false;
+ Policy.SuppressScope = true;
+ Policy.TerseOutput = false;
+ }));
}
TEST(DeclPrinter, TestCXXRecordDecl15) {
ASSERT_TRUE(PrintedDeclCXX98Matches(
@@ -400,7 +401,7 @@ TEST(DeclPrinter, TestCXXRecordDecl15) {
"S foo(S s1, NS::C c1) {\nusing namespace NS;\n"
"C c;\nreturn s1;\n}\n",
[](PrintingPolicy &Policy) {
- Policy.SuppressTagKeyword = false;
+ Policy.SuppressTagKeywordInElaboratedNames = false;
Policy.SuppressScope = true;
Policy.TerseOutput = false;
}));
@@ -1385,8 +1386,9 @@ TEST(DeclPrinter, TestCXXRecordDecl17) {
"template<typename T> struct Z {};"
"struct X {};"
"Z<X> A;",
- "A", "Z<X> A",
- [](PrintingPolicy &Policy) { Policy.SuppressTagKeyword = false; }));
+ "A", "Z<X> A", [](PrintingPolicy &Policy) {
+ Policy.SuppressTagKeywordInElaboratedNames = false;
+ }));
}
TEST(DeclPrinter, TestCXXRecordDecl18) {
@@ -1397,8 +1399,9 @@ TEST(DeclPrinter, TestCXXRecordDecl18) {
"template <typename T1, int>"
"struct Y{};"
"Y<Z<X>, 2> B;",
- "B", "Y<Z<X>, 2> B",
- [](PrintingPolicy &Policy) { Policy.SuppressTagKeyword = false; }));
+ "B", "Y<Z<X>, 2> B", [](PrintingPolicy &Policy) {
+ Policy.SuppressTagKeywordInElaboratedNames = false;
+ }));
}
TEST(DeclPrinter, TestCXXRecordDecl19) {
@@ -1409,8 +1412,9 @@ TEST(DeclPrinter, TestCXXRecordDecl19) {
"template <typename T1, int>"
"struct Y{};"
"Y<Z<X>, 2> B;",
- "B", "Y<Z<X>, 2> B",
- [](PrintingPolicy &Policy) { Policy.SuppressTagKeyword = true; }));
+ "B", "Y<Z<X>, 2> B", [](PrintingPolicy &Policy) {
+ Policy.SuppressTagKeywordInElaboratedNames = true;
+ }));
}
TEST(DeclPrinter, TestCXXRecordDecl20) {
@@ -1430,7 +1434,9 @@ TEST(DeclPrinter, TestCXXRecordDecl20) {
"Outer<Inner<int, 10>, 5>::NestedStruct nestedInstance(100);",
"nestedInstance",
"Outer<Inner<int, 10>, 5>::NestedStruct nestedInstance(100)",
- [](PrintingPolicy &Policy) { Policy.SuppressTagKeyword = false; }));
+ [](PrintingPolicy &Policy) {
+ Policy.SuppressTagKeywordInElaboratedNames = false;
+ }));
}
TEST(DeclPrinter, TestCXXRecordDecl21) {
@@ -1450,7 +1456,9 @@ TEST(DeclPrinter, TestCXXRecordDecl21) {
"Outer<Inner<int, 10>, 5>::NestedStruct nestedInstance(100);",
"nestedInstance",
"Outer<Inner<int, 10>, 5>::NestedStruct nestedInstance(100)",
- [](PrintingPolicy &Policy) { Policy.SuppressTagKeyword = true; }));
+ [](PrintingPolicy &Policy) {
+ Policy.SuppressTagKeywordInElaboratedNames = true;
+ }));
}
TEST(DeclPrinter, TestFunctionParamUglified) {
diff --git a/clang/unittests/AST/TypePrinterTest.cpp b/clang/unittests/AST/TypePrinterTest.cpp
index 3cadf9b265bd1..7a6052f2be6ad 100644
--- a/clang/unittests/AST/TypePrinterTest.cpp
+++ b/clang/unittests/AST/TypePrinterTest.cpp
@@ -161,11 +161,11 @@ TEST(TypePrinter, TemplateArgumentsSubstitution) {
}
)cpp";
auto Matcher = typedefNameDecl(hasName("A"), hasType(qualType().bind("id")));
- ASSERT_TRUE(PrintedTypeMatches(Code, {}, Matcher, "X<int>",
- [](PrintingPolicy &Policy) {
- Policy.SuppressTagKeyword = false;
- Policy.SuppressScope = true;
- }));
+ ASSERT_TRUE(PrintedTypeMatches(
+ Code, {}, Matcher, "X<int>", [](PrintingPolicy &Policy) {
+ Policy.SuppressTagKeywordInElaboratedNames = false;
+ Policy.SuppressScope = true;
+ }));
}
TEST(TypePrinter, TemplateArgumentsSubstitution_Expressions) {
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
index bae3c44e333b6..dc9713a85e3c7 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
@@ -1000,7 +1000,7 @@ class CodeComplete : public CodeCompleteConsumer {
// Ensure that the printing policy is producing a description that is as
// short as possible.
m_desc_policy.SuppressScope = true;
- m_desc_policy.SuppressTagKeyword = true;
+ m_desc_policy.SuppressTagKeywordInElaboratedNames = true;
m_desc_policy.FullyQualifiedName = false;
m_desc_policy.TerseOutput = true;
m_desc_policy.IncludeNewlines = false;
diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
index 625d0e546ad3b..b01103e552b90 100644
--- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -2146,7 +2146,7 @@ TypeSystemClang::GetDeclarationName(llvm::StringRef name,
PrintingPolicy TypeSystemClang::GetTypePrintingPolicy() {
clang::PrintingPolicy printing_policy(getASTContext().getPrintingPolicy());
- printing_policy.SuppressTagKeyword = true;
+ printing_policy.SuppressTagKeywordInElaboratedNames = true;
// Inline namespaces are important for some type formatters (e.g., libc++
// and libstdc++ are differentiated by their inline namespaces).
printing_policy.SuppressInlineNamespace =
@@ -3868,7 +3868,7 @@ TypeSystemClang::GetDisplayTypeName(lldb::opaque_compiler_type_t type) {
clang::QualType qual_type(GetQualType(type));
clang::PrintingPolicy printing_policy(getASTContext().getPrintingPolicy());
- printing_policy.SuppressTagKeyword = true;
+ printing_policy.SuppressTagKeywordInElaboratedNames = true;
printing_policy.SuppressScope = false;
printing_policy.SuppressUnwrittenScope = true;
printing_policy.SuppressInlineNamespace =
More information about the lldb-commits
mailing list