Skip to content

[4.0] [AST Verifier] Don't verify parsed function bodies in a type-checked AST. #10389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 21, 2017
Merged

[4.0] [AST Verifier] Don't verify parsed function bodies in a type-checked AST. #10389

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions lib/AST/ASTVerifier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,28 @@ class Verifier : public ASTWalker {
bool shouldVerifyChecked(Pattern *S) { return S->hasType(); }
bool shouldVerifyChecked(Decl *S) { return true; }

// Only verify functions if they have bodies we can safely walk.
// FIXME: This is a bit of a hack; we should be able to check the
// invariants of a parsed body as well.
bool shouldVerify(AbstractFunctionDecl *afd) {
switch (afd->getBodyKind()) {
case AbstractFunctionDecl::BodyKind::None:
case AbstractFunctionDecl::BodyKind::TypeChecked:
case AbstractFunctionDecl::BodyKind::Skipped:
case AbstractFunctionDecl::BodyKind::MemberwiseInitializer:
return true;

case AbstractFunctionDecl::BodyKind::Unparsed:
case AbstractFunctionDecl::BodyKind::Parsed:
case AbstractFunctionDecl::BodyKind::Synthesize:
if (auto SF = dyn_cast<SourceFile>(afd->getModuleScopeContext())) {
return SF->ASTStage < SourceFile::TypeChecked;
}

return false;
}
}

// Default cases for cleaning up as we exit a node.
void cleanup(Expr *E) { }
void cleanup(Stmt *S) { }
Expand Down