Move computing enum parameters to TypeSystemClang

Author: kuilpd

clang/include/clang/AST/Decl.h

@@ -3910,7 +3910,6 @@ class EnumDecl : public TagDecl {
   void setInstantiationOfMemberEnum(ASTContext &C, EnumDecl *ED,
                                     TemplateSpecializationKind TSK);
 
-public:
   /// Sets the width in bits required to store all the
   /// non-negative enumerators of this enum.
   void setNumPositiveBits(unsigned Num) {
@@ -3922,6 +3921,7 @@ class EnumDecl : public TagDecl {
   /// negative enumerators of this enum. (see getNumNegativeBits)
   void setNumNegativeBits(unsigned Num) { EnumDeclBits.NumNegativeBits = Num; }
 
+public:
   /// True if this tag declaration is a scoped enumeration. Only
   /// possible in C++11 mode.
   void setScoped(bool Scoped = true) { EnumDeclBits.IsScoped = Scoped; }

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp

@@ -2315,8 +2315,6 @@ size_t DWARFASTParserClang::ParseChildEnumerators(
     return 0;
 
   size_t enumerators_added = 0;
-  unsigned NumNegativeBits = 0;
-  unsigned NumPositiveBits = 0;
 
   for (DWARFDIE die : parent_die.children()) {
     const dw_tag_t tag = die.Tag();
@@ -2371,21 +2369,6 @@ size_t DWARFASTParserClang::ParseChildEnumerators(
       ++enumerators_added;
     }
   }
-
-  clang::EnumDecl *enum_decl =
-      ClangUtil::GetQualType(clang_type)->getAs<clang::EnumType>()->getDecl();
-  m_ast.getASTContext().computeEnumBits(enum_decl->enumerators(),
-                                        NumNegativeBits, NumPositiveBits);
-  enum_decl->setNumPositiveBits(NumPositiveBits);
-  enum_decl->setNumNegativeBits(NumNegativeBits);
-
-  clang::QualType BestPromotionType;
-  clang::QualType BestType;
-  m_ast.getASTContext().computeBestEnumTypes(
-      /*IsPacked=*/false, NumNegativeBits, NumPositiveBits, BestType,
-      BestPromotionType);
-  enum_decl->setPromotionType(BestPromotionType);
-
   return enumerators_added;
 }
 

lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp

@@ -8474,11 +8474,23 @@ bool TypeSystemClang::CompleteTagDeclarationDefinition(
   if (enum_decl->isCompleteDefinition())
     return true;
 
+  clang::ASTContext &ast = lldb_ast->getASTContext();
+
+  unsigned NumNegativeBits = 0;
+  unsigned NumPositiveBits = 0;
+  ast.computeEnumBits(enum_decl->enumerators(), NumNegativeBits,
+                      NumPositiveBits);
+
+  clang::QualType BestPromotionType;
+  clang::QualType BestType;
+  ast.computeBestEnumTypes(/*IsPacked=*/false, NumNegativeBits, NumPositiveBits,
+                           BestType, BestPromotionType);
+
   QualType integer_type(enum_decl->getIntegerType());
   if (!integer_type.isNull()) {
-    enum_decl->completeDefinition(
-        enum_decl->getIntegerType(), enum_decl->getPromotionType(),
-        enum_decl->getNumPositiveBits(), enum_decl->getNumNegativeBits());
+    enum_decl->completeDefinition(enum_decl->getIntegerType(),
+                                  BestPromotionType, NumPositiveBits,
+                                  NumNegativeBits);
   }
   return true;
 }