nptl: x86_64: Use same code for CURRENT_STACK_FRAME and stackinfo_get_sp

It avoids the possible warning of uninitialized 'frame' variable when
building with clang:

  ../sysdeps/nptl/jmp-unwind.c:27:42: error: variable 'frame' is
  uninitialized when used here [-Werror,-Wuninitialized]
    __pthread_cleanup_upto (env->__jmpbuf, CURRENT_STACK_FRAME);

The resulting code is similar to CURRENT_STACK_FRAME.

Checked on x86_64-linux-gnu.
This commit is contained in:
Adhemerval Zanella 2022-03-08 17:31:08 -03:00
parent c7509d49c4
commit 8cd559cf5a
2 changed files with 6 additions and 2 deletions

View File

@ -42,7 +42,9 @@
#ifdef __x86_64__
/* The frame pointer is not usable. */
# define CURRENT_STACK_FRAME \
({ register char *frame __asm__("rsp"); frame; })
({ register void * p__ __asm__(RSP_REG); \
asm volatile("" : "=r" (p__)); \
p__; })
#else
# define CURRENT_STACK_FRAME __builtin_frame_address (0)
#endif

View File

@ -40,7 +40,9 @@
for which they need to act as barriers as well, hence the additional
(unnecessary) parameters. */
#define stackinfo_get_sp() \
({ void *p__; asm volatile ("mov %%" RSP_REG ", %0" : "=r" (p__)); p__; })
({ register void * p__ __asm__(RSP_REG); \
asm volatile("" : "=r" (p__)); \
p__; })
#define stackinfo_sub_sp(ptr) \
({ ptrdiff_t d__; \
asm volatile ("sub %%" RSP_REG " , %0" : "=r" (d__) : "0" (ptr)); \