Skip to content
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.

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

Fix fibers on PHP 8.1.2 #2473

Merged
merged 1 commit into from
Jan 16, 2024
Merged
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
4 changes: 2 additions & 2 deletions ext/handlers_fiber.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ static void dd_set_observed_frame(zend_execute_data *execute_data) {
fake_ex.prev_execute_data = execute_data;

volatile void *run_time_cache_start;
zend_observer_fcall_data handlers = { .end = handlers.handlers + 1, .handlers = { { NULL, &dd_dummy_end_observer } } };
zend_observer_fcall_data handlers = { .end = handlers.handlers + 1, .handlers = { { NULL, &dd_dummy_end_observer } } }, *handlers_ptr = &handlers;
zend_observer_fcall_end_handler end_handlers[2] = { &dd_dummy_end_observer, NULL };
if (dd_legacy_observers) {
run_time_cache_start = ((void **) &handlers) - zend_observer_fcall_op_array_extension;
run_time_cache_start = ((void **) &handlers_ptr) - zend_observer_fcall_op_array_extension;
} else {
run_time_cache_start = ((void **) end_handlers) - zend_observer_fcall_op_array_extension - zai_registered_observers;
}
Expand Down
Loading