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 remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2017-07-05 15:28:50 -07:00
parent 17f8a8488d 834a7d5052
commit 2dc84ee365
18 changed files with 54 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AST/Decl.cpp
View File

@@ -4197,7 +4197,7 @@ Type DeclContext::getSelfInterfaceType() const {
/// generic parameters.
ParamDecl *ParamDecl::createUnboundSelf(SourceLoc loc, DeclContext *DC) {
ASTContext &C = DC->getASTContext();
auto *selfDecl = new (C) ParamDecl(VarDecl::Specifier::None, SourceLoc(), SourceLoc(),
auto *selfDecl = new (C) ParamDecl(VarDecl::Specifier::Owned, SourceLoc(), SourceLoc(),
Identifier(), loc, C.Id_self, Type(), DC);
selfDecl->setImplicit();
return selfDecl;
@@ -4217,7 +4217,7 @@ ParamDecl *ParamDecl::createSelf(SourceLoc loc, DeclContext *DC,
ASTContext &C = DC->getASTContext();
auto selfType = DC->getSelfTypeInContext();
auto selfInterfaceType = DC->getSelfInterfaceType();
auto specifier = VarDecl::Specifier::None;
auto specifier = VarDecl::Specifier::Owned;
assert(selfType && selfInterfaceType);
if (isStaticMethod) {