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 | 1f12c47ae90c03633496d96e79a61762097a4681 (patch) | |
| tree | 7a6b7c0cc8ac595d79b2b132046fac4d99c5be59 | |
| parent | d9bd83e0af720733e7564b125c1c9d495318b9e2 (diff) | |
[libclang] Fix a crash with invalid code, while skip function bodies is enabled.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175860 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Parse/ParseStmt.cpp | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 4 | ||||
| -rw-r--r-- | test/Index/index-file.cpp | 4 |
3 files changed, 7 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); } diff --git a/test/Index/index-file.cpp b/test/Index/index-file.cpp index bf2d62c556..7634c0db86 100644 --- a/test/Index/index-file.cpp +++ b/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 |