From owner-svn-src-all@FreeBSD.ORG  Mon Jan 21 17:37:24 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 51EC915A;
 Mon, 21 Jan 2013 17:37:24 +0000 (UTC)
 (envelope-from theraven@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 2CD9815F;
 Mon, 21 Jan 2013 17:37:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0LHbOiZ096105;
 Mon, 21 Jan 2013 17:37:24 GMT
 (envelope-from theraven@svn.freebsd.org)
Received: (from theraven@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0LHbOva096104;
 Mon, 21 Jan 2013 17:37:24 GMT
 (envelope-from theraven@svn.freebsd.org)
Message-Id: <201301211737.r0LHbOva096104@svn.freebsd.org>
From: David Chisnall <theraven@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:37:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245745 - head/contrib/libcxxrt
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: Mon, 21 Jan 2013 17:37:24 -0000

Author: theraven
Date: Mon Jan 21 17:37:23 2013
New Revision: 245745
URL: http://svnweb.freebsd.org/changeset/base/245745

Log:
  Import new fix from libcxxrt.  This fixes the case where you attempt to rethrow
  an exception when you haven't caught one.  This is largely a cosmetic fix, as
  (unless you have a very unusual terminate handler installed) it will print a
  nice error and then abort, rather than just aborting.
  
  MFC after:     7 days

Modified:
  head/contrib/libcxxrt/exception.cc
Directory Properties:
  head/contrib/libcxxrt/   (props changed)

Modified: head/contrib/libcxxrt/exception.cc
==============================================================================
--- head/contrib/libcxxrt/exception.cc	Mon Jan 21 17:32:31 2013	(r245744)
+++ head/contrib/libcxxrt/exception.cc	Mon Jan 21 17:37:23 2013	(r245745)
@@ -801,7 +801,7 @@ extern "C" void __cxa_decrement_exceptio
  */
 extern "C" void __cxa_rethrow()
 {
-	__cxa_thread_info *ti = thread_info_fast();
+	__cxa_thread_info *ti = thread_info();
 	__cxa_eh_globals *globals = &ti->globals;
 	// Note: We don't remove this from the caught list here, because
 	// __cxa_end_catch will be called when we unwind out of the try block.  We