summaryrefslogtreecommitdiffstats
path: root/contrib/llvm/tools/clang
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2013-07-03 19:08:10 +0000
committerdim <dim@FreeBSD.org>2013-07-03 19:08:10 +0000
commitc4c2416223305bd639dcbab27545f50a1ac1f8cf (patch)
tree23fad2188e0a7100b0e3ea26357f7bdfa2cfdcd5 /contrib/llvm/tools/clang
parent35542a4c337c245a9c93ae6df6514fc258686280 (diff)
downloadFreeBSD-src-c4c2416223305bd639dcbab27545f50a1ac1f8cf.zip
FreeBSD-src-c4c2416223305bd639dcbab27545f50a1ac1f8cf.tar.gz
Pull in r185446 from clang trunk:
Fix to PR15826 - clang hits assert in clang::ASTContext::getASTRecordLayout. Reported by: glebius
Diffstat (limited to 'contrib/llvm/tools/clang')
-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 f72bec0..fd7cfeb 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() {
OpenPOWER on IntegriCloud