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

Always create a DefaultArgumentInitializer for a parameter with a default argument.

Browse Source 
As with pattern binding initializer contexts, we were trying to
optimize away these contexts, leading to an unpredictable AST.
This commit is contained in:
Doug Gregor
2016-09-01 18:22:22 -07:00
parent 85537fd66b
commit 78b007f178
11 changed files with 68 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Parse/ParsePattern.cpp
View File

@@ -47,10 +47,9 @@ static DefaultArgumentKind getDefaultArgKind(Expr *init) {
}
}
void Parser::DefaultArgumentInfo::setFunctionContext(DeclContext *DC) {
assert(DC->isLocalContext());
void Parser::DefaultArgumentInfo::setFunctionContext(AbstractFunctionDecl *AFD){
for (auto context : ParsedContexts) {
context->changeFunction(DC);
context->changeFunction(AFD);
}
}
@@ -64,19 +63,15 @@ static ParserStatus parseDefaultArgument(Parser &P,
// Enter a fresh default-argument context with a meaningless parent.
// We'll change the parent to the function later after we've created
// that declaration.
auto initDC =
P.Context.createDefaultArgumentContext(P.CurDeclContext, argIndex);
auto initDC = new (P.Context) DefaultArgumentInitializer(P.CurDeclContext,
argIndex);
Parser::ParseFunctionBody initScope(P, initDC);
ParserResult<Expr> initR = P.parseExpr(diag::expected_init_value);
// Give back the default-argument context if we didn't need it.
if (!initScope.hasClosures()) {
P.Context.destroyDefaultArgumentContext(initDC);
// Otherwise, record it if we're supposed to accept default
// Record the default-argument context if we're supposed to accept default
// arguments here.
} else if (defaultArgs) {
if (defaultArgs) {
defaultArgs->ParsedContexts.push_back(initDC);
}