Fixup

Author: arnaud-lb

Diff for: Zend/zend.c

@@ -1047,7 +1047,7 @@ void zend_startup(zend_utility_functions *utility_functions) /* {{{ */
 		EG(call_stack) = (zend_call_stack){0};
 	}
 # endif /* ZEND_CHECK_STACK_LIMIT */
-#endif
+#endif /* ZTS */
 	EG(error_reporting) = E_ALL & ~E_NOTICE;
 
 	zend_interned_strings_init();

Diff for: Zend/zend_call_stack.h

@@ -47,7 +47,6 @@ static zend_always_inline void *zend_call_stack_position(void) {
 
 static zend_always_inline bool zend_call_stack_overflowed(void *stack_limit) {
 	return (uintptr_t) zend_call_stack_position() <= (uintptr_t) stack_limit;
-
 }
 
 static inline void* zend_call_stack_limit(void *base, size_t size, size_t reserved_size)

Diff for: Zend/zend_compile.c

@@ -10312,7 +10312,7 @@ static void zend_compile_expr_inner(znode *result, zend_ast *ast) /* {{{ */
 static void zend_compile_expr(znode *result, zend_ast *ast)
 {
 #ifdef ZEND_CHECK_STACK_LIMIT
-	if (zend_call_stack_overflowed(EG(stack_limit))) {
+	if (UNEXPECTED(zend_call_stack_overflowed(EG(stack_limit)))) {
 		zend_error_noreturn(E_COMPILE_ERROR,
 			"Maximum call stack size of %zu bytes reached. Try splitting expression",
 			(size_t) ((uintptr_t) EG(stack_base) - (uintptr_t) EG(stack_limit)));

Diff for: Zend/zend_execute_API.c

@@ -178,6 +178,7 @@ void init_executor(void) /* {{{ */
 		size_t size = EG(call_stack).max_size;
 		if (UNEXPECTED(base == (void*)0)) {
 			base = zend_call_stack_position();
+			// TODO: account that base is not the real base
 			size = zend_call_stack_default_size();
 		}
 		EG(stack_base) = base;

Diff for: Zend/zend_fibers.c

@@ -289,6 +289,11 @@ ZEND_API void* zend_fiber_stack_limit(zend_fiber_stack *stack)
 	/* stack->pointer is the end of the stack */
 	return (int8_t*)stack->pointer + reserve;
 }
+
+ZEND_API void* zend_fiber_stack_base(zend_fiber_stack *stack)
+{
+	return (void*)((uintptr_t)stack->pointer + stack->size);
+}
 #endif
 
 #ifdef ZEND_FIBER_UCONTEXT
@@ -526,7 +531,7 @@ static ZEND_STACK_ALIGNED void zend_fiber_execute(zend_fiber_transfer *transfer)
 		EG(error_reporting) = error_reporting;
 
 #ifdef ZEND_CHECK_STACK_LIMIT
-		EG(stack_base) = (void*) ((uintptr_t) fiber->context.stack->pointer + fiber->context.stack->size);
+		EG(stack_base) = zend_fiber_stack_base(fiber->context.stack);
 		EG(stack_limit) = zend_fiber_stack_limit(fiber->context.stack);
 #endif
 

Diff for: Zend/zend_fibers.h

@@ -136,7 +136,10 @@ struct _zend_fiber {
 ZEND_API bool zend_fiber_init_context(zend_fiber_context *context, void *kind, zend_fiber_coroutine coroutine, size_t stack_size);
 ZEND_API void zend_fiber_destroy_context(zend_fiber_context *context);
 ZEND_API void zend_fiber_switch_context(zend_fiber_transfer *transfer);
+#ifdef ZEND_CHECK_STACK_LIMIT
 ZEND_API void* zend_fiber_stack_limit(zend_fiber_stack *stack);
+ZEND_API void* zend_fiber_stack_base(zend_fiber_stack *stack);
+#endif /* ZEND_CHECK_STACK_LIMIT */
 
 ZEND_API void zend_fiber_switch_block(void);
 ZEND_API void zend_fiber_switch_unblock(void);

Diff for: ext/zend_test/fiber.c

@@ -96,6 +96,7 @@ static ZEND_STACK_ALIGNED void zend_test_fiber_execute(zend_fiber_transfer *tran
 		EG(jit_trace_num) = 0;
 
 #ifdef ZEND_CHECK_STACK_LIMIT
+		EG(stack_base) = zend_fiber_stack_base(fiber->context.stack);
 		EG(stack_limit) = zend_fiber_stack_limit(fiber->context.stack);
 #endif
 		fiber->fci.retval = &retval;