From owner-svn-src-all@FreeBSD.ORG  Sat Jul  6 22:51:56 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 95875185;
 Sat,  6 Jul 2013 22:51:56 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8711C189D;
 Sat,  6 Jul 2013 22:51:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r66MpuYq040336;
 Sat, 6 Jul 2013 22:51:56 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r66Mpuhn040335;
 Sat, 6 Jul 2013 22:51:56 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201307062251.r66Mpuhn040335@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 6 Jul 2013 22:51:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252901 - stable/9/contrib/llvm/tools/clang/lib/Sema
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jul 2013 22:51:56 -0000

Author: dim
Date: Sat Jul  6 22:51:56 2013
New Revision: 252901
URL: http://svnweb.freebsd.org/changeset/base/252901

Log:
  MFC r252587:
  
  Pull in r185446 from clang trunk:
  
   Fix to PR15826 - clang hits assert in clang::ASTContext::getASTRecordLayout.
  
  Reported by:	glebius

Modified:
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
Directory Properties:
  stable/9/contrib/llvm/   (props changed)
  stable/9/contrib/llvm/tools/clang/   (props changed)

Modified: stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
==============================================================================
--- stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp	Sat Jul  6 22:39:17 2013	(r252900)
+++ stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp	Sat Jul  6 22:51:56 2013	(r252901)
@@ -10296,7 +10296,8 @@ void Sema::ActOnTagFinishDefinition(Scop
     Tag->setTopLevelDeclInObjCContainer();
 
   // Notify the consumer that we've defined a tag.
-  Consumer.HandleTagDeclDefinition(Tag);
+  if (!Tag->isInvalidDecl())
+    Consumer.HandleTagDeclDefinition(Tag);
 }
 
 void Sema::ActOnObjCContainerFinishDefinition() {