Sema: Fix order dependency in @objc inference from witnessed protocol requirement #24255
Conversation
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
… requirement If we haven't validated the declaration yet, the 'witnesses @objc requirement' check would immediately fail. Move the validateDecl() call to matchWitness() to fix this. Fixes <rdar://problem/49482328>, <https://bugs.swift.org/browse/SR-10257>.
slavapestov
force-pushed
the
objc-from-witnessed-requirement-ordering
branch
from
6cd1afd to
04ac33d
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
| // If the witness is invalid, record that and stop now. | ||
| if (witness->isInvalid()) | ||
| return RequirementMatch(witness, MatchKind::WitnessInvalid); | ||
|
|
||
| // If we're currently validating the witness, bail out. |
There was a problem hiding this comment.
This comment seems like it shouldn't be correct. Either this function is called re-entrantly and will loop infinitely because of the above call, or the above call notices the circularity and returns without setting anything up. If you're talking about the latter, maybe this should move inside the first if to make it clearer what's going on?
There was a problem hiding this comment.
Right, it's not this function that's called re-entrantly; the bad case is when validateDecl() calls us, and we call validateDecl(). In this case validateDecl() returns without doing anything.
If we haven't validated the declaration yet, the 'witnesses @objc
requirement' check would immediately fail. Move the validateDecl()
call to matchWitness() to fix this.
Fixes rdar://problem/49482328, https://bugs.swift.org/browse/SR-10257.