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

Set DeclContext for argument parameter patterns

Browse Source 
Fixes a crash in Serializer, when processing a function with a selector-style signature.

Also added an AST verifier check that all Decls have a non-null DeclContext.


Swift SVN r8621
This commit is contained in:
Dmitri Hrybenko
2013-09-25 01:47:27 +00:00
parent 5967115a00
commit 33aada4b16
2 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/Parse/ParseDecl.cpp
View File

@@ -1483,6 +1483,30 @@ ParserStatus Parser::parseDeclVar(unsigned Flags,
return Status;
}
namespace {
/// Recursively walks a pattern and sets all variables' decl contexts to the
/// given context.
class SetVarContext : public ASTWalker {
DeclContext *DC;
public:
SetVarContext(DeclContext *DC) : DC(DC) {}
Pattern *walkToPatternPost(Pattern *P) override {
// Handle vars.
if (auto *Named = dyn_cast<NamedPattern>(P))
Named->getDecl()->setDeclContext(DC);
return P;
}
};
} // unnamed namespace
static void setVarContext(ArrayRef<Pattern *> Patterns, DeclContext *DC) {
for (auto P : Patterns) {
P->walk(SetVarContext(DC));
}
}
/// \brief Build an implicit 'self' parameter for the current DeclContext.
Pattern *Parser::buildImplicitSelfParameter() {
VarDecl *D
@@ -1644,6 +1668,7 @@ Parser::parseDeclFunc(SourceLoc StaticLoc, unsigned Flags) {
CodeCompletion->setDelayedParsedDecl(FD);
addFunctionParametersToScope(FD->getBodyParamPatterns(), FD);
setVarContext(FD->getArgParamPatterns(), FD);
// Now that we have a context, update the generic parameters with that
// context.
@@ -2270,24 +2295,6 @@ ParserResult<ProtocolDecl> Parser::parseDeclProtocol(unsigned Flags) {
return makeParserResult(Status, Proto);
}
namespace {
/// Recursively walks a pattern and sets all variables' decl contexts to the
/// given context.
class SetVarContext : public ASTWalker {
DeclContext *CurDeclContext;
public:
SetVarContext(DeclContext *Context) : CurDeclContext(Context) {}
Pattern *walkToPatternPost(Pattern *P) override {
// Handle vars.
if (auto *Named = dyn_cast<NamedPattern>(P))
Named->getDecl()->setDeclContext(CurDeclContext);
return P;
}
};
}
/// \brief Parse a 'subscript' declaration.
///
/// \verbatim