[RemoteMirror] Get spare bit info from reflection records

include/swift/Reflection/Records.h

@@ -374,6 +374,111 @@ class BuiltinTypeDescriptor {
   }
 };
 
+class MultiPayloadEnumDescriptor {
+public:
+  const RelativeDirectPointer<const char> TypeName;
+
+private:
+  // This descriptor contains a series of 32-bit words
+  uint32_t contents[];
+
+  // Properties are stored in `contents` at particular indexes:
+
+  // uint32_t SizeFlags;
+  // Upper 16 bits are the size of the contents (in 32-bit words):
+  //  (This allows us to expand this structure in the future;
+  //  new fields should have accessors that test whether the
+  //  size is large enough and return "non-existent" if the
+  //  descriptor isn't large enough to have that field.)
+  // Lower 16 bits are flag bits
+
+  int getSizeFlagsIndex() const { return 0; }
+
+  // uint32_t PayloadSpareBitMaskByteOffsetCount;
+  // Number of bytes in "payload spare bits", and
+  // offset of them within the payload area
+  // Only present if `usePayloadSpareBits()`
+
+  int getPayloadSpareBitMaskByteCountIndex() const {
+    return getSizeFlagsIndex() + 1;
+  }
+
+  // uint8_t  *PayloadSpareBits;
+  // Variably-sized bitmask field (padded to a multiple of 4 bytes)
+  // Only present if `usePayloadSpareBits()`
+
+  int getPayloadSpareBitsIndex() const {
+    int PayloadSpareBitMaskByteCountFieldSize = usesPayloadSpareBits() ? 1 : 0;
+    return getPayloadSpareBitMaskByteCountIndex() + PayloadSpareBitMaskByteCountFieldSize;
+  }
+
+  // uint32_t foo;
+  // TODO: Some future field
+  // int getFooIndex() const {
+  //   int PayloadSpareBitMaskFieldSize = (getPayloadSpareBitMaskByteCount() + 3) / 4;
+  //   return getPayloadSpareBitsIndex() + PayloadSpareBitMaskFieldSize;
+  // }
+
+  // uint32_t getFoo() const {
+  //   if (getFooIndex() < getContentsSizeInWords()) {
+  //       return contents[getFooIndex()];
+  //   } else {
+  //       return 0; // Field isn't present
+  //   }
+  // }
+
+public:
+  //
+  // Data derived from the above...
+  //
+
+  uint32_t getContentsSizeInWords() const {
+    return contents[getSizeFlagsIndex()] >> 16;
+  }
+
+  size_t getSizeInBytes() const {
+//    assert(getContentsSizeInWords() > 0 && "Malformed MPEnum reflection record");
+    size_t sizeInBytes = sizeof(TypeName) + getContentsSizeInWords() * 4;
+    return sizeInBytes;
+  }
+
+  uint32_t getFlags() const {
+    assert(getContentsSizeInWords() > 0 && "Malformed MPEnum reflection record");
+    return contents[getSizeFlagsIndex()] & 0xffff;
+  }
+
+  bool usesPayloadSpareBits() const {
+    return getFlags() & 1;
+  }
+
+  uint32_t getPayloadSpareBitMaskByteOffset() const {
+    if (usesPayloadSpareBits()) {
+      return contents[getPayloadSpareBitMaskByteCountIndex()] >> 16;
+    } else {
+      return 0;
+    }
+  }
+
+  uint32_t getPayloadSpareBitMaskByteCount() const {
+    if (usesPayloadSpareBits()) {
+      auto byteCount = contents[getPayloadSpareBitMaskByteCountIndex()] & 0xffff;
+      assert(getContentsSizeInWords() >= 2 + (byteCount + 3) / 4
+            && "Malformed MPEnum reflection record: mask bigger than record");
+      return byteCount;
+    } else {
+      return 0;
+    }
+  }
+
+  const uint8_t *getPayloadSpareBits() const {
+    if (usesPayloadSpareBits()) {
+      return reinterpret_cast<const uint8_t *>(&contents[getPayloadSpareBitsIndex()]);
+    } else {
+      return nullptr;
+    }
+  }
+};
+
 class CaptureTypeRecord {
 public:
   const RelativeDirectPointer<const char> MangledTypeName;

include/swift/Reflection/ReflectionContext.h

@@ -272,14 +272,17 @@ class ReflectionContext
         ObjectFileFormat.getSectionName(ReflectionSectionKind::reflstr));
     auto ConformMdSec = findMachOSectionByName(
         ObjectFileFormat.getSectionName(ReflectionSectionKind::conform));
+    auto MPEnumMdSec = findMachOSectionByName(
+        ObjectFileFormat.getSectionName(ReflectionSectionKind::mpenum));
 
     if (FieldMdSec.first == nullptr &&
         AssocTySec.first == nullptr &&
         BuiltinTySec.first == nullptr &&
         CaptureSec.first == nullptr &&
         TypeRefMdSec.first == nullptr &&
         ReflStrMdSec.first == nullptr &&
-        ConformMdSec.first == nullptr)
+        ConformMdSec.first == nullptr &&
+        MPEnumMdSec.first == nullptr)
       return false;
 
     ReflectionInfo info = {
@@ -289,7 +292,8 @@ class ReflectionContext
         {CaptureSec.first, CaptureSec.second},
         {TypeRefMdSec.first, TypeRefMdSec.second},
         {ReflStrMdSec.first, ReflStrMdSec.second},
-        {ConformMdSec.first, ConformMdSec.second}};
+        {ConformMdSec.first, ConformMdSec.second},
+        {MPEnumMdSec.first, MPEnumMdSec.second}};
 
     this->addReflectionInfo(info);
 
@@ -394,14 +398,17 @@ class ReflectionContext
         ObjectFileFormat.getSectionName(ReflectionSectionKind::reflstr));
     auto ConformMdSec = findCOFFSectionByName(
         ObjectFileFormat.getSectionName(ReflectionSectionKind::conform));
+    auto MPEnumMdSec = findCOFFSectionByName(
+        ObjectFileFormat.getSectionName(ReflectionSectionKind::mpenum));
 
     if (FieldMdSec.first == nullptr &&
         AssocTySec.first == nullptr &&
         BuiltinTySec.first == nullptr &&
         CaptureSec.first == nullptr &&
         TypeRefMdSec.first == nullptr &&
         ReflStrMdSec.first == nullptr &&
-        ConformMdSec.first == nullptr)
+        ConformMdSec.first == nullptr &&
+        MPEnumMdSec.first == nullptr)
       return false;
 
     ReflectionInfo Info = {
@@ -411,7 +418,8 @@ class ReflectionContext
         {CaptureSec.first, CaptureSec.second},
         {TypeRefMdSec.first, TypeRefMdSec.second},
         {ReflStrMdSec.first, ReflStrMdSec.second},
-        {ConformMdSec.first, ConformMdSec.second}};
+        {ConformMdSec.first, ConformMdSec.second},
+        {MPEnumMdSec.first, MPEnumMdSec.second}};
     this->addReflectionInfo(Info);
     return true;
   }
@@ -577,6 +585,8 @@ class ReflectionContext
         ObjectFileFormat.getSectionName(ReflectionSectionKind::reflstr));
     auto ConformMdSec = findELFSectionByName(
         ObjectFileFormat.getSectionName(ReflectionSectionKind::conform));
+    auto MPEnumMdSec = findELFSectionByName(
+        ObjectFileFormat.getSectionName(ReflectionSectionKind::mpenum));
 
     if (Error)
       return false;
@@ -589,7 +599,8 @@ class ReflectionContext
         CaptureSec.first == nullptr &&
         TypeRefMdSec.first == nullptr &&
         ReflStrMdSec.first == nullptr &&
-        ConformMdSec.first == nullptr)
+        ConformMdSec.first == nullptr &&
+        MPEnumMdSec.first == nullptr)
       return false;
 
     ReflectionInfo info = {
@@ -599,7 +610,8 @@ class ReflectionContext
         {CaptureSec.first, CaptureSec.second},
         {TypeRefMdSec.first, TypeRefMdSec.second},
         {ReflStrMdSec.first, ReflStrMdSec.second},
-        {ConformMdSec.first, ConformMdSec.second}};
+        {ConformMdSec.first, ConformMdSec.second},
+        {MPEnumMdSec.first, MPEnumMdSec.second}};
 
     this->addReflectionInfo(info);
     return true;
@@ -701,8 +713,7 @@ class ReflectionContext
         ReflectionSectionKind::fieldmd, ReflectionSectionKind::assocty,
         ReflectionSectionKind::builtin, ReflectionSectionKind::capture,
         ReflectionSectionKind::typeref, ReflectionSectionKind::reflstr,
-        ReflectionSectionKind::conform
-    };
+        ReflectionSectionKind::conform, ReflectionSectionKind::mpenum};
 
     llvm::SmallVector<std::pair<RemoteRef<void>, uint64_t>, 6> Pairs;
     for (auto Section : Sections) {
@@ -725,7 +736,7 @@ class ReflectionContext
         {Pairs[0].first, Pairs[0].second}, {Pairs[1].first, Pairs[1].second},
         {Pairs[2].first, Pairs[2].second}, {Pairs[3].first, Pairs[3].second},
         {Pairs[4].first, Pairs[4].second}, {Pairs[5].first, Pairs[5].second},
-        {Pairs[6].first, Pairs[6].second}};
+        {Pairs[6].first, Pairs[6].second}, {Pairs[7].first, Pairs[7].second}};
     this->addReflectionInfo(Info);
     return true;
   }

include/swift/Reflection/TypeLowering.h

@@ -360,6 +360,11 @@ class TypeConverter {
   getClassInstanceTypeInfo(const TypeRef *TR, unsigned start,
                            remote::TypeInfoProvider *ExternalTypeInfo);
 
+  unsigned targetPointerSize() {
+    auto *rawPointerTI = getTypeInfo(getRawPointerTypeRef(), nullptr);
+    return rawPointerTI->getSize();
+  }
+
 private:
   friend class swift::reflection::LowerType;
   friend class swift::reflection::EnumTypeInfoBuilder;