From f3465e6740ea8023e2791728c78939c356dd7e12 Mon Sep 17 00:00:00 2001 From: Aaron Piotrowski Date: Fri, 30 Apr 2021 10:08:01 -0500 Subject: [PATCH] Minor fiber fixes Assert error is fatal when calling zend_error_suspend_fiber. Added missing static. Removed .S extension from output of configure. --- Zend/zend_fibers.c | 3 ++- configure.ac | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Zend/zend_fibers.c b/Zend/zend_fibers.c index 43a0845200c..ec98c16f2d4 100644 --- a/Zend/zend_fibers.c +++ b/Zend/zend_fibers.c @@ -149,7 +149,7 @@ static bool zend_fiber_stack_allocate(zend_fiber_stack *stack, size_t size) return true; } -void zend_fiber_stack_free(zend_fiber_stack *stack) +static void zend_fiber_stack_free(zend_fiber_stack *stack) { if (!stack->pointer) { return; @@ -287,6 +287,7 @@ ZEND_COLD void zend_error_suspend_fiber( int orig_type, zend_string *error_filename, uint32_t error_lineno, zend_string *message) { ZEND_ASSERT(EG(current_fiber) && "Must be within an active fiber!"); + ZEND_ASSERT(orig_type & E_FATAL_ERRORS && "Error type must be fatal"); zend_error_info *error = emalloc(sizeof(zend_error_info)); diff --git a/configure.ac b/configure.ac index 7dd965e57a3..f770590d458 100644 --- a/configure.ac +++ b/configure.ac @@ -1216,15 +1216,15 @@ AS_CASE([$fiber_cpu], ) if test "$fiber_os" = 'mac'; then - fiber_asm_file="combined_sysv_macho_gas.S" + fiber_asm_file="combined_sysv_macho_gas" elif test "$fiber_asm_file_prefix" != 'unknown'; then - fiber_asm_file="${fiber_asm_file_prefix}_elf_gas.S" + fiber_asm_file="${fiber_asm_file_prefix}_elf_gas" else fibers="no" fi if test "$fibers" = 'yes'; then - PHP_ADD_SOURCES(Zend/asm, make_${fiber_asm_file} jump_${fiber_asm_file}) + PHP_ADD_SOURCES(Zend/asm, make_${fiber_asm_file}.S jump_${fiber_asm_file}.S) AC_MSG_RESULT([$fiber_asm_file]) else AC_MSG_ERROR([Unable to determine platform!])