Skip to content

Commit 6b704ad

Browse files
committed
[RemoteMirrors] Remove MultiPayloadEnumDescriptor from descriptor finder
Remote Mirrors is able to calculate type infos without needing MultiPayloadEnumDescriptors. Remove the functionality to look it up.
1 parent f5de38e commit 6b704ad

File tree

2 files changed

+0
-45
lines changed

2 files changed

+0
-45
lines changed

include/swift/RemoteInspection/DescriptorFinder.h

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -93,31 +93,6 @@ struct FieldDescriptorBase {
9393
getFieldRecords() = 0;
9494
};
9595

96-
// There are no longer any clients of this interface, but we
97-
// need to keep this stubbed out until all the
98-
// implementors have been removed. In particular, LLDB
99-
// still implements this interface.
100-
// TODO: Delete this after Swift 6.0 ships
101-
struct MultiPayloadEnumDescriptorBase {
102-
virtual ~MultiPayloadEnumDescriptorBase(){ abort(); };
103-
104-
virtual llvm::StringRef getMangledTypeName() { abort(); };
105-
106-
virtual uint32_t getContentsSizeInWords() const { abort(); };
107-
108-
virtual size_t getSizeInBytes() const { abort(); };
109-
110-
virtual uint32_t getFlags() const { abort(); };
111-
112-
virtual bool usesPayloadSpareBits() const { abort(); };
113-
114-
virtual uint32_t getPayloadSpareBitMaskByteOffset() const { abort(); };
115-
116-
virtual uint32_t getPayloadSpareBitMaskByteCount() const { abort(); };
117-
118-
virtual const uint8_t *getPayloadSpareBits() const { abort(); };
119-
};
120-
12196
/// Interface for finding type descriptors. Implementors may provide descriptors
12297
/// that live inside or outside reflection metadata.
12398
struct DescriptorFinder {
@@ -129,10 +104,6 @@ struct DescriptorFinder {
129104

130105
virtual std::unique_ptr<FieldDescriptorBase>
131106
getFieldDescriptor(const TypeRef *TR) = 0;
132-
133-
// TODO: Delete this as soon as LLDB no longer attempts to override it
134-
virtual std::unique_ptr<MultiPayloadEnumDescriptorBase>
135-
getMultiPayloadEnumDescriptor(const TypeRef *TR) { abort(); };
136107
};
137108

138109
} // namespace reflection

test/DebugInfo/enum.swift

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,6 @@ enum Either {
2828
// CHECK: ![[EMPTY:.*]] = !{}
2929
let E : Either = .Neither;
3030

31-
class C {}
32-
enum EitherWithSpareBits {
33-
case Left(C), Right(Int32)
34-
// DWARF: !DICompositeType(tag: DW_TAG_structure_type, name: "EitherWithSpareBits",
35-
// DWARF-SAME: size: 64,
36-
// DWARF-SAME: runtimeLang: DW_LANG_Swift, identifier: "$s4enum19EitherWithSpareBitsOD")
37-
38-
// DWARF: !DICompositeType(tag: DW_TAG_variant_part,
39-
// DWARF-SAME: size: 64, offset: 56, spare_bits_mask: {{240|255}}
40-
41-
// DWARF: !DIDerivedType(tag: DW_TAG_member, name: "Left"
42-
43-
// DWARF: !DIDerivedType(tag: DW_TAG_member, name: "Right"
44-
}
45-
let Right: EitherWithSpareBits = .Right(32)
46-
4731
// CHECK: !DICompositeType({{.*}}name: "Color",
4832
// CHECK-SAME: size: 8,
4933
// CHECK-SAME: identifier: "$s4enum5ColorOD"

0 commit comments

Comments
 (0)