Skip to content

IRGen: Lookup the conformance of an archetype in the right substitution map when computing necessary bindings of abstract cnditional requirements #32277

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 3 commits into from
Jun 15, 2020
Merged

IRGen: Lookup the conformance of an archetype in the right substitution map when computing necessary bindings of abstract cnditional requirements #32277

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b47815
IRGen: Lookup the conformance of an archetype in the right substituti…
aschwaighofer Jun 9, 2020
478e13b
Address review feedback
aschwaighofer Jun 10, 2020
8a2bfb0
No need to lookup the conformance we can just take the protocol from …
aschwaighofer Jun 11, 2020
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
7 changes: 5 additions & 2 deletions lib/IRGen/GenProto.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2749,9 +2749,12 @@ static void addAbstractConditionalRequirements(
auto *proto =
req.getSecondType()->castTo<ProtocolType>()->getDecl();
auto ty = req.getFirstType()->getCanonicalType();
if (!isa<ArchetypeType>(ty))
auto archetype = dyn_cast<ArchetypeType>(ty);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: extra space

if (!archetype)
continue;
auto conformance = subMap.lookupConformance(ty, proto);
auto *genericEnv = archetype->getGenericEnvironment();
auto conformance =
genericEnv->getForwardingSubstitutionMap().lookupConformance(ty, proto);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this ever not just an abstract conformance? Look at how the forwarding substitution map is constructed...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I replaced the check by an assert.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you see if conformance.getAbstract() always equal to proto? If that always holds, you can simplify the code further (and get rid of the asserts since they're not really computing anything useful at this point).

if (!conformance.isAbstract())
continue;
requirements.insert({ty, conformance.getAbstract()});
Expand Down
2 changes: 1 addition & 1 deletion test/IRGen/partial_apply_forwarder.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ bb0(%0 : $Outer<Inner<Element>>):
return %15 : $()
}

sil @$dont_crash_test_capture_specialized_conditional_conformance_nested : $@convention(thin) <Element where Element : MyEquatable> (Outer<Inner<Element>>) -> () {
sil @$dont_crash_test_capture_specialized_conditional_conformance_nested : $@convention(thin) <A, B, Element where Element : MyEquatable> (Outer<Inner<Element>>) -> () {
bb0(%0 : $Outer<Inner<Element>>):
%4 = metatype $@thin Outermost<Outer<Inner<Element>>>.Type
%5 = function_ref @$closure2 : $@convention(method) <Value where Value : MyEquatable> (Outermost<Value>, Outermost<Value>, @thin Outermost<Value>.Type) -> Builtin.Int1
Expand Down