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/swift-3-api-guidelines' into swift-3-omit-needless-words

Browse Source
This commit is contained in:
Doug Gregor
2015-12-17 11:35:58 -08:00
parent 2f5f94a12c 3fe0c60d7f
commit f245f18a09
499 changed files with 5428 additions and 5745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Sema/CodeSynthesis.cpp
View File

@@ -2239,13 +2239,12 @@ swift::createDesignatedInitOverride(TypeChecker &tc,
ctx);
// Configure 'self'.
GenericParamList *outerGenericParams = nullptr;
Type selfType = configureImplicitSelf(tc, ctor, outerGenericParams);
Type selfType = configureImplicitSelf(tc, ctor);
selfBodyPattern->setType(selfType);
cast<TypedPattern>(selfBodyPattern)->getSubPattern()->setType(selfType);
// Set the type of the initializer.
configureConstructorType(ctor, outerGenericParams, selfType,
configureConstructorType(ctor, selfType,
bodyParamPatterns->getType(),
superclassCtor->isBodyThrowing());
if (superclassCtor->isObjC()) {