From owner-svn-src-all@FreeBSD.ORG  Wed Jul  3 19:08:11 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 7B2008D9;
 Wed,  3 Jul 2013 19:08:11 +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 6DD6E104F;
 Wed,  3 Jul 2013 19:08:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63J8BRY079825;
 Wed, 3 Jul 2013 19:08:11 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63J8B9r079824;
 Wed, 3 Jul 2013 19:08:11 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201307031908.r63J8B9r079824@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 3 Jul 2013 19:08:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252587 - head/contrib/llvm/tools/clang/lib/Sema
X-SVN-Group: head
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: Wed, 03 Jul 2013 19:08:11 -0000

Author: dim
Date: Wed Jul  3 19:08:10 2013
New Revision: 252587
URL: http://svnweb.freebsd.org/changeset/base/252587

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

Modified:
  head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp

Modified: head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp	Wed Jul  3 18:53:36 2013	(r252586)
+++ head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp	Wed Jul  3 19:08:10 2013	(r252587)
@@ -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() {