archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Minor fiber fixes

Browse source 
Assert error is fatal when calling zend_error_suspend_fiber.

Added missing static.

Removed .S extension from output of configure.
This commit is contained in:
Aaron Piotrowski 2021-04-30 10:08:01 -05:00
parent 28dbdd529c
commit f3465e6740
No known key found for this signature in database
GPG key ID: ADD1EF783EDE9EEB
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Zend/zend_fibers.c
View file

@ -149,7 +149,7 @@ static bool zend_fiber_stack_allocate(zend_fiber_stack *stack, size_t size)
return true; return true;
} }
void zend_fiber_stack_free(zend_fiber_stack *stack) static void zend_fiber_stack_free(zend_fiber_stack *stack)
{ {
if (!stack->pointer) { if (!stack->pointer) {
return; 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) 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(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)); zend_error_info *error = emalloc(sizeof(zend_error_info));

6
configure.ac
View file

@ -1216,15 +1216,15 @@ AS_CASE([$fiber_cpu],
) )
if test "$fiber_os" = 'mac'; then 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 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 else
fibers="no" fibers="no"
fi fi
if test "$fibers" = 'yes'; then 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]) AC_MSG_RESULT([$fiber_asm_file])
else else
AC_MSG_ERROR([Unable to determine platform!]) AC_MSG_ERROR([Unable to determine platform!])