Skip to content

ext/opcache/jit/zend_jit: fix inverted bailout value in zend_runtime_jit() #10144

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

Merged
merged 1 commit into from
Dec 21, 2022

Conversation

MaxKellermann
Copy link
Contributor

In the "catch" block, do_bailout must be set to true, not false, or else zend_bailout() never gets called.

…jit()

In the "catch" block, do_bailout must be set to true, not false, or
else zend_bailout() never gets called.
@@ -4287,7 +4287,7 @@ static int ZEND_FASTCALL zend_runtime_jit(void)
/* perform real JIT for this function */
zend_real_jit_func(op_array, NULL, NULL);
} zend_catch {
do_bailout = 0;
do_bailout = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you set to false above for consistency ? your changes looks good otherwise.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to submit a master branch PR with lots of bool cleanup - no code change, just semantic cleanup - but wanted this bug fix PR to be as small/simple as possible, only fixing the actual bug.

Copy link
Member

@devnexen devnexen Dec 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah if that s the case, makes sense then.

Copy link
Member

@devnexen devnexen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@arnaud-lb arnaud-lb merged commit d3a6eed into php:PHP-8.1 Dec 21, 2022
@arnaud-lb
Copy link
Member

Thank you!

arnaud-lb added a commit that referenced this pull request Dec 21, 2022
* PHP-8.1:
  [ci skip] NEWS
  ext/opcache/jit/zend_jit: fix inverted bailout value in zend_runtime_jit() (#10144)
arnaud-lb added a commit that referenced this pull request Dec 21, 2022
* PHP-8.2:
  [ci skip] NEWS
  [ci skip] NEWS
  ext/opcache/jit/zend_jit: fix inverted bailout value in zend_runtime_jit() (#10144)
@MaxKellermann MaxKellermann deleted the inverted_bailout branch December 21, 2022 15:20
MaxKellermann added a commit to CM4all/php-src that referenced this pull request Jan 9, 2023
…jit() (php#10144)

In the "catch" block, do_bailout must be set to true, not false, or
else zend_bailout() never gets called.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants