diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2013-02-22 04:11:06 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2013-02-22 04:11:06 +0000 |
| commit | 4431918f40a252d5182028c62002a1a7fd4b88c7 (patch) | |
| tree | 982399b767fbb7b3cc2c57a735d83d391f5b97c7 | |
| parent | 62eae089cacccfdcca473aa5400a88dbc1b9fe0d (diff) | |
| download | bcm5719-llvm-4431918f40a252d5182028c62002a1a7fd4b88c7.tar.gz bcm5719-llvm-4431918f40a252d5182028c62002a1a7fd4b88c7.zip | |
[libclang] Fix a crash with invalid code, while skip function bodies is enabled.
llvm-svn: 175860
| -rw-r--r-- | clang/lib/Parse/ParseStmt.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 4 | ||||
| -rw-r--r-- | clang/test/Index/index-file.cpp | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp index a77c03459fa..71a7b2c9f9b 100644 --- a/clang/lib/Parse/ParseStmt.cpp +++ b/clang/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/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 189b3d94e2b..03d18d402d5 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/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); } diff --git a/clang/test/Index/index-file.cpp b/clang/test/Index/index-file.cpp index bf2d62c5568..7634c0db863 100644 --- a/clang/test/Index/index-file.cpp +++ b/clang/test/Index/index-file.cpp @@ -1,5 +1,9 @@ using MyTypeAlias = int; +extern "C" { + template < typename T > *Allocate() { } +} + // RUN: c-index-test -index-file %s > %t // RUN: FileCheck %s -input-file=%t |
