[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] [php-src] master: Minor fiber fixes
From:       Aaron Piotrowski <noreply () php ! net>
Date:       2021-04-30 15:08:23
Message-ID: Vj7Sl1jFZbpP7Yy63btp7K71NbhEIz8Alm2V72XXFA () main ! php ! net
[Download RAW message or body]

Author: Aaron Piotrowski (trowski)
Date: 2021-04-30T10:08:01-05:00

Commit: https://github.com/php/php-src/commit/f3465e6740ea8023e2791728c78939c356dd7e12
Raw diff: https://github.com/php/php-src/commit/f3465e6740ea8023e2791728c78939c356dd7e12.diff

Minor fiber fixes

Assert error is fatal when calling zend_error_suspend_fiber.

Added missing static.

Removed .S extension from output of configure.

Changed paths:
  M  Zend/zend_fibers.c
  M  configure.ac


Diff:

diff --git a/Zend/zend_fibers.c b/Zend/zend_fibers.c
index 43a0845200cd..ec98c16f2d43 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 7dd965e57a30..f770590d458c 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!])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]