averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines

Browse Source
This commit is contained in:
Dmitri Gribenko
2016-02-17 14:40:05 -08:00
parent 0e1c488f9a b480ab1f5f
commit dd75aed67a
450 changed files with 8406 additions and 5202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AST/ConformanceLookupTable.cpp
View File

@@ -789,7 +789,7 @@ ProtocolConformance *ConformanceLookupTable::getConformance(
return nullptr;
NominalTypeDecl *conformingNominal
= conformingDC->isNominalTypeOrNominalTypeExtensionContext();
= conformingDC->getAsNominalTypeOrNominalTypeExtensionContext();
// Form the conformance.
Type type = entry->getDeclContext()->getDeclaredTypeInContext();
@@ -843,7 +843,7 @@ void ConformanceLookupTable::registerProtocolConformance(
ProtocolConformance *conformance) {
auto protocol = conformance->getProtocol();
auto dc = conformance->getDeclContext();
auto nominal = dc->isNominalTypeOrNominalTypeExtensionContext();
auto nominal = dc->getAsNominalTypeOrNominalTypeExtensionContext();
// If there is an entry to update, do so.
auto &dcConformances = AllConformances[dc];