diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-07-26 21:49:11 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-07-26 21:49:18 +0200 |
| commit | f5bef4058cb0ec8ae817a9b249a2b355fb3286fc (patch) | |
| tree | 2a4bc7874a5cf61abc8ceb91c76ad81f4c23a47a /sapi/phpdbg/phpdbg.c | |
| parent | 9e8fec1ef70bc5ad79b9c471cf1c6a0845a25785 (diff) | |
| download | php-git-f5bef4058cb0ec8ae817a9b249a2b355fb3286fc.tar.gz | |
Fix bug #70138 (difference between gcc and clang)
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 48e1b6ec06..d92f1ab4dc 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1225,13 +1225,20 @@ void phpdbg_signal_handler(int sig, siginfo_t *info, void *context) /* {{{ */ #endif -/* A bit dark magic in order to have meaningful allocator adresses */ -#if ZEND_DEBUG && (__has_builtin(__builtin_frame_address) || ZEND_GCC_VERSION >= 3004) -#define FETCH_PARENT_FILELINE(argsize) \ +/* A bit dark magic in order to have meaningful allocator adresses [ppc(64) may return bogus addresses here] */ +#if ZEND_DEBUG && (__has_builtin(__builtin_frame_address) || ZEND_GCC_VERSION >= 3004) && !defined(__ppc__) && !defined(__ppc64__) +/* with gcc %rbp/%ebp for __builtin_frame_address() and clang returns the frame return address being at %ebp/%rbp + sizeof(void*) */ +# ifdef __clang__ +# define FETCH_PARENT_START() \ + parent -= ZEND_MM_ALIGNED_SIZE(sizeof(void *)); +# else +# define FETCH_PARENT_START() +# endif +# define FETCH_PARENT_FILELINE(argsize) \ char *__zend_filename, *__zend_orig_filename; \ uint __zend_lineno, __zend_orig_lineno; \ void *parent = __builtin_frame_address(1U); \ - parent -= ZEND_MM_ALIGNED_SIZE(sizeof(void *)); /* remove frame pointer adress */ \ + FETCH_PARENT_START() \ parent -= (argsize); /* size of first arguments */ \ parent -= sizeof(char *); /* filename */ \ __zend_filename = *(char **) parent; \ @@ -1245,11 +1252,11 @@ void phpdbg_signal_handler(int sig, siginfo_t *info, void *context) /* {{{ */ parent -= sizeof(uint); /* orig_lineno */ \ __zend_orig_lineno = *(uint *) parent; #elif ZEND_DEBUG -#define FETCH_PARENT_FILELINE(argsize) \ +# define FETCH_PARENT_FILELINE(argsize) \ char *__zend_filename = __FILE__, *__zend_orig_filename = NULL; \ uint __zend_lineno = __LINE__, __zend_orig_lineno = 0; #else -#define FETCH_PARENT_FILELINE(argsize) +# define FETCH_PARENT_FILELINE(argsize) #endif void *phpdbg_malloc_wrapper(size_t size) /* {{{ */ |