Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ PHP NEWS
a non-Generator delegate crashes). (Arnaud)
. Fixed bug GH-18736 (Circumvented type check with return by ref + finally).
(ilutov)
. Fixed zend call stack size for macOs/arm64. (David Carlier)

- FTP:
. Fix theoretical issues with hrtime() not being available. (nielsdos)
Expand Down
5 changes: 4 additions & 1 deletion Zend/tests/stack_limit/stack_limit_010.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ $stack = zend_test_zend_call_stack_get();
var_dump($stack);

$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')) {
'amd64' => 512*1024*1024 - 4096,
'i386' => 64*1024*1024 - 4096,
Expand Down
9 changes: 7 additions & 2 deletions Zend/zend_call_stack.c
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,9 @@ static bool zend_call_stack_get_macos(zend_call_stack *stack)
void *base = pthread_get_stackaddr_np(pthread_self());
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
* thread in OSX 10.9, 10.10:
* https://mail.openjdk.org/pipermail/hotspot-dev/2013-October/011353.html
Expand All @@ -427,7 +429,10 @@ static bool zend_call_stack_get_macos(zend_call_stack *stack)
/* Stack size is 8MiB by default for main threads
* https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/Multithreading/CreatingThreads/CreatingThreads.html */
max_size = 8 * 1024 * 1024;
} else {
}
else
#endif
{
max_size = pthread_get_stacksize_np(pthread_self());
}

Expand Down
Loading