Merge pull request #71769 from augusto2112/gen-class-enum

Generate full debug info for generic enums and classes, and emit spare bits mask of MPE enums

Author: augusto2112

include/swift/RemoteInspection/DescriptorFinder.h

@@ -93,6 +93,26 @@ struct FieldDescriptorBase {
   getFieldRecords() = 0;
 };
 
+struct MultiPayloadEnumDescriptorBase {
+  virtual ~MultiPayloadEnumDescriptorBase(){};
+
+  virtual llvm::StringRef getMangledTypeName() = 0;
+
+  virtual uint32_t getContentsSizeInWords() const = 0;
+
+  virtual size_t getSizeInBytes() const = 0;
+
+  virtual uint32_t getFlags() const = 0;
+
+  virtual bool usesPayloadSpareBits() const = 0;
+
+  virtual uint32_t getPayloadSpareBitMaskByteOffset() const = 0;
+
+  virtual uint32_t getPayloadSpareBitMaskByteCount() const = 0;
+
+  virtual const uint8_t *getPayloadSpareBits() const = 0;
+
+};
 /// Interface for finding type descriptors. Implementors may provide descriptors
 /// that live inside or outside reflection metadata.
 struct DescriptorFinder {
@@ -104,6 +124,9 @@ struct DescriptorFinder {
 
   virtual std::unique_ptr<FieldDescriptorBase>
   getFieldDescriptor(const TypeRef *TR) = 0;
+
+  virtual std::unique_ptr<MultiPayloadEnumDescriptorBase>
+  getMultiPayloadEnumDescriptor(const TypeRef *TR) = 0;
 };
 
 } // namespace reflection

include/swift/RemoteInspection/TypeRefBuilder.h

@@ -490,8 +490,8 @@ class TypeRefBuilder {
     ClosureContextInfo getClosureContextInfo(RemoteRef<CaptureDescriptor> CD);
 
     /// Get the multipayload enum projection information for a given TR
-    RemoteRef<MultiPayloadEnumDescriptor>
-    getMultiPayloadEnumInfo(const TypeRef *TR);
+    std::unique_ptr<MultiPayloadEnumDescriptorBase>
+    getMultiPayloadEnumDescriptor(const TypeRef *TR) override;
 
     const TypeRef *lookupTypeWitness(const std::string &MangledTypeName,
                                      const std::string &Member,
@@ -515,6 +515,8 @@ class TypeRefBuilder {
     /// Load unsubstituted field types for a nominal type.
     RemoteRef<FieldDescriptor> getFieldTypeInfo(const TypeRef *TR);
 
+    RemoteRef<MultiPayloadEnumDescriptor> getMultiPayloadEnumInfo(const TypeRef *TR);
+
     void populateFieldTypeInfoCacheWithReflectionAtIndex(size_t Index);
 
     llvm::Optional<RemoteRef<FieldDescriptor>>
@@ -1565,15 +1567,16 @@ class TypeRefBuilder {
   }
 
   /// Get the multipayload enum projection information for a given TR
-  RemoteRef<MultiPayloadEnumDescriptor>
-  getMultiPayloadEnumInfo(const TypeRef *TR) {
-    return RDF.getMultiPayloadEnumInfo(TR);
-  }
+  std::unique_ptr<MultiPayloadEnumDescriptorBase>
+  getMultiPayloadEnumDescriptor(const TypeRef *TR);
 
 private:
   /// Get the primitive type lowering for a builtin type.
   RemoteRef<BuiltinTypeDescriptor> getBuiltinTypeInfo(const TypeRef *TR);
 
+  RemoteRef<MultiPayloadEnumDescriptor>
+  getMultiPayloadEnumInfo(const TypeRef *TR);
+
   llvm::Optional<uint64_t> multiPayloadEnumPointerMask;
 
 public: