aboutsummaryrefslogtreecommitdiff
path: root/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2013-07-03 19:08:10 +0000
committerDimitry Andric <dim@FreeBSD.org>2013-07-03 19:08:10 +0000
commit0cf157db98b832e8715026333aab08a3a7c96b16 (patch)
tree23fad2188e0a7100b0e3ea26357f7bdfa2cfdcd5 /contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
parent9ce127ad7693f0a026e7a9be323fa0a6ce3f3621 (diff)
Pull in r185446 from clang trunk:
Fix to PR15826 - clang hits assert in clang::ASTContext::getASTRecordLayout. Reported by: glebius
Notes
Notes: svn path=/head/; revision=252587
Diffstat (limited to 'contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp')
-rw-r--r--contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp b/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
index f72bec0aa147..fd7cfeb6f0da 100644
--- a/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
+++ b/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
@@ -10296,7 +10296,8 @@ void Sema::ActOnTagFinishDefinition(Scope *S, Decl *TagD,
Tag->setTopLevelDeclInObjCContainer();
// Notify the consumer that we've defined a tag.
- Consumer.HandleTagDeclDefinition(Tag);
+ if (!Tag->isInvalidDecl())
+ Consumer.HandleTagDeclDefinition(Tag);
}
void Sema::ActOnObjCContainerFinishDefinition() {