[IRGen] NFC: Repack TypeInfo and FixedTypeInfo bits (#16241)

This saves eight bytes per FixedTypeInfo node.

Author: davezarzycki

lib/IRGen/FixedTypeInfo.h

@@ -35,11 +35,6 @@ namespace irgen {
 /// implementing a type that has a statically known layout.
 class FixedTypeInfo : public TypeInfo {
 private:
-  /// The storage size of this type in bytes.  This may be zero even
-  /// for well-formed and complete types, such as a trivial enum or
-  /// tuple.
-  Size StorageSize;
-  
   /// The spare bit mask for this type. SpareBits[0] is the LSB of the first
   /// byte. This may be empty if the type has no spare bits.
   SpareBitVector SpareBits;
@@ -49,22 +44,26 @@ class FixedTypeInfo : public TypeInfo {
                 const SpareBitVector &spareBits,
                 Alignment align, IsPOD_t pod, IsBitwiseTakable_t bt,
                 IsFixedSize_t alwaysFixedSize,
-                SpecialTypeInfoKind stik = STIK_Fixed)
+                SpecialTypeInfoKind stik = SpecialTypeInfoKind::Fixed)
       : TypeInfo(type, align, pod, bt, alwaysFixedSize, stik),
-        StorageSize(size), SpareBits(spareBits) {
+        SpareBits(spareBits) {
     assert(SpareBits.size() == size.getValueInBits());
     assert(isFixedSize());
+    Bits.FixedTypeInfo.Size = size.getValue();
+    assert(Bits.FixedTypeInfo.Size == size.getValue() && "truncation");
   }
 
   FixedTypeInfo(llvm::Type *type, Size size,
                 SpareBitVector &&spareBits,
                 Alignment align, IsPOD_t pod, IsBitwiseTakable_t bt,
                 IsFixedSize_t alwaysFixedSize,
-                SpecialTypeInfoKind stik = STIK_Fixed)
+                SpecialTypeInfoKind stik = SpecialTypeInfoKind::Fixed)
       : TypeInfo(type, align, pod, bt, alwaysFixedSize, stik),
-        StorageSize(size), SpareBits(std::move(spareBits)) {
+        SpareBits(std::move(spareBits)) {
     assert(SpareBits.size() == size.getValueInBits());
     assert(isFixedSize());
+    Bits.FixedTypeInfo.Size = size.getValue();
+    assert(Bits.FixedTypeInfo.Size == size.getValue() && "truncation");
   }
 
 public:
@@ -73,7 +72,7 @@ class FixedTypeInfo : public TypeInfo {
 
   /// Whether this type is known to be empty.
   bool isKnownEmpty(ResilienceExpansion expansion) const {
-    return (isFixedSize(expansion) && StorageSize.isZero());
+    return (isFixedSize(expansion) && getFixedSize().isZero());
   }
 
   StackAddress allocateStack(IRGenFunction &IGF, SILType T,
@@ -99,7 +98,8 @@ class FixedTypeInfo : public TypeInfo {
   llvm::Constant *getStaticStride(IRGenModule &IGM) const override;
 
   void completeFixed(Size size, Alignment alignment) {
-    StorageSize = size;
+    Bits.FixedTypeInfo.Size = size.getValue();
+    assert(Bits.FixedTypeInfo.Size == size.getValue() && "truncation");
     setStorageAlignment(alignment);
   }
 
@@ -110,7 +110,7 @@ class FixedTypeInfo : public TypeInfo {
 
   /// Returns the known, fixed size required to store a value of this type.
   Size getFixedSize() const {
-    return StorageSize;
+    return Size(Bits.FixedTypeInfo.Size);
   }
 
   /// Returns the (assumed fixed) stride of the storage for this
@@ -120,7 +120,7 @@ class FixedTypeInfo : public TypeInfo {
   /// The stride is at least one, even for zero-sized types, like the empty
   /// tuple.
   Size getFixedStride() const {
-    Size s = StorageSize.roundUpToAlignment(getFixedAlignment());
+    Size s = getFixedSize().roundUpToAlignment(getFixedAlignment());
     if (s.isZero())
       s = Size(1);
     return s;

lib/IRGen/GenType.cpp

@@ -102,12 +102,12 @@ TypeInfo::~TypeInfo() {
 
 Address TypeInfo::getAddressForPointer(llvm::Value *ptr) const {
   assert(ptr->getType()->getPointerElementType() == StorageType);
-  return Address(ptr, StorageAlignment);
+  return Address(ptr, getBestKnownAlignment());
 }
 
 Address TypeInfo::getUndefAddress() const {
   return Address(llvm::UndefValue::get(getStorageType()->getPointerTo(0)),
-                 StorageAlignment);
+                 getBestKnownAlignment());
 }
 
 /// Whether this type is known to be empty.
@@ -239,12 +239,12 @@ unsigned FixedTypeInfo::getSpareBitExtraInhabitantCount() const {
     return 0;
   // The runtime supports a max of 0x7FFFFFFF extra inhabitants, which ought
   // to be enough for anybody.
-  if (StorageSize.getValue() >= 4)
+  if (getFixedSize().getValue() >= 4)
     return 0x7FFFFFFF;
   unsigned spareBitCount = SpareBits.count();
-  assert(spareBitCount <= StorageSize.getValueInBits()
+  assert(spareBitCount <= getFixedSize().getValueInBits()
          && "more spare bits than storage bits?!");
-  unsigned inhabitedBitCount = StorageSize.getValueInBits() - spareBitCount;
+  unsigned inhabitedBitCount = getFixedSize().getValueInBits() - spareBitCount;
   return ((1U << spareBitCount) - 1U) << inhabitedBitCount;
 }
 
@@ -304,7 +304,7 @@ FixedTypeInfo::getSpareBitExtraInhabitantIndex(IRGenFunction &IGF,
   auto &C = IGF.IGM.getLLVMContext();
 
   // Load the value.
-  auto payloadTy = llvm::IntegerType::get(C, StorageSize.getValueInBits());
+  auto payloadTy = llvm::IntegerType::get(C, getFixedSize().getValueInBits());
   src = IGF.Builder.CreateBitCast(src, payloadTy->getPointerTo());
   auto val = IGF.Builder.CreateLoad(src);
 
@@ -331,7 +331,7 @@ FixedTypeInfo::getSpareBitExtraInhabitantIndex(IRGenFunction &IGF,
 
   // See if spare bits fit into the 31 bits of the index.
   unsigned numSpareBits = SpareBits.count();
-  unsigned numOccupiedBits = StorageSize.getValueInBits() - numSpareBits;
+  unsigned numOccupiedBits = getFixedSize().getValueInBits() - numSpareBits;
   if (numOccupiedBits < 31) {
     // Gather the spare bits.
     llvm::Value *spareIdx
@@ -756,7 +756,7 @@ FixedTypeInfo::storeSpareBitExtraInhabitant(IRGenFunction &IGF,
 
   auto &C = IGF.IGM.getLLVMContext();
 
-  auto payloadTy = llvm::IntegerType::get(C, StorageSize.getValueInBits());
+  auto payloadTy = llvm::IntegerType::get(C, getFixedSize().getValueInBits());
 
   unsigned spareBitCount = SpareBits.count();
   unsigned occupiedBitCount = SpareBits.size() - spareBitCount;

lib/IRGen/LoadableTypeInfo.h

@@ -57,7 +57,7 @@ class LoadableTypeInfo : public FixedTypeInfo {
                    const SpareBitVector &spareBits,
                    Alignment align,
                    IsPOD_t pod, IsFixedSize_t alwaysFixedSize,
-                   SpecialTypeInfoKind stik = STIK_Loadable)
+                   SpecialTypeInfoKind stik = SpecialTypeInfoKind::Loadable)
       : FixedTypeInfo(type, size, spareBits, align, pod,
                       // All currently implemented loadable types are bitwise-takable.
                       IsBitwiseTakable, alwaysFixedSize, stik) {
@@ -68,7 +68,7 @@ class LoadableTypeInfo : public FixedTypeInfo {
                    SpareBitVector &&spareBits,
                    Alignment align,
                    IsPOD_t pod, IsFixedSize_t alwaysFixedSize,
-                   SpecialTypeInfoKind stik = STIK_Loadable)
+                   SpecialTypeInfoKind stik = SpecialTypeInfoKind::Loadable)
       : FixedTypeInfo(type, size, std::move(spareBits), align, pod,
                       // All currently implemented loadable types are bitwise-takable.
                       IsBitwiseTakable, alwaysFixedSize, stik) {

lib/IRGen/NonFixedTypeInfo.h

@@ -53,7 +53,7 @@ class WitnessSizedTypeInfo : public IndirectTypeInfo<Impl, TypeInfo> {
 
   WitnessSizedTypeInfo(llvm::Type *type, Alignment align, IsPOD_t pod,
                        IsBitwiseTakable_t bt)
-    : super(type, align, pod, bt, IsNotFixedSize, TypeInfo::STIK_None) {}
+    : super(type, align, pod, bt, IsNotFixedSize, SpecialTypeInfoKind::None) {}
 
 private:
   /// Bit-cast the given pointer to the right type and assume it as an

lib/IRGen/ReferenceTypeInfo.h

@@ -35,7 +35,7 @@ class ReferenceTypeInfo : public LoadableTypeInfo {
   ReferenceTypeInfo(llvm::Type *type, Size size, SpareBitVector spareBits,
                     Alignment align, IsPOD_t pod = IsNotPOD)
     : LoadableTypeInfo(type, size, spareBits, align, pod,
-                       IsFixedSize, STIK_Reference)
+                       IsFixedSize, SpecialTypeInfoKind::Reference)
   {}
 
 public:
@@ -102,7 +102,7 @@ class ReferenceTypeInfo : public LoadableTypeInfo {
 
   static bool classof(const ReferenceTypeInfo *type) { return true; }
   static bool classof(const TypeInfo *type) {
-    return type->getSpecialTypeInfoKind() == STIK_Reference;
+    return type->getSpecialTypeInfoKind() == SpecialTypeInfoKind::Reference;
   }
 };