gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

The code in GSPrivateReturnAddresses() and the -symbols method must have ifdefs in matching order so that setup of the information from the stack matches the code used to generate the corresponding symbols.

Browse source
This commit is contained in:
Richard Frith-Macdonald 2021-03-18 20:17:35 +00:00
parent 5fb5fb46c4
commit 4e61056743
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Source/NSException.m
View file

@ -891,28 +891,7 @@ unsigned
GSPrivateReturnAddresses(NSUInteger **returns)
{
unsigned numReturns;
#if defined(HAVE_BACKTRACE)
void *addr[MAXFRAMES*sizeof(void*)];
numReturns = backtrace(addr, MAXFRAMES);
if (numReturns > 0)
{
*returns = malloc(numReturns * sizeof(void*));
memcpy(*returns, addr, numReturns * sizeof(void*));
}
#elif defined(WITH_UNWIND)
void *addr[MAXFRAMES];
struct GSBacktraceState state = {addr, addr + MAXFRAMES};
_Unwind_Backtrace(GSUnwindCallback, &state);
numReturns = state.current - addr;
if (numReturns > 0)
{
*returns = malloc(numReturns * sizeof(void*));
memcpy(*returns, addr, numReturns * sizeof(void*));
}
#elif defined(_WIN32) && !defined(USE_BFD)
#if defined(_WIN32) && !defined(USE_BFD)
NSUInteger addr[MAXFRAMES];
(void)pthread_mutex_lock(&traceLock);
@ -1004,6 +983,27 @@ GSPrivateReturnAddresses(NSUInteger **returns)
(void)pthread_mutex_unlock(&traceLock);
#elif defined(HAVE_BACKTRACE)
void *addr[MAXFRAMES*sizeof(void*)];
numReturns = backtrace(addr, MAXFRAMES);
if (numReturns > 0)
{
*returns = malloc(numReturns * sizeof(void*));
memcpy(*returns, addr, numReturns * sizeof(void*));
}
#elif defined(WITH_UNWIND)
void *addr[MAXFRAMES];
struct GSBacktraceState state = {addr, addr + MAXFRAMES};
_Unwind_Backtrace(GSUnwindCallback, &state);
numReturns = state.current - addr;
if (numReturns > 0)
{
*returns = malloc(numReturns * sizeof(void*));
memcpy(*returns, addr, numReturns * sizeof(void*));
}
#else
int n;