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

Requestify the mangling-to-metadata APIs.

Browse Source 
Note that I've called out a couple of suspicious places where we
are requesting abstract metadata for superclasses but probably
need to be requesting something more complete.
This commit is contained in:
John McCall
2019-02-05 16:15:59 -05:00
parent de4564877a
commit d07efd37e0
7 changed files with 90 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
stdlib/public/runtime/Metadata.cpp
View File

@@ -2596,8 +2596,12 @@ swift::swift_initClassMetadata(ClassMetadata *self,
StringRef superclassName =
Demangle::makeSymbolicMangledNameStringRef(superclassNameBase);
SubstGenericParametersFromMetadata substitutions(self);
const Metadata *superclass =
swift_getTypeByMangledName(superclassName, substitutions, substitutions);
MetadataRequest request(/*FIXME*/MetadataState::Abstract,
/*non-blocking*/ false);
MetadataResponse response =
swift_getTypeByMangledName(request, superclassName,
substitutions, substitutions).getResponse();
auto superclass = response.Value;
if (!superclass) {
fatalError(0,
"failed to demangle superclass of %s from mangled name '%s'\n",
@@ -2686,8 +2690,12 @@ swift::swift_updateClassMetadata(ClassMetadata *self,
StringRef superclassName =
Demangle::makeSymbolicMangledNameStringRef(superclassNameBase);
SubstGenericParametersFromMetadata substitutions(self);
const Metadata *superclass =
swift_getTypeByMangledName(superclassName, substitutions, substitutions);
MetadataRequest request(/*FIXME*/MetadataState::Abstract,
/*non-blocking*/ false);
MetadataResponse response =
swift_getTypeByMangledName(request, superclassName,
substitutions, substitutions).getResponse();
const Metadata *superclass = response.Value;
if (!superclass) {
fatalError(0,
"failed to demangle superclass of %s from mangled name '%s'\n",
@@ -4192,12 +4200,12 @@ swift_getAssociatedTypeWitnessSlowImpl(
Demangle::makeSymbolicMangledNameStringRef(mangledNameBase);
// Demangle the associated type.
const Metadata *assocTypeMetadata;
MetadataResponse response;
if (inProtocolContext) {
// The protocol's Self is the only generic parameter that can occur in the
// type.
assocTypeMetadata =
swift_getTypeByMangledName(mangledName,
response =
swift_getTypeByMangledName(request, mangledName,
[conformingType](unsigned depth, unsigned index) -> const Metadata * {
if (depth == 0 && index == 0)
return conformingType;
@@ -4214,7 +4222,7 @@ swift_getAssociatedTypeWitnessSlowImpl(
return swift_getAssociatedConformanceWitness(wtable, conformingType,
type, reqBase,
dependentDescriptor);
});
}).getResponse();
} else {
// The generic parameters in the associated type name are those of the
// conforming type.
@@ -4224,9 +4232,10 @@ swift_getAssociatedTypeWitnessSlowImpl(
auto originalConformingType = findConformingSuperclass(conformingType,
conformance);
SubstGenericParametersFromMetadata substitutions(originalConformingType);
assocTypeMetadata = swift_getTypeByMangledName(mangledName, substitutions,
substitutions);
response = swift_getTypeByMangledName(request, mangledName, substitutions,
substitutions).getResponse();
}
auto assocTypeMetadata = response.Value;
if (!assocTypeMetadata) {
auto conformingTypeNameInfo = swift_getTypeName(conformingType, true);
@@ -4242,13 +4251,9 @@ swift_getAssociatedTypeWitnessSlowImpl(
mangledName.str().c_str());
}
assert((uintptr_t(assocTypeMetadata) &
ProtocolRequirementFlags::AssociatedTypeMangledNameBit) == 0);
// Check the metadata state.
auto response = swift_checkMetadataState(request, assocTypeMetadata);
// If the metadata was completed, record it in the witness table.
if (response.State == MetadataState::Complete) {
reinterpret_cast<const void**>(wtable)[witnessIndex] = assocTypeMetadata;
@@ -4970,10 +4975,11 @@ void swift::verifyMangledNameRoundtrip(const Metadata *metadata) {
auto mangledName = Demangle::mangleNode(node);
auto result =
swift_getTypeByMangledName(
swift_getTypeByMangledName(MetadataState::Abstract,
mangledName,
[](unsigned, unsigned){ return nullptr; },
[](const Metadata *, unsigned) { return nullptr; });
[](const Metadata *, unsigned) { return nullptr; })
.getMetadata();
if (metadata != result)
swift::warning(RuntimeErrorFlagNone,
"Metadata mangled name failed to roundtrip: %p -> %s -> %p\n",