From owner-svn-src-head@FreeBSD.ORG  Fri Jul 13 21:48:02 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 CED15106566C;
	Fri, 13 Jul 2012 21:48:02 +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 648DC8FC12;
	Fri, 13 Jul 2012 21:48:02 +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 q6DLm2QQ091508;
	Fri, 13 Jul 2012 21:48:02 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6DLm2Bl091505;
	Fri, 13 Jul 2012 21:48:02 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201207132148.q6DLm2Bl091505@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 13 Jul 2012 21:48:02 +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: r238429 - 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: Fri, 13 Jul 2012 21:48:02 -0000

Author: dim
Date: Fri Jul 13 21:48:01 2012
New Revision: 238429
URL: http://svn.freebsd.org/changeset/base/238429

Log:
  Pull in r159895 from upstream clang trunk:
  
    When marking virtual functions as used for a class' vtable, mark all functions
    which will appear in the vtable as used, not just those ones which were
    declared within the class itself. Fixes an issue reported as comment#3 in
    PR12763 -- we sometimes assert in codegen if we try to emit a reference to a
    function declaration which we've not marked as referenced. This also matches
    gcc's observed behavior.
  
  This should fix clang assertions when building certain components of the
  LibreOffice port.
  
  MFC after:	3 days

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

Modified: head/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp	Fri Jul 13 21:27:18 2012	(r238428)
+++ head/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp	Fri Jul 13 21:48:01 2012	(r238429)
@@ -10937,14 +10937,23 @@ bool Sema::DefineUsedVTables() {
 
 void Sema::MarkVirtualMembersReferenced(SourceLocation Loc,
                                         const CXXRecordDecl *RD) {
-  for (CXXRecordDecl::method_iterator i = RD->method_begin(), 
-       e = RD->method_end(); i != e; ++i) {
-    CXXMethodDecl *MD = *i;
-
-    // C++ [basic.def.odr]p2:
-    //   [...] A virtual member function is used if it is not pure. [...]
-    if (MD->isVirtual() && !MD->isPure())
-      MarkFunctionReferenced(Loc, MD);
+  // Mark all functions which will appear in RD's vtable as used.
+  CXXFinalOverriderMap FinalOverriders;
+  RD->getFinalOverriders(FinalOverriders);
+  for (CXXFinalOverriderMap::const_iterator I = FinalOverriders.begin(),
+                                            E = FinalOverriders.end();
+       I != E; ++I) {
+    for (OverridingMethods::const_iterator OI = I->second.begin(),
+                                           OE = I->second.end();
+         OI != OE; ++OI) {
+      assert(OI->second.size() > 0 && "no final overrider");
+      CXXMethodDecl *Overrider = OI->second.front().Method;
+
+      // C++ [basic.def.odr]p2:
+      //   [...] A virtual member function is used if it is not pure. [...]
+      if (!Overrider->isPure())
+        MarkFunctionReferenced(Loc, Overrider);
+    }
   }
 
   // Only classes that have virtual bases need a VTT.