Skip to content

Commit 2d09d0d

Browse files
committed
Align stack of zend_fiber_execute
1 parent 5a25fa7 commit 2d09d0d

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

Zend/zend_fibers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ static zend_always_inline zend_vm_stack zend_fiber_vm_stack_alloc(size_t size) /
334334
}
335335
/* }}} */
336336

337-
static void zend_fiber_execute(zend_fiber_context *context) /* {{{ */
337+
static void ZEND_STACK_ALIGNED zend_fiber_execute(zend_fiber_context *context) /* {{{ */
338338
{
339339
zend_fiber *fiber = EG(current_fiber);
340340
ZEND_ASSERT(fiber);

Zend/zend_portability.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,12 @@ char *alloca();
281281
# define ZEND_NORETURN
282282
#endif
283283

284+
#if __has_attribute(force_align_arg_pointer)
285+
# define ZEND_STACK_ALIGNED __attribute__((force_align_arg_pointer))
286+
#else
287+
# define ZEND_STACK_ALIGNED
288+
#endif
289+
284290
#if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__))
285291
# define HAVE_NORETURN_ALIAS
286292
# define HAVE_ATTRIBUTE_WEAK

0 commit comments

Comments
 (0)