archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

zend call stack fixing stack limit for macOs arm64.

Browse source 
8MB sounded a prudent size for older 10.9 macOs release, however
with newer mac with arm64, it triggers a stack overflow.

Cherry picks b320aabc5e (GH-13319) from PHP-8.4.
Closes GH-19390.
This commit is contained in:
David Carlier 2024-02-03 14:54:23 +00:00 • committed by Arnaud Le Blanc
parent 44618752f9
commit bd2766ce79
No known key found for this signature in database
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -19,6 +19,7 @@ PHP NEWS
a non-Generator delegate crashes). (Arnaud) a non-Generator delegate crashes). (Arnaud)
. Fixed bug GH-18736 (Circumvented type check with return by ref + finally). . Fixed bug GH-18736 (Circumvented type check with return by ref + finally).
(ilutov) (ilutov)
. Fixed zend call stack size for macOs/arm64. (David Carlier)
- FTP: - FTP:
. Fix theoretical issues with hrtime() not being available. (nielsdos) . Fix theoretical issues with hrtime() not being available. (nielsdos)

5
Zend/tests/stack_limit/stack_limit_010.phpt
View file

@ -15,7 +15,10 @@ $stack = zend_test_zend_call_stack_get();
var_dump($stack); var_dump($stack);
$expectedMaxSize = match(php_uname('s')) { $expectedMaxSize = match(php_uname('s')) {
'Darwin' => 8*1024*1024, 'Darwin' => match(php_uname('m')) {
'x86_64' => 8*1024*1024,
'arm64' => 8372224,
},
'FreeBSD' => match(php_uname('m')) { 'FreeBSD' => match(php_uname('m')) {
'amd64' => 512*1024*1024 - 4096, 'amd64' => 512*1024*1024 - 4096,
'i386' => 64*1024*1024 - 4096, 'i386' => 64*1024*1024 - 4096,

9
Zend/zend_call_stack.c
View file

@ -417,7 +417,9 @@ static bool zend_call_stack_get_macos(zend_call_stack *stack)
void *base = pthread_get_stackaddr_np(pthread_self()); void *base = pthread_get_stackaddr_np(pthread_self());
size_t max_size; size_t max_size;
if (pthread_main_np()) { #if !defined(__aarch64__)
if (pthread_main_np())
{
/* pthread_get_stacksize_np() returns a too low value for the main /* pthread_get_stacksize_np() returns a too low value for the main
* thread in OSX 10.9, 10.10: * thread in OSX 10.9, 10.10:
* https://mail.openjdk.org/pipermail/hotspot-dev/2013-October/011353.html * https://mail.openjdk.org/pipermail/hotspot-dev/2013-October/011353.html
@ -427,7 +429,10 @@ static bool zend_call_stack_get_macos(zend_call_stack *stack)
/* Stack size is 8MiB by default for main threads /* Stack size is 8MiB by default for main threads
* https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/Multithreading/CreatingThreads/CreatingThreads.html */ * https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/Multithreading/CreatingThreads/CreatingThreads.html */
max_size = 8 * 1024 * 1024; max_size = 8 * 1024 * 1024;
} else { }
else
#endif
{
max_size = pthread_get_stacksize_np(pthread_self()); max_size = pthread_get_stacksize_np(pthread_self());
} }