Skip to content

Fix #1 PHP 8.0 build #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pierredup merged 1 commit into from
Jan 14, 2025
Merged

Fix #1 PHP 8.0 build #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions aspect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ZEND_DECLARE_MODULE_GLOBALS(aspect)

static void (*original_zend_execute_ex)(zend_execute_data *execute_data);

ZEND_API static void aspect_execute_ex(zend_execute_data *execute_data);
static void aspect_execute_ex(zend_execute_data *execute_data);

static void handle_memoize_functions(zend_execute_data *execute_data);

Expand Down Expand Up @@ -111,7 +111,11 @@ static void aspect_execute_ex(zend_execute_data *execute_data) {
zend_type return_type = ret_info->type;
uint32_t type_mask = return_type.type_mask;

if (type_mask & ((uint32_t)1 << IS_VOID) || type_mask & ((uint32_t)1 << IS_NEVER)) {
if (type_mask & ((uint32_t)1 << IS_VOID)
#if PHP_VERSION_ID >= 80100
|| type_mask & ((uint32_t)1 << IS_NEVER)
#endif
) {
// cannot memoize functions with void or never return types
// @TODO: Should this be an error/exception?
original_zend_execute_ex(execute_data);
Expand Down
Loading