diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Parse/ParseStmt.cpp | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Parse/ParseStmt.cpp b/lib/Parse/ParseStmt.cpp index a77c03459f..71a7b2c9f9 100644 --- a/lib/Parse/ParseStmt.cpp +++ b/lib/Parse/ParseStmt.cpp @@ -1974,7 +1974,7 @@ Decl *Parser::ParseFunctionStatementBody(Decl *Decl, ParseScope &BodyScope) { assert(Tok.is(tok::l_brace)); SourceLocation LBraceLoc = Tok.getLocation(); - if (SkipFunctionBodies && Actions.canSkipFunctionBody(Decl) && + if (SkipFunctionBodies && (!Decl || Actions.canSkipFunctionBody(Decl)) && trySkippingFunctionBody()) { BodyScope.Exit(); return Actions.ActOnSkippedFunctionBody(Decl); diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 189b3d94e2..03d18d402d 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -8449,9 +8449,9 @@ bool Sema::canSkipFunctionBody(Decl *D) { } Decl *Sema::ActOnSkippedFunctionBody(Decl *Decl) { - if (FunctionDecl *FD = dyn_cast<FunctionDecl>(Decl)) + if (FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(Decl)) FD->setHasSkippedBody(); - else if (ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(Decl)) + else if (ObjCMethodDecl *MD = dyn_cast_or_null<ObjCMethodDecl>(Decl)) MD->setHasSkippedBody(); return ActOnFinishFunctionBody(Decl, 0); } |