fixup! turn SuppressTagKeywordInAnonymousTagNames into an SuppressTagKeyword enum case

Author: Michael137

clang/include/clang/AST/PrettyPrinter.h

@@ -57,15 +57,19 @@ class PrintingCallbacks {
 /// It is very frequently copied.
 struct PrintingPolicy {
   enum class SuppressInlineNamespaceMode : uint8_t { None, Redundant, All };
-  enum class SuppressTagKeywordMode : uint8_t { None, InElaboratedNames };
+  enum class SuppressTagKeywordMode : uint8_t {
+    None,
+    InAnonNames,
+    InElaboratedNames,
+    All
+  };
 
   /// Create a default printing policy for the specified language.
   PrintingPolicy(const LangOptions &LO)
       : Indentation(2), SuppressSpecifiers(false),
         SuppressTagKeyword(llvm::to_underlying(
             LO.CPlusPlus ? SuppressTagKeywordMode::InElaboratedNames
                          : SuppressTagKeywordMode::None)),
-        SuppressTagKeywordInAnonymousTagNames(false),
         IncludeTagDefinition(false), SuppressScope(false),
         SuppressUnwrittenScope(false),
         SuppressInlineNamespace(
@@ -128,8 +132,7 @@ struct PrintingPolicy {
   /// struct Geometry::Point;
   /// \endcode
   LLVM_PREFERRED_TYPE(SuppressTagKeywordMode)
-  unsigned SuppressTagKeyword : 1;
-  unsigned SuppressTagKeywordInAnonymousTagNames : 1;
+  unsigned SuppressTagKeyword : 2;
 
   /// When true, include the body of a tag definition.
   ///

clang/lib/AST/Decl.cpp

@@ -1799,8 +1799,8 @@ void NamedDecl::printNestedNameSpecifier(raw_ostream &OS,
       //
       // I.e., suppress tag locations, suppress leading keyword, *don't*
       // suppress tag in name
-      Copy.SuppressTagKeyword = true;
-      Copy.SuppressTagKeywordInAnonymousTagNames = false;
+      Copy.SuppressTagKeyword = llvm::to_underlying(
+          PrintingPolicy::SuppressTagKeywordMode::InElaboratedNames);
       Copy.AnonymousTagLocations = false;
       RD->printName(OS, Copy);
     } else if (const auto *FD = dyn_cast<FunctionDecl>(DC)) {
@@ -4969,11 +4969,18 @@ void TagDecl::printAnonymousTagDecl(llvm::raw_ostream &OS,
     return;
   }
 
-  bool SuppressTagKeywordInName = Policy.SuppressTagKeywordInAnonymousTagNames;
+  bool SuppressTagKeywordInName =
+      (Policy.SuppressTagKeyword ==
+       llvm::to_underlying(
+           PrintingPolicy::SuppressTagKeywordMode::InAnonNames)) ||
+      (Policy.SuppressTagKeyword ==
+       llvm::to_underlying(PrintingPolicy::SuppressTagKeywordMode::All));
 
   // Emit leading keyword. Since we printed a leading keyword make sure we
   // don't print the tag as part of the name too.
-  if (!Policy.SuppressTagKeyword) {
+  if (Policy.SuppressTagKeyword <
+      llvm::to_underlying(
+          PrintingPolicy::SuppressTagKeywordMode::InElaboratedNames)) {
     OS << getKindName() << ' ';
     SuppressTagKeywordInName = true;
   }

clang/lib/AST/TypePrinter.cpp

@@ -1523,8 +1523,9 @@ void TypePrinter::printTagType(const TagType *T, raw_ostream &OS) {
 
   bool PrintedKindDecoration = false;
   if (T->isCanonicalUnqualified()) {
-    if (Policy.SuppressTagKeyword ==
-            llvm::to_underlying(PrintingPolicy::SuppressTagKeywordMode::None) &&
+    if (Policy.SuppressTagKeyword <
+            llvm::to_underlying(
+                PrintingPolicy::SuppressTagKeywordMode::InElaboratedNames) &&
         !D->getTypedefNameForAnonDecl()) {
       PrintedKindDecoration = true;
       OS << D->getKindName();
@@ -1553,10 +1554,9 @@ void TypePrinter::printTagType(const TagType *T, raw_ostream &OS) {
     clang::PrintingPolicy Copy(Policy);
 
     // Suppress the redundant tag keyword if we just printed one.
-    if (PrintedKindDecoration) {
-      Copy.SuppressTagKeywordInAnonymousTagNames = true;
-      Copy.SuppressTagKeyword = true;
-    }
+    if (PrintedKindDecoration)
+      Copy.SuppressTagKeyword =
+          llvm::to_underlying(PrintingPolicy::SuppressTagKeywordMode::All);
 
     D->printName(OS, Copy);
   }