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 #11045 from itaiferber/codable-class-fixes

Browse Source 
Codable Class Fixes
This commit is contained in:
Itai Ferber
2017-07-24 15:42:45 -07:00
committed by GitHub
parent ddea636951 071caf263a
commit 4c366d8efe
10 changed files with 559 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Sema/DerivedConformanceRawRepresentable.cpp
View File

@@ -343,8 +343,9 @@ static bool canSynthesizeRawRepresentable(TypeChecker &tc, Decl *parentDecl,
auto parentDC = cast<DeclContext>(parentDecl);
rawType = parentDC->mapTypeIntoContext(rawType);
if (!enumDecl->getInherited().empty() &&
enumDecl->getInherited().front().isError())
auto inherited = enumDecl->getInherited();
if (!inherited.empty() && inherited.front().wasValidated() &&
inherited.front().isError())
return false;
// The raw type must be Equatable, so that we have a suitable ~= for