From owner-svn-src-head@FreeBSD.ORG  Thu Aug 23 18:15:00 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 36852106566C;
	Thu, 23 Aug 2012 18:15:00 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 217288FC12;
	Thu, 23 Aug 2012 18:15:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7NIExoW072117;
	Thu, 23 Aug 2012 18:14:59 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7NIEx4h072114;
	Thu, 23 Aug 2012 18:14:59 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201208231814.q7NIEx4h072114@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 23 Aug 2012 18:14:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239619 - head/contrib/llvm/tools/clang/lib/Sema
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2012 18:15:00 -0000

Author: dim
Date: Thu Aug 23 18:14:59 2012
New Revision: 239619
URL: http://svn.freebsd.org/changeset/base/239619

Log:
  Pull in r162360 from upstream clang trunk:
  
    Merge existing attributes before processing pragmas in friend template
    declarations.
    Fixes pr13662.
  
  This should help when building Firefox with libc++.

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

Modified: head/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp	Thu Aug 23 17:58:22 2012	(r239618)
+++ head/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp	Thu Aug 23 18:14:59 2012	(r239619)
@@ -1104,6 +1104,9 @@ Sema::CheckClassTemplate(Scope *S, unsig
   if (Attr)
     ProcessDeclAttributeList(S, NewClass, Attr);
 
+  if (PrevClassTemplate)
+    mergeDeclAttributes(NewClass, PrevClassTemplate->getTemplatedDecl());
+
   AddPushedVisibilityAttribute(NewClass);
 
   if (TUK != TUK_Friend)
@@ -1138,8 +1141,6 @@ Sema::CheckClassTemplate(Scope *S, unsig
     NewTemplate->setInvalidDecl();
     NewClass->setInvalidDecl();
   }
-  if (PrevClassTemplate)
-    mergeDeclAttributes(NewClass, PrevClassTemplate->getTemplatedDecl());
 
   ActOnDocumentableDecl(NewTemplate);