averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Runtime] Eliminate the now-unused "NonuniqueDirectType" type reference kind.

Browse Source 
Now that we use nominal type descriptors for everything that we can within
protocol conformance records, eliminate the unused
"NonuniqueDirectType" case and all of the code that supports it. Leave
this value explicitly reserved for the future.
This commit is contained in:
Doug Gregor
2018-01-04 13:21:58 -08:00
parent e0255467cb
commit cc3e3701b2
5 changed files with 23 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
stdlib/public/runtime/ProtocolConformance.cpp
View File

@@ -48,13 +48,8 @@ template<> void ProtocolConformanceRecord::dump() const {
};
switch (auto kind = getTypeKind()) {
case TypeMetadataRecordKind::NonuniqueDirectType:
printf("direct type nonunique ");
if (const auto *ntd = getDirectType()->getNominalTypeDescriptor()) {
printf("%s", ntd->Name.get());
} else {
printf("<structural type>");
}
case TypeMetadataRecordKind::Reserved:
printf("unknown (reserved)");
break;
case TypeMetadataRecordKind::IndirectObjCClass:
printf("indirect Objective-C class %s",
@@ -94,12 +89,8 @@ template<> void ProtocolConformanceRecord::dump() const {
template <>
const Metadata *ProtocolConformanceRecord::getCanonicalTypeMetadata() const {
switch (getTypeKind()) {
case TypeMetadataRecordKind::NonuniqueDirectType: {
// Ask the runtime for the unique metadata record we've canonized.
const ForeignTypeMetadata *FMD =
static_cast<const ForeignTypeMetadata *>(getDirectType());
return swift_getForeignTypeMetadata(const_cast<ForeignTypeMetadata *>(FMD));
}
case TypeMetadataRecordKind::Reserved:
return nullptr;
case TypeMetadataRecordKind::IndirectObjCClass:
// The class may be ObjC, in which case we need to instantiate its Swift
// metadata. The class additionally may be weak-linked, so we have to check