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

Merge pull request #29389 from xedin/rdar-50666427

Browse Source 
[Diagnostics] Unsatisfied requirement `in reference` diagnostics expe…
This commit is contained in:
Pavel Yaskevich
2020-01-24 09:30:12 -08:00
committed by GitHub
parent 48ba3158ac d412ea4d16
commit 0dcb78fe69
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Sema/CSDiagnostics.cpp
View File

@@ -337,8 +337,9 @@ bool RequirementFailure::diagnoseAsError() {
return true;
}
if (genericCtx != reqDC && (genericCtx->isChildContextOf(reqDC) ||
isStaticOrInstanceMember(AffectedDecl))) {
if (reqDC->isTypeContext() && genericCtx != reqDC &&
(genericCtx->isChildContextOf(reqDC) ||
isStaticOrInstanceMember(AffectedDecl))) {
auto *NTD = reqDC->getSelfNominalTypeDecl();
emitDiagnostic(anchor->getLoc(), getDiagnosticInRereference(),
AffectedDecl->getDescriptiveKind(),