commit f8bb3de4882b228c85a40c37169a9d5c1c546ef5
author Nico Weber <nicolasweber@gmx.de> Wed Feb 01 00:41:00 2012 +0000
committer Nico Weber <nicolasweber@gmx.de> Wed Feb 01 00:41:00 2012 +0000
tree c2e48d3fe2fe65052e125fe796d4c7a00646146c
parent 3b22c6c3954c2c2bea8155dd645f623b2cec782d

Fix crash on invalid in microsoft anonymous struct extension.

Fixes PR11847. Patch from Jason Haslam!

llvm-svn: 149460

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index d545d03..87bcfe9 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -2952,9 +2952,10 @@
   SmallVector<NamedDecl*, 2> Chain;
   Chain.push_back(Anon);
 
-  if (InjectAnonymousStructOrUnionMembers(*this, S, CurContext,
-                                          Record->getDefinition(),
-                                          AS_none, Chain, true))
+  RecordDecl *RecordDef = Record->getDefinition();
+  if (!RecordDef || InjectAnonymousStructOrUnionMembers(*this, S, CurContext,
+                                                        RecordDef, AS_none,
+                                                        Chain, true))
     Anon->setInvalidDecl();
 
   return Anon;