Fix GH-12643: Stack limit tests failing on ppc64le #12779
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These tests were setting zend.max_allowed_stack_size to a small value. On ppc64le this value is too small and the limit may be reached too soon.
mvorisek
reviewed
Nov 26, 2023
| @@ -2311,7 +2311,7 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_use_new_element_for_s | |||
| #ifdef ZEND_CHECK_STACK_LIMIT | |||
| static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_call_stack_size_error(void) | |||
| { | |||
| zend_throw_error(NULL, "Maximum call stack size of %zu bytes reached. Infinite recursion?", | |||
| zend_throw_error(NULL, "Maximum call stack size of %zu bytes (zend.max_allowed_stack_size-zend.reserved_stack_size) reached. Infinite recursion?", | |||
There was a problem hiding this comment.
Suggested change
| zend_throw_error(NULL, "Maximum call stack size of %zu bytes (zend.max_allowed_stack_size-zend.reserved_stack_size) reached. Infinite recursion?", | |
| zend_throw_error(NULL, "Maximum call stack size of %zu bytes (zend.max_allowed_stack_size - zend.reserved_stack_size) reached. Infinite recursion?", |
dstogov
approved these changes
Nov 27, 2023
Make it clearer why the size is not exactly zend.max_allowed_stack_size
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some tests are setting the max_allowed_stack_size too low for ppc64le builds. In this PR I increase the max_allowed_stack_size in these tests, and also clarify the max_allowed_stack_size error message.
Fixes GH-12643