1 files changed, 7 insertions, 204 deletions
diff --git a/include/clang/AST/DeclCXX.h b/include/clang/AST/DeclCXX.h
index de0aa5f9b9..0c6c2846c9 100644
--- a/include/clang/AST/DeclCXX.h
+++ b/include/clang/AST/DeclCXX.h
@@ -277,210 +277,9 @@ class CXXRecordDecl : public RecordDecl {
   };
 
   struct DefinitionData {
-    /// True if this class has any user-declared constructors.
-    unsigned UserDeclaredConstructor : 1;
-
-    /// The user-declared special members which this class has.
-    unsigned UserDeclaredSpecialMembers : 6;
-
-    /// True when this class is an aggregate.
-    unsigned Aggregate : 1;
-
-    /// True when this class is a POD-type.
-    unsigned PlainOldData : 1;
-
-    /// True when this class is empty for traits purposes, that is:
-    ///  * has no data members other than 0-width bit-fields and empty fields
-    ///    marked [[no_unique_address]]
-    ///  * has no virtual function/base, and
-    ///  * doesn't inherit from a non-empty class.
-    /// Doesn't take union-ness into account.
-    unsigned Empty : 1;
-
-    /// True when this class is polymorphic, i.e., has at
-    /// least one virtual member or derives from a polymorphic class.
-    unsigned Polymorphic : 1;
-
-    /// True when this class is abstract, i.e., has at least
-    /// one pure virtual function, (that can come from a base class).
-    unsigned Abstract : 1;
-
-    /// True when this class is standard-layout, per the applicable
-    /// language rules (including DRs).
-    unsigned IsStandardLayout : 1;
-
-    /// True when this class was standard-layout under the C++11
-    /// definition.
-    ///
-    /// C++11 [class]p7.  A standard-layout class is a class that:
-    /// * has no non-static data members of type non-standard-layout class (or
-    ///   array of such types) or reference,
-    /// * has no virtual functions (10.3) and no virtual base classes (10.1),
-    /// * has the same access control (Clause 11) for all non-static data
-    ///   members
-    /// * has no non-standard-layout base classes,
-    /// * either has no non-static data members in the most derived class and at
-    ///   most one base class with non-static data members, or has no base
-    ///   classes with non-static data members, and
-    /// * has no base classes of the same type as the first non-static data
-    ///   member.
-    unsigned IsCXX11StandardLayout : 1;
-
-    /// True when any base class has any declared non-static data
-    /// members or bit-fields.
-    /// This is a helper bit of state used to implement IsStandardLayout more
-    /// efficiently.
-    unsigned HasBasesWithFields : 1;
-
-    /// True when any base class has any declared non-static data
-    /// members.
-    /// This is a helper bit of state used to implement IsCXX11StandardLayout
-    /// more efficiently.
-    unsigned HasBasesWithNonStaticDataMembers : 1;
-
-    /// True when there are private non-static data members.
-    unsigned HasPrivateFields : 1;
-
-    /// True when there are protected non-static data members.
-    unsigned HasProtectedFields : 1;
-
-    /// True when there are private non-static data members.
-    unsigned HasPublicFields : 1;
-
-    /// True if this class (or any subobject) has mutable fields.
-    unsigned HasMutableFields : 1;
-
-    /// True if this class (or any nested anonymous struct or union)
-    /// has variant members.
-    unsigned HasVariantMembers : 1;
-
-    /// True if there no non-field members declared by the user.
-    unsigned HasOnlyCMembers : 1;
-
-    /// True if any field has an in-class initializer, including those
-    /// within anonymous unions or structs.
-    unsigned HasInClassInitializer : 1;
-
-    /// True if any field is of reference type, and does not have an
-    /// in-class initializer.
-    ///
-    /// In this case, value-initialization of this class is illegal in C++98
-    /// even if the class has a trivial default constructor.
-    unsigned HasUninitializedReferenceMember : 1;
-
-    /// True if any non-mutable field whose type doesn't have a user-
-    /// provided default ctor also doesn't have an in-class initializer.
-    unsigned HasUninitializedFields : 1;
-
-    /// True if there are any member using-declarations that inherit
-    /// constructors from a base class.
-    unsigned HasInheritedConstructor : 1;
-
-    /// True if there are any member using-declarations named
-    /// 'operator='.
-    unsigned HasInheritedAssignment : 1;
-
-    /// These flags are \c true if a defaulted corresponding special
-    /// member can't be fully analyzed without performing overload resolution.
-    /// @{
-    unsigned NeedOverloadResolutionForCopyConstructor : 1;
-    unsigned NeedOverloadResolutionForMoveConstructor : 1;
-    unsigned NeedOverloadResolutionForMoveAssignment : 1;
-    unsigned NeedOverloadResolutionForDestructor : 1;
-    /// @}
-
-    /// These flags are \c true if an implicit defaulted corresponding
-    /// special member would be defined as deleted.
-    /// @{
-    unsigned DefaultedCopyConstructorIsDeleted : 1;
-    unsigned DefaultedMoveConstructorIsDeleted : 1;
-    unsigned DefaultedMoveAssignmentIsDeleted : 1;
-    unsigned DefaultedDestructorIsDeleted : 1;
-    /// @}
-
-    /// The trivial special members which this class has, per
-    /// C++11 [class.ctor]p5, C++11 [class.copy]p12, C++11 [class.copy]p25,
-    /// C++11 [class.dtor]p5, or would have if the member were not suppressed.
-    ///
-    /// This excludes any user-declared but not user-provided special members
-    /// which have been declared but not yet defined.
-    unsigned HasTrivialSpecialMembers : 6;
-
-    /// These bits keep track of the triviality of special functions for the
-    /// purpose of calls. Only the bits corresponding to SMF_CopyConstructor,
-    /// SMF_MoveConstructor, and SMF_Destructor are meaningful here.
-    unsigned HasTrivialSpecialMembersForCall : 6;
-
-    /// The declared special members of this class which are known to be
-    /// non-trivial.
-    ///
-    /// This excludes any user-declared but not user-provided special members
-    /// which have been declared but not yet defined, and any implicit special
-    /// members which have not yet been declared.
-    unsigned DeclaredNonTrivialSpecialMembers : 6;
-
-    /// These bits keep track of the declared special members that are
-    /// non-trivial for the purpose of calls.
-    /// Only the bits corresponding to SMF_CopyConstructor,
-    /// SMF_MoveConstructor, and SMF_Destructor are meaningful here.
-    unsigned DeclaredNonTrivialSpecialMembersForCall : 6;
-
-    /// True when this class has a destructor with no semantic effect.
-    unsigned HasIrrelevantDestructor : 1;
-
-    /// True when this class has at least one user-declared constexpr
-    /// constructor which is neither the copy nor move constructor.
-    unsigned HasConstexprNonCopyMoveConstructor : 1;
-
-    /// True if this class has a (possibly implicit) defaulted default
-    /// constructor.
-    unsigned HasDefaultedDefaultConstructor : 1;
-
-    /// True if a defaulted default constructor for this class would
-    /// be constexpr.
-    unsigned DefaultedDefaultConstructorIsConstexpr : 1;
-
-    /// True if this class has a constexpr default constructor.
-    ///
-    /// This is true for either a user-declared constexpr default constructor
-    /// or an implicitly declared constexpr default constructor.
-    unsigned HasConstexprDefaultConstructor : 1;
-
-    /// True if a defaulted destructor for this class would be constexpr.
-    unsigned DefaultedDestructorIsConstexpr : 1;
-
-    /// True when this class contains at least one non-static data
-    /// member or base class of non-literal or volatile type.
-    unsigned HasNonLiteralTypeFieldsOrBases : 1;
-
-    /// True when visible conversion functions are already computed
-    /// and are available.
-    unsigned ComputedVisibleConversions : 1;
-
-    /// Whether we have a C++11 user-provided default constructor (not
-    /// explicitly deleted or defaulted).
-    unsigned UserProvidedDefaultConstructor : 1;
-
-    /// The special members which have been declared for this class,
-    /// either by the user or implicitly.
-    unsigned DeclaredSpecialMembers : 6;
-
-    /// Whether an implicit copy constructor could have a const-qualified
-    /// parameter, for initializing virtual bases and for other subobjects.
-    unsigned ImplicitCopyConstructorCanHaveConstParamForVBase : 1;
-    unsigned ImplicitCopyConstructorCanHaveConstParamForNonVBase : 1;
-
-    /// Whether an implicit copy assignment operator would have a
-    /// const-qualified parameter.
-    unsigned ImplicitCopyAssignmentHasConstParam : 1;
-
-    /// Whether any declared copy constructor has a const-qualified
-    /// parameter.
-    unsigned HasDeclaredCopyConstructorWithConstParam : 1;
-
-    /// Whether any declared copy assignment operator has either a
-    /// const-qualified reference parameter or a non-reference parameter.
-    unsigned HasDeclaredCopyAssignmentWithConstParam : 1;
+    #define FIELD(Name, Width, Merge) \
+    unsigned Name : Width;
+    #include "CXXRecordDeclDefinitionBits.def"
 
     /// Whether this class describes a C++ lambda.
     unsigned IsLambda : 1;
@@ -488,6 +287,10 @@ class CXXRecordDecl : public RecordDecl {
     /// Whether we are currently parsing base specifiers.
     unsigned IsParsingBaseSpecifiers : 1;
 
+    /// True when visible conversion functions are already computed
+    /// and are available.
+    unsigned ComputedVisibleConversions : 1;
+
     unsigned HasODRHash : 1;
 
     /// A hash of parts of the class to help in ODR checking.