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 #19447 from xedin/fix-req-diagnstics-not-to-print-special-names

Browse Source 
[CSDiagnostics] Don't mention special names in requirement diagnostics
This commit is contained in:
Pavel Yaskevich
2018-09-21 14:17:08 -07:00
committed by GitHub
parent fee089ccbb 02d5401499
commit 6dc4591a5f
9 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Sema/CSDiagnostics.cpp
View File

@@ -141,16 +141,16 @@ bool RequirementFailure::diagnoseAsError() {
const auto *reqDC = getRequirementDC();
auto *genericCtx = AffectedDecl->getAsGenericContext();
auto declName = AffectedDecl->getFullName();
if (reqDC != genericCtx) {
auto *NTD = reqDC->getSelfNominalTypeDecl();
emitDiagnostic(anchor->getLoc(), getDiagnosticInRereference(),
AffectedDecl->getDescriptiveKind(),
AffectedDecl->getFullName(), NTD->getDeclaredType(),
getLHS(), getRHS());
AffectedDecl->getDescriptiveKind(), declName.isSpecial(),
declName, NTD->getDeclaredType(), getLHS(), getRHS());
} else {
emitDiagnostic(anchor->getLoc(), getDiagnosticOnDecl(),
AffectedDecl->getDescriptiveKind(),
AffectedDecl->getFullName(), getLHS(), getRHS());
AffectedDecl->getDescriptiveKind(), declName.isSpecial(),
declName, getLHS(), getRHS());
}
emitRequirementNote(reqDC->getAsDecl());