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

[Type checker] Use Decl::diagnose() in more places

Browse Source 
Eliminates an unnecessary dependency on the TypeChecker instance and lets us deal
with references across modules.
This commit is contained in:
Doug Gregor
2019-01-02 13:55:48 -08:00
parent 9afa479318
commit c8b03fd944
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Sema/DerivedConformanceEquatableHashable.cpp
View File

@@ -1185,9 +1185,9 @@ ValueDecl *DerivedConformance::deriveHashable(ValueDecl *requirement) {
auto hashableProto = C.getProtocol(KnownProtocolKind::Hashable);
if (!canDeriveConformance(getConformanceContext(), Nominal,
hashableProto)) {
TC.diagnose(ConformanceDecl->getLoc(), diag::type_does_not_conform,
Nominal->getDeclaredType(),
hashableProto->getDeclaredType());
ConformanceDecl->diagnose(diag::type_does_not_conform,
Nominal->getDeclaredType(),
hashableProto->getDeclaredType());
return nullptr;
}
@@ -1213,13 +1213,13 @@ ValueDecl *DerivedConformance::deriveHashable(ValueDecl *requirement) {
// hashValue has an explicit implementation, but hash(into:) doesn't.
// Emit a deprecation warning, then derive hash(into:) in terms of
// hashValue.
TC.diagnose(hashValueDecl->getLoc(), diag::hashvalue_implementation,
Nominal->getDeclaredType());
hashValueDecl->diagnose(diag::hashvalue_implementation,
Nominal->getDeclaredType());
return deriveHashable_hashInto(*this,
&deriveBodyHashable_compat_hashInto);
}
}
TC.diagnose(requirement->getLoc(), diag::broken_hashable_requirement);
requirement->diagnose(diag::broken_hashable_requirement);
return nullptr;
}