2021-01-04 10:26:59 +01:00
|
|
|
/* Copyright (C) 2009-2021 Free Software Foundation, Inc.
|
2011-11-08 12:13:41 +01:00
|
|
|
Contributed by Richard Henderson <rth@redhat.com>.
|
|
|
|
|
|
|
|
This file is part of the GNU Transactional Memory Library (libitm).
|
|
|
|
|
|
|
|
Libitm is free software; you can redistribute it and/or modify it
|
|
|
|
under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
Libitm is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
|
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
|
|
FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
|
|
more details.
|
|
|
|
|
|
|
|
Under Section 7 of GPL version 3, you are granted additional
|
|
|
|
permissions described in the GCC Runtime Library Exception, version
|
|
|
|
3.1, as published by the Free Software Foundation.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License and
|
|
|
|
a copy of the GCC Runtime Library Exception along with this program;
|
|
|
|
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
|
|
#include "libitm_i.h"
|
|
|
|
|
|
|
|
using namespace GTM;
|
|
|
|
|
2015-11-20 01:10:08 +01:00
|
|
|
/* Exceptions can exist in three phases: (1) after having been allocated by
|
|
|
|
__cxa_allocate_exception but before being handed off to __cxa_throw,
|
|
|
|
(2) when they are in flight, so between __cxa_throw and __cxa_begin_catch,
|
|
|
|
and (3) when they are being handled (between __cxa_begin_catch and
|
|
|
|
__cxa_end_catch). Note that when an exception is re-thrown in (3), it is
|
|
|
|
not moving back to (2) but handled as a special case of (3) by the EH
|
|
|
|
runtime.
|
|
|
|
|
|
|
|
We can get aborts in all three phases, for example in (1) during
|
|
|
|
construction of the exception object, or in (2) in destructors called
|
|
|
|
while unwinding the stack. The transaction that created an exception
|
|
|
|
object can only commit in phase (3) by re-throwing the exception; it cannot
|
|
|
|
commit in other phases because throw expressions and catch clauses are
|
|
|
|
properly nested wrt transactions and because the compiler wraps
|
|
|
|
transaction bodies in a try/catch-all construct.
|
|
|
|
|
|
|
|
We handle phase (1) by dealing with exception objects similar to how we
|
|
|
|
deal with other (de)allocations, which also ensures that we can have more
|
|
|
|
than one exception object allocated at the same time (e.g., if the
|
|
|
|
throw expression itself throws an exception and thus calls
|
|
|
|
__cxa_allocate_exception). However, on the call to __cxa_begin_catch
|
|
|
|
we hand off the exception to the special handling of phase (3) and
|
|
|
|
remove the undo log entry of the allocation. Note that if the allocation
|
|
|
|
happened outside of this transaction, we do not need to do anything.
|
|
|
|
|
|
|
|
When an exception reaches phase (2) due to a call to __cxa_throw, the count
|
|
|
|
of uncaught exceptions is incremented. We roll back this effect by saving
|
|
|
|
and restoring this number in the structure returned from __cxa_get_globals.
|
|
|
|
This also takes care of increments of this count when re-throwing an
|
|
|
|
exception.
|
|
|
|
|
|
|
|
For phase (3), we keep track of the number of times __cxa_begin_catch
|
|
|
|
has been called without a matching call to __cxa_end_catch. This count
|
|
|
|
is then used by __cxa_tm_cleanup to roll back the exception handling state
|
|
|
|
by calling __cxa_end_catch for the exceptions that have not been finished
|
|
|
|
yet (without running destructors though because we roll back the memory
|
|
|
|
anyway).
|
|
|
|
Once an exception that was allocated in this transaction enters phase (3),
|
|
|
|
it does not need to be deallocated on abort anymore because the calls to
|
|
|
|
__cxa_end_catch will take care of that.
|
|
|
|
|
|
|
|
We require all code executed by the transaction to be transaction_safe (or
|
|
|
|
transaction_pure, or to have wrappers) if the transaction is to be rolled
|
|
|
|
back. However, we take care to not require this for transactions that
|
|
|
|
just commit; this way, transactions that enter serial mode and then call
|
|
|
|
uninstrumented code continue to work.
|
|
|
|
*/
|
|
|
|
|
2011-11-08 12:13:41 +01:00
|
|
|
/* Everything from libstdc++ is weak, to avoid requiring that library
|
|
|
|
to be linked into plain C applications using libitm.so. */
|
|
|
|
|
|
|
|
#define WEAK __attribute__((weak))
|
|
|
|
|
|
|
|
extern "C" {
|
|
|
|
|
2015-11-20 01:10:08 +01:00
|
|
|
struct __cxa_eh_globals
|
|
|
|
{
|
|
|
|
void * caughtExceptions;
|
|
|
|
unsigned int uncaughtExceptions;
|
|
|
|
};
|
|
|
|
|
Fix throw specifiers on interface.
I discovered that libitm:
(a) declares __cxa_allocate_exception and friends directly,
(b) doesn't mark them as 'throw()'
(c) doesn't mark the replacment fns _ITM_$foo as nothrow either
We happen to get away with it because of code in the compiler that,
although it checks the parameter types, doesn't check the exception
specification. (One reason being they used to not be part of the
language's type system, but now they are.) I suspect this can lead us
to generate pessimal code later, if we've seen one of these decls
earlier. Anyway, with modules it becomes trickier[*], so I'm trying
to clean it up and not be a problem. I see Jakub fixed part of the
problem
(https://gcc.gnu.org/pipermail/gcc-patches/2018-December/513302.html)
AFAICT, he did fix libitm's decls, but left the lax parm-type checking
in the compiler.
libitm.h is not very informative about specification:
in version 1 of http://www.intel.com/some/path/here.pdf. */
Anyway, it was too fiddly to have libitm pick up the declarations from
libsupc++. Besides it makes them weak declarations, and then provides
definitions for non-elf systems. So this patch adds the expected
'throw()'
* libitm/libitm.h (_ITM_NOTHROW): Define.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Use it.
* eh_cpp.cc: Add throw() to __cxa_allocate_exception,
__cxa_free_exception, __cxa_begin_catch, __cxa_tm_cleanup,
__cxa_get_globals.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Likewise.
2020-05-12 19:54:53 +02:00
|
|
|
extern void *__cxa_allocate_exception (size_t) _ITM_NOTHROW WEAK;
|
|
|
|
extern void __cxa_free_exception (void *) _ITM_NOTHROW WEAK;
|
2018-12-16 00:51:31 +01:00
|
|
|
extern void __cxa_throw (void *, void *, void (*) (void *)) WEAK;
|
Fix throw specifiers on interface.
I discovered that libitm:
(a) declares __cxa_allocate_exception and friends directly,
(b) doesn't mark them as 'throw()'
(c) doesn't mark the replacment fns _ITM_$foo as nothrow either
We happen to get away with it because of code in the compiler that,
although it checks the parameter types, doesn't check the exception
specification. (One reason being they used to not be part of the
language's type system, but now they are.) I suspect this can lead us
to generate pessimal code later, if we've seen one of these decls
earlier. Anyway, with modules it becomes trickier[*], so I'm trying
to clean it up and not be a problem. I see Jakub fixed part of the
problem
(https://gcc.gnu.org/pipermail/gcc-patches/2018-December/513302.html)
AFAICT, he did fix libitm's decls, but left the lax parm-type checking
in the compiler.
libitm.h is not very informative about specification:
in version 1 of http://www.intel.com/some/path/here.pdf. */
Anyway, it was too fiddly to have libitm pick up the declarations from
libsupc++. Besides it makes them weak declarations, and then provides
definitions for non-elf systems. So this patch adds the expected
'throw()'
* libitm/libitm.h (_ITM_NOTHROW): Define.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Use it.
* eh_cpp.cc: Add throw() to __cxa_allocate_exception,
__cxa_free_exception, __cxa_begin_catch, __cxa_tm_cleanup,
__cxa_get_globals.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Likewise.
2020-05-12 19:54:53 +02:00
|
|
|
extern void *__cxa_begin_catch (void *) _ITM_NOTHROW WEAK;
|
2012-05-22 00:48:00 +02:00
|
|
|
extern void __cxa_end_catch (void) WEAK;
|
Fix throw specifiers on interface.
I discovered that libitm:
(a) declares __cxa_allocate_exception and friends directly,
(b) doesn't mark them as 'throw()'
(c) doesn't mark the replacment fns _ITM_$foo as nothrow either
We happen to get away with it because of code in the compiler that,
although it checks the parameter types, doesn't check the exception
specification. (One reason being they used to not be part of the
language's type system, but now they are.) I suspect this can lead us
to generate pessimal code later, if we've seen one of these decls
earlier. Anyway, with modules it becomes trickier[*], so I'm trying
to clean it up and not be a problem. I see Jakub fixed part of the
problem
(https://gcc.gnu.org/pipermail/gcc-patches/2018-December/513302.html)
AFAICT, he did fix libitm's decls, but left the lax parm-type checking
in the compiler.
libitm.h is not very informative about specification:
in version 1 of http://www.intel.com/some/path/here.pdf. */
Anyway, it was too fiddly to have libitm pick up the declarations from
libsupc++. Besides it makes them weak declarations, and then provides
definitions for non-elf systems. So this patch adds the expected
'throw()'
* libitm/libitm.h (_ITM_NOTHROW): Define.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Use it.
* eh_cpp.cc: Add throw() to __cxa_allocate_exception,
__cxa_free_exception, __cxa_begin_catch, __cxa_tm_cleanup,
__cxa_get_globals.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Likewise.
2020-05-12 19:54:53 +02:00
|
|
|
extern void __cxa_tm_cleanup (void *, void *, unsigned int) throw () WEAK;
|
|
|
|
extern __cxa_eh_globals *__cxa_get_globals (void) _ITM_NOTHROW WEAK;
|
2011-11-08 12:13:41 +01:00
|
|
|
|
2013-02-12 00:30:10 +01:00
|
|
|
#if !defined (HAVE_ELF_STYLE_WEAKREF)
|
Fix throw specifiers on interface.
I discovered that libitm:
(a) declares __cxa_allocate_exception and friends directly,
(b) doesn't mark them as 'throw()'
(c) doesn't mark the replacment fns _ITM_$foo as nothrow either
We happen to get away with it because of code in the compiler that,
although it checks the parameter types, doesn't check the exception
specification. (One reason being they used to not be part of the
language's type system, but now they are.) I suspect this can lead us
to generate pessimal code later, if we've seen one of these decls
earlier. Anyway, with modules it becomes trickier[*], so I'm trying
to clean it up and not be a problem. I see Jakub fixed part of the
problem
(https://gcc.gnu.org/pipermail/gcc-patches/2018-December/513302.html)
AFAICT, he did fix libitm's decls, but left the lax parm-type checking
in the compiler.
libitm.h is not very informative about specification:
in version 1 of http://www.intel.com/some/path/here.pdf. */
Anyway, it was too fiddly to have libitm pick up the declarations from
libsupc++. Besides it makes them weak declarations, and then provides
definitions for non-elf systems. So this patch adds the expected
'throw()'
* libitm/libitm.h (_ITM_NOTHROW): Define.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Use it.
* eh_cpp.cc: Add throw() to __cxa_allocate_exception,
__cxa_free_exception, __cxa_begin_catch, __cxa_tm_cleanup,
__cxa_get_globals.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Likewise.
2020-05-12 19:54:53 +02:00
|
|
|
void *__cxa_allocate_exception (size_t) _ITM_NOTHROW { return NULL; }
|
|
|
|
void __cxa_free_exception (void *) _ITM_NOTHROW { return; }
|
2018-12-16 00:51:31 +01:00
|
|
|
void __cxa_throw (void *, void *, void (*) (void *)) { return; }
|
Fix throw specifiers on interface.
I discovered that libitm:
(a) declares __cxa_allocate_exception and friends directly,
(b) doesn't mark them as 'throw()'
(c) doesn't mark the replacment fns _ITM_$foo as nothrow either
We happen to get away with it because of code in the compiler that,
although it checks the parameter types, doesn't check the exception
specification. (One reason being they used to not be part of the
language's type system, but now they are.) I suspect this can lead us
to generate pessimal code later, if we've seen one of these decls
earlier. Anyway, with modules it becomes trickier[*], so I'm trying
to clean it up and not be a problem. I see Jakub fixed part of the
problem
(https://gcc.gnu.org/pipermail/gcc-patches/2018-December/513302.html)
AFAICT, he did fix libitm's decls, but left the lax parm-type checking
in the compiler.
libitm.h is not very informative about specification:
in version 1 of http://www.intel.com/some/path/here.pdf. */
Anyway, it was too fiddly to have libitm pick up the declarations from
libsupc++. Besides it makes them weak declarations, and then provides
definitions for non-elf systems. So this patch adds the expected
'throw()'
* libitm/libitm.h (_ITM_NOTHROW): Define.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Use it.
* eh_cpp.cc: Add throw() to __cxa_allocate_exception,
__cxa_free_exception, __cxa_begin_catch, __cxa_tm_cleanup,
__cxa_get_globals.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Likewise.
2020-05-12 19:54:53 +02:00
|
|
|
void *__cxa_begin_catch (void *) _ITM_NOTHROW { return NULL; }
|
2012-05-22 00:48:00 +02:00
|
|
|
void __cxa_end_catch (void) { return; }
|
Fix throw specifiers on interface.
I discovered that libitm:
(a) declares __cxa_allocate_exception and friends directly,
(b) doesn't mark them as 'throw()'
(c) doesn't mark the replacment fns _ITM_$foo as nothrow either
We happen to get away with it because of code in the compiler that,
although it checks the parameter types, doesn't check the exception
specification. (One reason being they used to not be part of the
language's type system, but now they are.) I suspect this can lead us
to generate pessimal code later, if we've seen one of these decls
earlier. Anyway, with modules it becomes trickier[*], so I'm trying
to clean it up and not be a problem. I see Jakub fixed part of the
problem
(https://gcc.gnu.org/pipermail/gcc-patches/2018-December/513302.html)
AFAICT, he did fix libitm's decls, but left the lax parm-type checking
in the compiler.
libitm.h is not very informative about specification:
in version 1 of http://www.intel.com/some/path/here.pdf. */
Anyway, it was too fiddly to have libitm pick up the declarations from
libsupc++. Besides it makes them weak declarations, and then provides
definitions for non-elf systems. So this patch adds the expected
'throw()'
* libitm/libitm.h (_ITM_NOTHROW): Define.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Use it.
* eh_cpp.cc: Add throw() to __cxa_allocate_exception,
__cxa_free_exception, __cxa_begin_catch, __cxa_tm_cleanup,
__cxa_get_globals.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Likewise.
2020-05-12 19:54:53 +02:00
|
|
|
void __cxa_tm_cleanup (void *, void *, unsigned int) throw () { return; }
|
2012-01-10 04:16:07 +01:00
|
|
|
void _Unwind_DeleteException (_Unwind_Exception *) { return; }
|
Fix throw specifiers on interface.
I discovered that libitm:
(a) declares __cxa_allocate_exception and friends directly,
(b) doesn't mark them as 'throw()'
(c) doesn't mark the replacment fns _ITM_$foo as nothrow either
We happen to get away with it because of code in the compiler that,
although it checks the parameter types, doesn't check the exception
specification. (One reason being they used to not be part of the
language's type system, but now they are.) I suspect this can lead us
to generate pessimal code later, if we've seen one of these decls
earlier. Anyway, with modules it becomes trickier[*], so I'm trying
to clean it up and not be a problem. I see Jakub fixed part of the
problem
(https://gcc.gnu.org/pipermail/gcc-patches/2018-December/513302.html)
AFAICT, he did fix libitm's decls, but left the lax parm-type checking
in the compiler.
libitm.h is not very informative about specification:
in version 1 of http://www.intel.com/some/path/here.pdf. */
Anyway, it was too fiddly to have libitm pick up the declarations from
libsupc++. Besides it makes them weak declarations, and then provides
definitions for non-elf systems. So this patch adds the expected
'throw()'
* libitm/libitm.h (_ITM_NOTHROW): Define.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Use it.
* eh_cpp.cc: Add throw() to __cxa_allocate_exception,
__cxa_free_exception, __cxa_begin_catch, __cxa_tm_cleanup,
__cxa_get_globals.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Likewise.
2020-05-12 19:54:53 +02:00
|
|
|
__cxa_eh_globals *__cxa_get_globals (void) _ITM_NOTHROW { return NULL; }
|
2011-11-22 15:49:11 +01:00
|
|
|
#endif /* HAVE_ELF_STYLE_WEAKREF */
|
Provide all dummy functions in alloc_cpp.cc, eh_cpp.cc
* alloc_cpp.cc [__osf__] (_ZnwX, _ZdlPv, _ZnaX, _ZdaPv,
_ZnwXRKSt9nothrow_t, _ZdlPvRKSt9nothrow_t, _ZdaPvRKSt9nothrow_t):
Dummy functions.
* eh_cpp.cc [__osf__] (__cxa_allocate_exception, __cxa_throw,
__cxa_begin_catch, __cxa_end_catch, __cxa_tm_cleanup): Likewise.
From-SVN: r181442
2011-11-17 12:34:33 +01:00
|
|
|
|
2011-11-08 12:13:41 +01:00
|
|
|
}
|
|
|
|
|
2015-11-20 01:10:08 +01:00
|
|
|
static void
|
|
|
|
free_any_exception (void *exc_ptr)
|
|
|
|
{
|
|
|
|
// The exception could be in phase (2) and thus calling just
|
|
|
|
// _cxa_free_exception might not be sufficient.
|
|
|
|
__cxa_tm_cleanup (NULL, exc_ptr, 0);
|
|
|
|
}
|
2011-11-08 12:13:41 +01:00
|
|
|
|
|
|
|
void *
|
Fix throw specifiers on interface.
I discovered that libitm:
(a) declares __cxa_allocate_exception and friends directly,
(b) doesn't mark them as 'throw()'
(c) doesn't mark the replacment fns _ITM_$foo as nothrow either
We happen to get away with it because of code in the compiler that,
although it checks the parameter types, doesn't check the exception
specification. (One reason being they used to not be part of the
language's type system, but now they are.) I suspect this can lead us
to generate pessimal code later, if we've seen one of these decls
earlier. Anyway, with modules it becomes trickier[*], so I'm trying
to clean it up and not be a problem. I see Jakub fixed part of the
problem
(https://gcc.gnu.org/pipermail/gcc-patches/2018-December/513302.html)
AFAICT, he did fix libitm's decls, but left the lax parm-type checking
in the compiler.
libitm.h is not very informative about specification:
in version 1 of http://www.intel.com/some/path/here.pdf. */
Anyway, it was too fiddly to have libitm pick up the declarations from
libsupc++. Besides it makes them weak declarations, and then provides
definitions for non-elf systems. So this patch adds the expected
'throw()'
* libitm/libitm.h (_ITM_NOTHROW): Define.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Use it.
* eh_cpp.cc: Add throw() to __cxa_allocate_exception,
__cxa_free_exception, __cxa_begin_catch, __cxa_tm_cleanup,
__cxa_get_globals.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Likewise.
2020-05-12 19:54:53 +02:00
|
|
|
_ITM_cxa_allocate_exception (size_t size) _ITM_NOTHROW
|
2011-11-08 12:13:41 +01:00
|
|
|
{
|
|
|
|
void *r = __cxa_allocate_exception (size);
|
2015-11-20 01:10:08 +01:00
|
|
|
gtm_thr()->record_allocation (r, free_any_exception);
|
2011-11-08 12:13:41 +01:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2015-11-20 01:10:08 +01:00
|
|
|
void
|
Fix throw specifiers on interface.
I discovered that libitm:
(a) declares __cxa_allocate_exception and friends directly,
(b) doesn't mark them as 'throw()'
(c) doesn't mark the replacment fns _ITM_$foo as nothrow either
We happen to get away with it because of code in the compiler that,
although it checks the parameter types, doesn't check the exception
specification. (One reason being they used to not be part of the
language's type system, but now they are.) I suspect this can lead us
to generate pessimal code later, if we've seen one of these decls
earlier. Anyway, with modules it becomes trickier[*], so I'm trying
to clean it up and not be a problem. I see Jakub fixed part of the
problem
(https://gcc.gnu.org/pipermail/gcc-patches/2018-December/513302.html)
AFAICT, he did fix libitm's decls, but left the lax parm-type checking
in the compiler.
libitm.h is not very informative about specification:
in version 1 of http://www.intel.com/some/path/here.pdf. */
Anyway, it was too fiddly to have libitm pick up the declarations from
libsupc++. Besides it makes them weak declarations, and then provides
definitions for non-elf systems. So this patch adds the expected
'throw()'
* libitm/libitm.h (_ITM_NOTHROW): Define.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Use it.
* eh_cpp.cc: Add throw() to __cxa_allocate_exception,
__cxa_free_exception, __cxa_begin_catch, __cxa_tm_cleanup,
__cxa_get_globals.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Likewise.
2020-05-12 19:54:53 +02:00
|
|
|
_ITM_cxa_free_exception (void *exc_ptr) _ITM_NOTHROW
|
2015-11-20 01:10:08 +01:00
|
|
|
{
|
|
|
|
// __cxa_free_exception can be called from user code directly if
|
|
|
|
// construction of an exception object throws another exception, in which
|
|
|
|
// case we need to roll back the initial exception. We handle this similar
|
|
|
|
// to dead allocations in that we deallocate the exception on both commit
|
|
|
|
// and abort of an outermost transaction.
|
|
|
|
gtm_thr()->forget_allocation (exc_ptr, free_any_exception);
|
|
|
|
}
|
|
|
|
|
2011-11-08 12:13:41 +01:00
|
|
|
void
|
2018-12-16 00:51:31 +01:00
|
|
|
_ITM_cxa_throw (void *obj, void *tinfo, void (*dest) (void *))
|
2011-11-08 12:13:41 +01:00
|
|
|
{
|
2015-11-20 01:10:08 +01:00
|
|
|
// This used to be instrumented, but does not need to be anymore.
|
2011-11-08 12:13:41 +01:00
|
|
|
__cxa_throw (obj, tinfo, dest);
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
Fix throw specifiers on interface.
I discovered that libitm:
(a) declares __cxa_allocate_exception and friends directly,
(b) doesn't mark them as 'throw()'
(c) doesn't mark the replacment fns _ITM_$foo as nothrow either
We happen to get away with it because of code in the compiler that,
although it checks the parameter types, doesn't check the exception
specification. (One reason being they used to not be part of the
language's type system, but now they are.) I suspect this can lead us
to generate pessimal code later, if we've seen one of these decls
earlier. Anyway, with modules it becomes trickier[*], so I'm trying
to clean it up and not be a problem. I see Jakub fixed part of the
problem
(https://gcc.gnu.org/pipermail/gcc-patches/2018-December/513302.html)
AFAICT, he did fix libitm's decls, but left the lax parm-type checking
in the compiler.
libitm.h is not very informative about specification:
in version 1 of http://www.intel.com/some/path/here.pdf. */
Anyway, it was too fiddly to have libitm pick up the declarations from
libsupc++. Besides it makes them weak declarations, and then provides
definitions for non-elf systems. So this patch adds the expected
'throw()'
* libitm/libitm.h (_ITM_NOTHROW): Define.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Use it.
* eh_cpp.cc: Add throw() to __cxa_allocate_exception,
__cxa_free_exception, __cxa_begin_catch, __cxa_tm_cleanup,
__cxa_get_globals.
(_ITM_cxa_allocate_exception, _ITM_cxa_free_exception)
(_ITM_cxa_begin_catch): Likewise.
2020-05-12 19:54:53 +02:00
|
|
|
_ITM_cxa_begin_catch (void *exc_ptr) _ITM_NOTHROW
|
2011-11-08 12:13:41 +01:00
|
|
|
{
|
2015-11-20 01:10:08 +01:00
|
|
|
// If this exception object has been allocated by this transaction, we
|
|
|
|
// discard the undo log entry for the allocation; we are entering phase (3)
|
|
|
|
// now and will handle this exception specially.
|
|
|
|
// Note that this exception cannot have been allocated in a parent
|
|
|
|
// transaction or enclosing nontransactional block because an atomic block
|
|
|
|
// cannot contain just a catch clause but not the associated try clause.
|
|
|
|
// The exception can have been allocated in a nested transaction, in which
|
|
|
|
// case the commit of the nested transaction will have inserted the undo
|
|
|
|
// log entry of the allocation in our undo log.
|
|
|
|
// The exception can also have been allocated in a nested nontransactional
|
|
|
|
// block, but then this transaction cannot abort anymore; functions that
|
|
|
|
// are marked transaction_pure, for example, must not side-step the
|
|
|
|
// transactional exception handling we implement here.
|
|
|
|
gtm_thread *t = gtm_thr ();
|
|
|
|
t->discard_allocation (exc_ptr);
|
|
|
|
// Keep track of the number of unfinished catch handlers.
|
|
|
|
t->cxa_catch_count++;
|
2011-11-08 12:13:41 +01:00
|
|
|
return __cxa_begin_catch (exc_ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_ITM_cxa_end_catch (void)
|
|
|
|
{
|
2015-11-20 01:10:08 +01:00
|
|
|
// Keep track of the number of unfinished catch handlers.
|
2011-11-08 12:13:41 +01:00
|
|
|
gtm_thr()->cxa_catch_count--;
|
|
|
|
__cxa_end_catch ();
|
|
|
|
}
|
|
|
|
|
2015-11-20 01:10:08 +01:00
|
|
|
void
|
|
|
|
GTM::gtm_thread::init_cpp_exceptions ()
|
|
|
|
{
|
|
|
|
// Only save and restore the number of uncaught exceptions if this is
|
|
|
|
// actually used in the program.
|
|
|
|
if (__cxa_get_globals != NULL && __cxa_get_globals () != 0)
|
|
|
|
cxa_uncaught_count_ptr = &__cxa_get_globals ()->uncaughtExceptions;
|
|
|
|
else
|
|
|
|
cxa_uncaught_count_ptr = 0;
|
|
|
|
}
|
|
|
|
|
2011-11-08 12:13:41 +01:00
|
|
|
void
|
|
|
|
GTM::gtm_thread::revert_cpp_exceptions (gtm_transaction_cp *cp)
|
|
|
|
{
|
|
|
|
if (cp)
|
|
|
|
{
|
2015-11-20 01:10:08 +01:00
|
|
|
// If rolling back a nested transaction, only clean up incompletely
|
|
|
|
// caught exceptions since the last checkpoint.
|
2011-11-08 12:13:41 +01:00
|
|
|
assert (cxa_catch_count >= cp->cxa_catch_count);
|
|
|
|
uint32_t catch_count = cxa_catch_count - cp->cxa_catch_count;
|
2015-11-20 01:10:08 +01:00
|
|
|
if (catch_count)
|
2011-11-08 12:13:41 +01:00
|
|
|
{
|
2015-11-20 01:10:08 +01:00
|
|
|
__cxa_tm_cleanup (NULL, NULL, catch_count);
|
2011-11-08 12:13:41 +01:00
|
|
|
cxa_catch_count = cp->cxa_catch_count;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Both cxa_catch_count and cxa_unthrown are maximal because EH regions
|
|
|
|
// and transactions are properly nested.
|
2015-11-20 01:10:08 +01:00
|
|
|
if (cxa_catch_count)
|
2011-11-08 12:13:41 +01:00
|
|
|
{
|
2015-11-20 01:10:08 +01:00
|
|
|
__cxa_tm_cleanup (NULL, NULL, cxa_catch_count);
|
|
|
|
cxa_catch_count = 0;
|
2011-11-08 12:13:41 +01:00
|
|
|
}
|
|
|
|
}
|
2015-11-20 01:10:08 +01:00
|
|
|
// Reset the number of uncaught exceptions. Any allocations for these
|
|
|
|
// exceptions have been rolled back already, if necessary.
|
|
|
|
if (cxa_uncaught_count_ptr != 0)
|
|
|
|
*cxa_uncaught_count_ptr = cxa_uncaught_count;
|
|
|
|
// Always reset eh_in_flight because it just contains the argument provided
|
|
|
|
// to _ITM_commitTransactionEH.
|
|
|
|
eh_in_flight = NULL;
|
2011-11-08 12:13:41 +01:00
|
|
|
}
|