Change type metadata accessors to support incomplete metadata.

This includes global generic and non-generic global access
functions, protocol associated type access functions,
swift_getGenericMetadata, and generic type completion functions.

The main part of this change is that the functions now need to take
a MetadataRequest and return a MetadataResponse, which is capable
of expressing that the request can fail.  The state of the returned
metadata is reported as an second, independent return value; this
allows the caller to easily check the possibility of failure without
having to mask it out from the returned metadata pointer, as well
as allowing it to be easily ignored.

Also, change metadata access functions to use swiftcc to ensure that
this return value is indeed returned in two separate registers.

Also, change protocol associated conformance access functions to use
swiftcc.  This isn't really related, but for some reason it snuck in.
Since it's clearly the right thing to do, and since I really didn't
want to retroactively tease that back out from all the rest of the
test changes, I've left it in.

Also, change generic metadata access functions to either pass all
the generic arguments directly or pass them all indirectly.  I don't
know how we ended up with the hybrid approach.  I needed to change all
the code-generation and calls here anyway in order to pass the request
parameter, and I figured I might as well change the ABI to something
sensible.
This commit is contained in:
John McCall
2018-03-18 14:59:13 -04:00
parent cb0be346d3
commit 31f2eec044
98 changed files with 1310 additions and 901 deletions

View File

@@ -216,15 +216,11 @@ namespace {
// Complete the metadata's instantiation.
auto dependency = pattern->CompletionFunction(metadata, context, pattern);
// FIXME: use a more precise dependency requirement returned by the
// completion function.
auto dependencyRequirement = MetadataRequest::Complete;
auto state = dependency == nullptr
auto state = dependency.Value == nullptr
? MetadataRequest::Complete
: inferStateForMetadata(metadata);
return { state, dependencyRequirement, dependency };
return { state, dependency.State, dependency.Value };
}
};
} // end anonymous namespace
@@ -488,21 +484,18 @@ swift::swift_allocateGenericValueMetadata(const ValueTypeDescriptor *description
}
/// The primary entrypoint.
const Metadata *
swift::swift_getGenericMetadata(const TypeContextDescriptor *description,
const void *arguments) {
auto genericArgs = (const void * const *) arguments;
MetadataResponse
swift::swift_getGenericMetadata(MetadataRequest request,
const void * const *arguments,
const TypeContextDescriptor *description) {
auto &generics = description->getFullGenericContextHeader();
size_t numGenericArgs = generics.Base.NumKeyArguments;
MetadataRequest request(MetadataRequest::Complete);
auto key = MetadataCacheKey(genericArgs, numGenericArgs);
auto key = MetadataCacheKey(arguments, numGenericArgs);
auto result =
getCache(generics).getOrInsert(key, request, description, genericArgs);
getCache(generics).getOrInsert(key, request, description, arguments);
// TODO: report cases where the state is inadequate
return result.second.Value;
return result.second;
}
/***************************************************************************/
@@ -3237,7 +3230,7 @@ swift::swift_getGenericWitnessTable(GenericWitnessTable *genericTable,
/***************************************************************************/
template <class Result, class Callbacks>
static Result performOnMetadataCache(Metadata *metadata,
static Result performOnMetadataCache(const Metadata *metadata,
Callbacks &&callbacks) {
// Handle different kinds of type that can delay their metadata.
const TypeContextDescriptor *description;
@@ -3264,12 +3257,12 @@ static Result performOnMetadataCache(Metadata *metadata,
bool swift::addToMetadataQueue(
std::unique_ptr<MetadataCompletionQueueEntry> &&queueEntry,
Metadata *dependency,
const Metadata *dependency,
MetadataRequest::BasicKind dependencyRequirement) {
struct EnqueueCallbacks {
std::unique_ptr<MetadataCompletionQueueEntry> &&QueueEntry;
bool forGenericMetadata(Metadata *metadata,
bool forGenericMetadata(const Metadata *metadata,
const TypeContextDescriptor *description,
GenericMetadataCache &cache,
MetadataCacheKey key) && {
@@ -3293,7 +3286,7 @@ void swift::resumeMetadataCompletion(
/*non-blocking*/ true);
}
void forGenericMetadata(Metadata *metadata,
void forGenericMetadata(const Metadata *metadata,
const TypeContextDescriptor *description,
GenericMetadataCache &cache,
MetadataCacheKey key) && {