svn commit: r245745 - head/contrib/libcxxrt

David Chisnall theraven at FreeBSD.org
Mon Jan 21 17:37:24 UTC 2013


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


More information about the svn-src-all mailing list