Skip to content

Sema: Explicitly infer requirements from subscript element type for materializeForSet [4.0] #10910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 14, 2017
Merged

Sema: Explicitly infer requirements from subscript element type for materializeForSet [4.0] #10910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions lib/Sema/TypeCheckGeneric.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,26 @@ static bool checkGenericFuncSignature(TypeChecker &tc,
source);
}
}

// If this is a materializeForSet, infer requirements from the
// storage type instead, since it's not part of the accessor's
// type signature.
if (fn->getAccessorKind() == AccessorKind::IsMaterializeForSet) {
if (builder) {
auto *storage = fn->getAccessorStorageDecl();
if (auto *subscriptDecl = dyn_cast<SubscriptDecl>(storage)) {
auto source =
GenericSignatureBuilder::FloatingRequirementSource::forInferred(
subscriptDecl->getElementTypeLoc().getTypeRepr(),
/*quietly=*/true);

TypeLoc type(nullptr, subscriptDecl->getElementInterfaceType());
assert(type.getType());
builder->inferRequirements(*func->getParentModule(),
type, source);
}
}
}
}

return badType;
Expand Down
22 changes: 22 additions & 0 deletions test/SILGen/materializeForSet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,28 @@ extension GenericSubscriptProtocol {

struct GenericSubscriptDefaultWitness : GenericSubscriptProtocol { }

// Make sure we correctly infer the 'T : Magic' requirement on all the accessors
// of the subscript.

struct GenericTypeWithRequirement<T : Magic> {}

protocol InferredRequirementOnSubscriptProtocol {
subscript<T>(i: Int) -> GenericTypeWithRequirement<T> { get set }
}

struct InferredRequirementOnSubscript : InferredRequirementOnSubscriptProtocol {
subscript<T>(i: Int) -> GenericTypeWithRequirement<T> {
get { }
set { }
}
}

// CHECK-LABEL: sil hidden @_T017materializeForSet30InferredRequirementOnSubscriptV9subscriptAA015GenericTypeWithE0VyxGSicAA5MagicRzlufg : $@convention(method) <T where T : Magic> (Int, InferredRequirementOnSubscript) -> GenericTypeWithRequirement<T>

// CHECK-LABEL: sil hidden @_T017materializeForSet30InferredRequirementOnSubscriptV9subscriptAA015GenericTypeWithE0VyxGSicAA5MagicRzlufs : $@convention(method) <T where T : Magic> (GenericTypeWithRequirement<T>, Int, @inout InferredRequirementOnSubscript) -> ()

// CHECK-LABEL: sil hidden [transparent] @_T017materializeForSet30InferredRequirementOnSubscriptV9subscriptAA015GenericTypeWithE0VyxGSicAA5MagicRzlufm : $@convention(method) <T where T : Magic> (Builtin.RawPointer, @inout Builtin.UnsafeValueBuffer, Int, @inout InferredRequirementOnSubscript) -> (Builtin.RawPointer, Optional<Builtin.RawPointer>)

// Test for materializeForSet vs static properties of structs.

protocol Beverage {
Expand Down