Start migrating to bits on funcdecl

Author: ojhunt

clang/include/clang/AST/Decl.h

@@ -2560,7 +2560,12 @@ class FunctionDecl : public DeclaratorDecl,
   bool isInlineBuiltinDeclaration() const;
 
   /// Determine whether this is a destroying operator delete.
-  bool isDestroyingOperatorDelete() const;
+  bool isDestroyingOperatorDelete() const {
+    return FunctionDeclBits.IsDestroyingOperatorDelete;
+  }
+  void setIsDestroyingOperatorDelete(bool IsDestroyingDelete) {
+    FunctionDeclBits.IsDestroyingOperatorDelete = IsDestroyingDelete;
+  }
 
   /// Count of mandatory parameters for type aware operator new
   static constexpr unsigned RequiredTypeAwareNewParameterCount =
@@ -2572,7 +2577,12 @@ class FunctionDecl : public DeclaratorDecl,
       /* alignment */ 1;
 
   /// Determine whether this is a type aware operator new or delete.
-  bool isTypeAwareOperatorNewOrDelete() const;
+  bool isTypeAwareOperatorNewOrDelete() const {
+    return FunctionDeclBits.IsTypeAwareOperatorNewOrDelete;
+  }
+  void setIsTypeAwareOperatorNewOrDelete(bool IsTypeAwareOperator = true) {
+    FunctionDeclBits.IsTypeAwareOperatorNewOrDelete = IsTypeAwareOperator;
+  }
 
   /// Compute the language linkage.
   LanguageLinkage getLanguageLinkage() const;

clang/include/clang/AST/DeclBase.h

@@ -1829,10 +1829,18 @@ class DeclContext {
     // refers to an enclosing template for hte purposes of [temp.friend]p9.
     LLVM_PREFERRED_TYPE(bool)
     uint64_t FriendConstraintRefersToEnclosingTemplate : 1;
+
+    // Indicates this function is type aware operator new or delete
+    LLVM_PREFERRED_TYPE(bool)
+    uint64_t IsDestroyingOperatorDelete : 1;
+
+    // Indicates this function is type aware operator new or delete
+    LLVM_PREFERRED_TYPE(bool)
+    uint64_t IsTypeAwareOperatorNewOrDelete : 1;
   };
 
   /// Number of inherited and non-inherited bits in FunctionDeclBitfields.
-  enum { NumFunctionDeclBits = NumDeclContextBits + 32 };
+  enum { NumFunctionDeclBits = NumDeclContextBits + 34 };
 
   /// Stores the bits used by CXXConstructorDecl. If modified
   /// NumCXXConstructorDeclBits and the accessor
@@ -1843,12 +1851,12 @@ class DeclContext {
     LLVM_PREFERRED_TYPE(FunctionDeclBitfields)
     uint64_t : NumFunctionDeclBits;
 
-    /// 19 bits to fit in the remaining available space.
+    /// 17 bits to fit in the remaining available space.
     /// Note that this makes CXXConstructorDeclBitfields take
     /// exactly 64 bits and thus the width of NumCtorInitializers
     /// will need to be shrunk if some bit is added to NumDeclContextBitfields,
     /// NumFunctionDeclBitfields or CXXConstructorDeclBitfields.
-    uint64_t NumCtorInitializers : 16;
+    uint64_t NumCtorInitializers : 14;
     LLVM_PREFERRED_TYPE(bool)
     uint64_t IsInheritingConstructor : 1;
 
@@ -1862,7 +1870,9 @@ class DeclContext {
   };
 
   /// Number of inherited and non-inherited bits in CXXConstructorDeclBitfields.
-  enum { NumCXXConstructorDeclBits = NumFunctionDeclBits + 19 };
+  enum { NumCXXConstructorDeclBits = NumFunctionDeclBits + 17 };
+  static_assert(NumCXXConstructorDeclBits == 64);
+  static_assert(sizeof(CXXConstructorDeclBitfields) == 8);
 
   /// Stores the bits used by ObjCMethodDecl.
   /// If modified NumObjCMethodDeclBits and the accessor

clang/include/clang/AST/Type.h

@@ -2636,8 +2636,7 @@ class alignas(TypeAlignment) Type : public ExtQualsTypeCommonBase {
                                                 // C++14 decltype(auto)
   bool isTypedefNameType() const;               // typedef or alias template
 
-  bool isDestroyingDeleteT() const;             // C++ std::destroying_delete_t
-  bool isTypeIdentitySpecialization() const; // std::type_identity<X> for any X
+  bool isDestroyingDeleteT() const; // C++ std::destroying_delete_t
 
   /// If this type is a template specialization return the TemplateDecl
   /// that was specialized. It this is not a template specialization,

clang/include/clang/Sema/Sema.h

@@ -4913,6 +4913,8 @@ class Sema final : public SemaBase {
   /// it is and Element is not NULL, assigns the element type to Element.
   bool isStdInitializerList(QualType Ty, QualType *Element);
 
+  bool isStdTypeIdentity(QualType Ty, QualType *TypeArgument);
+
   /// Looks for the std::initializer_list template and instantiates it
   /// with Element, or emits an error if it's not found.
   ///

clang/include/clang/Serialization/ASTWriter.h

@@ -1072,6 +1072,7 @@ class BitsPacker {
     UnderlyingValue |= Value << CurrentBitIndex;
     CurrentBitIndex += BitsWidth;
   }
+  uint32_t currentBitCount() const { return CurrentBitIndex; }
 
   operator uint32_t() { return UnderlyingValue; }
 

clang/lib/AST/ASTImporter.cpp

@@ -4051,6 +4051,9 @@ ExpectedDecl ASTNodeImporter::VisitFunctionDecl(FunctionDecl *D) {
   ToFunction->setDeletedAsWritten(D->isDeletedAsWritten());
   ToFunction->setFriendConstraintRefersToEnclosingTemplate(
       D->FriendConstraintRefersToEnclosingTemplate());
+  ToFunction->setIsDestroyingOperatorDelete(D->isDestroyingOperatorDelete());
+  ToFunction->setIsTypeAwareOperatorNewOrDelete(
+      D->isTypeAwareOperatorNewOrDelete());
   ToFunction->setRangeEnd(ToEndLoc);
   ToFunction->setDefaultLoc(ToDefaultLoc);
 

clang/lib/AST/Decl.cpp

@@ -3083,6 +3083,9 @@ FunctionDecl::FunctionDecl(Kind DK, ASTContext &C, DeclContext *DC,
       static_cast<unsigned char>(DeductionCandidate::Normal);
   FunctionDeclBits.HasODRHash = false;
   FunctionDeclBits.FriendConstraintRefersToEnclosingTemplate = false;
+  FunctionDeclBits.IsDestroyingOperatorDelete = false;
+  FunctionDeclBits.IsTypeAwareOperatorNewOrDelete = false;
+
   if (TrailingRequiresClause)
     setTrailingRequiresClause(TrailingRequiresClause);
 }
@@ -3368,11 +3371,12 @@ bool FunctionDecl::isReservedGlobalPlacementOperator() const {
   if (!getDeclContext()->getRedeclContext()->isTranslationUnit())
     return false;
 
+  if (isTypeAwareOperatorNewOrDelete())
+    return false;
+
   const auto *proto = getType()->castAs<FunctionProtoType>();
   if (proto->getNumParams() != 2 || proto->isVariadic())
     return false;
-  if (proto->getParamType(0)->isTypeIdentitySpecialization())
-    return false;
 
   const ASTContext &Context =
       cast<TranslationUnitDecl>(getDeclContext()->getRedeclContext())
@@ -3509,34 +3513,6 @@ bool FunctionDecl::isInlineBuiltinDeclaration() const {
   llvm_unreachable("Unknown GVALinkage");
 }
 
-bool FunctionDecl::isDestroyingOperatorDelete() const {
-  // C++ P0722:
-  //   Within a class C, a single object deallocation function with signature
-  //     (T, std::destroying_delete_t, <more params>)
-  //   is a destroying operator delete.
-  if (!isa<CXXMethodDecl>(this) || getOverloadedOperator() != OO_Delete ||
-      getNumParams() < 2)
-    return false;
-
-  if (isTypeAwareOperatorNewOrDelete())
-    return false;
-
-  return getParamDecl(1)->getType()->isDestroyingDeleteT();
-}
-
-bool FunctionDecl::isTypeAwareOperatorNewOrDelete() const {
-  if (getDeclName().isOperatorNew()) {
-    if (getNumParams() < FunctionDecl::RequiredTypeAwareNewParameterCount)
-      return false;
-  } else if (getDeclName().isOperatorDelete()) {
-    if (getNumParams() < FunctionDecl::RequiredTypeAwareDeleteParameterCount)
-      return false;
-  } else
-    return false;
-
-  return getParamDecl(0)->getType()->isTypeIdentitySpecialization();
-}
-
 LanguageLinkage FunctionDecl::getLanguageLinkage() const {
   return getDeclLanguageLinkage(*this);
 }

clang/lib/AST/Type.cpp

@@ -3150,14 +3150,6 @@ TemplateDecl *Type::getSpecializedTemplateDecl() const {
   return nullptr;
 }
 
-bool Type::isTypeIdentitySpecialization() const {
-  const TemplateDecl *STDecl = getSpecializedTemplateDecl();
-  if (!STDecl)
-    return false;
-  IdentifierInfo *II = STDecl->getIdentifier();
-  return STDecl->isInStdNamespace() && II->isStr("type_identity");
-}
-
 bool Type::isSpecifierType() const {
   // Note that this intentionally does not use the canonical type.
   switch (getTypeClass()) {