Reflection: Remove some unused code, NFC

Author: slavapestov

include/swift/Reflection/Records.h

@@ -476,8 +476,16 @@ class CaptureDescriptor {
   }
 
 public:
+  /// The number of captures in the closure and the number of typerefs that
+  /// immediately follow this struct.
   uint32_t NumCaptureTypes;
+
+  /// The number of sources of metadata available in the MetadataSourceMap
+  /// directly following the list of capture's typerefs.
   uint32_t NumMetadataSources;
+
+  /// The number of items in the NecessaryBindings structure at the head of
+  /// the closure.
   uint32_t NumBindings;
 
   using const_iterator = FieldRecordIterator;

include/swift/Remote/MetadataReader.h

@@ -488,9 +488,6 @@ class MetadataReader {
   using OwnedProtocolDescriptorRef =
     std::unique_ptr<const TargetProtocolDescriptor<Runtime>, delete_with_free>;
 
-  using OwnedCaptureDescriptor =
-    std::unique_ptr<const CaptureDescriptor, delete_with_free>;
-
   /// Cached isa mask.
   StoredPointer isaMask;
   bool hasIsaMask = false;
@@ -1060,39 +1057,6 @@ class MetadataReader {
     return nominal;
   }
 
-  /// Read the entire CaptureDescriptor in this address space, including
-  /// trailing capture typeref relative offsets, and GenericMetadataSource
-  /// pairs.
-  OwnedCaptureDescriptor readCaptureDescriptor(StoredPointer Address) {
-
-    uint32_t NumCaptures = 0;
-    uint32_t NumMetadataSources = 0;
-
-    StoredSize Offset = 0;
-
-    if (!Reader->readInteger(Address + Offset, &NumCaptures))
-      return nullptr;
-
-    Offset += sizeof(NumCaptures);
-
-    if (!Reader->readInteger(Address + Offset, &NumMetadataSources))
-      return nullptr;
-
-    StoredSize Size = sizeof(CaptureDescriptor) +
-      NumCaptures * sizeof(RelativeDirectPointer<const char>) +
-      NumMetadataSources * sizeof(GenericMetadataSource);
-
-    auto Buffer = (uint8_t *)malloc(Size);
-
-    if (!Reader->readBytes(Address, Buffer, Size)) {
-      free(Buffer);
-      return nullptr;
-    }
-
-    auto RawDescriptor = reinterpret_cast<const CaptureDescriptor *>(Buffer);
-    return OwnedCaptureDescriptor(RawDescriptor);
-  }
-
   /// Given a pointer to an Objective-C class, try to read its class name.
   bool readObjCClassName(StoredPointer classAddress, std::string &className) {
     // The following algorithm only works on the non-fragile Apple runtime.

include/swift/Runtime/Metadata.h

@@ -1754,79 +1754,14 @@ struct TargetClassMetadata : public TargetHeapMetadata<Runtime> {
 };
 using ClassMetadata = TargetClassMetadata<InProcess>;
 
-  /// A key-value pair in a TypeRef -> MetadataSource map.
-  struct GenericMetadataSource {
-    using Key = RelativeDirectPointer<const char>;
-    using Value = Key;
-
-    const Key MangledTypeName;
-    const Value EncodedMetadataSource;
-  };
-
-/// Describes the layout of a heap closure.
-///
-/// For simplicity's sake and other reasons, this shouldn't contain
-/// architecture-specifically sized things like direct pointers, uintptr_t, etc.
-///
-/// Following the CaptureDescriptor are:
-/// - a list of direct relative offsets to the mangled type names of the
-///   captures (these aren't in the DATA segment, however).
-/// - a list of GenericMetadataSource objects - each element is a pair of:
-///   - MangledTypeName (for a GenericTypeParameterTypeRef)
-///   - EncodedMetadataSource (an encoded string like TypeRefs, but describe
-///     the method of crawling to the metadata for that generic type parameter.
-struct CaptureDescriptor {
-public:
-
-  /// The number of captures in the closure and the number of typerefs that
-  /// immediately follow this struct.
-  const uint32_t NumCaptures;
-
-  /// The number of sources of metadata available in the MetadataSourceMap
-  /// directly following the list of capture's typerefs.
-  const uint32_t NumMetadataSources;
-
-  /// The number of items in the NecessaryBindings structure at the head of
-  /// the closure.
-  const uint32_t NumBindings;
-
-  /// Get the key-value pair for the ith generic metadata source.
-  const GenericMetadataSource &getGenericMetadataSource(size_t i) const {
-    assert(i <= NumMetadataSources &&
-           "Generic metadata source index out of range");
-    auto Begin = getGenericMetadataSourceBuffer();
-    return Begin[i];
-  }
-
-  /// Get the typeref (encoded as a mangled type name) of the ith
-  /// closure capture.
-  const RelativeDirectPointer<const char> &
-  getCaptureMangledTypeName(size_t i) const {
-    assert(i <= NumCaptures && "Capture index out of range");
-    auto Begin = getCaptureTypeRefBuffer();
-    return Begin[i];
-  }
-
-private:
-  const GenericMetadataSource *getGenericMetadataSourceBuffer() const {
-    auto BeginTR = reinterpret_cast<const char *>(getCaptureTypeRefBuffer());
-    auto EndTR = BeginTR + NumCaptures * sizeof(GenericMetadataSource);
-    return reinterpret_cast<const GenericMetadataSource *>(EndTR);
-  }
-
-  const RelativeDirectPointer<const char> *getCaptureTypeRefBuffer() const {
-    return reinterpret_cast<const RelativeDirectPointer<const char> *>(this+1);
-  }
-};
-
 /// The structure of metadata for heap-allocated local variables.
 /// This is non-type metadata.
 template <typename Runtime>
 struct TargetHeapLocalVariableMetadata
   : public TargetHeapMetadata<Runtime> {
   using StoredPointer = typename Runtime::StoredPointer;
   uint32_t OffsetToFirstCapture;
-  TargetPointer<Runtime, CaptureDescriptor> CaptureDescription;
+  TargetPointer<Runtime, const char> CaptureDescription;
 };
 using HeapLocalVariableMetadata
   = TargetHeapLocalVariableMetadata<InProcess>;