Use capstone explicitly, drop oprofile (GH 10876) #10918
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
Until now, libcapstone has been detected "automagically" and used for JIT disassembly whenever it is available on the system used to compile PHP. This can have some unintended consequences, however: many users have capstone installed for some other purpose, and are surprised to find that PHP breaks when capstone is later uninstalled. To address this, we have introduced a new --with-opcache-capstone flag that is disabled by default, and that makes the user's preference explicit. It is ignored unless the JIT is enabled.
Recently we have replaced the "automagic" detection of capstone at build time with a --with-opcache-capstone flag. The detection of oprofile causes similar problems and would likely have the same solution; however, it was suggested that we might remove oprofile altogether. So, this commit removes it: * Remove the detection bits from ext/opcache/config.m4. * Drop HAVE_OPROFILE ifdef blocks. * Delete ext/opcache/jit/zend_jit_oprofile.c. * Undefine the ZEND_JIT_DEBUG_OPROFILE constant.
iluuu1994
changed the title
|
Perfect, thank you for tackling this @orlitzky! |
|
No problem, thanks for your help. |
dstogov
reviewed
Mar 27, 2023
| @@ -18,6 +18,12 @@ PHP_ARG_ENABLE([opcache-jit], | |||
| [yes], | |||
| [no]) | |||
|
|
|||
| PHP_ARG_WITH([opcache-capstone],, | |||
| [AS_HELP_STRING([--with-opcache-capstone], | |||
There was a problem hiding this comment.
I think --with-capstone should be enough.
In general, we need the same flag for Windows.
it's great you kept udis86 yet.
There was a problem hiding this comment.
I think disambiguation of flags isn't a bad thing but either works for me.
#10952
There was a problem hiding this comment.
I had second thoughts about --with-capstone after seeing that all of the FPM flags were named --with-fpm-foo, but FWIW I don't mind either way.
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.
As suggested in #10876, we make our use of capstone explicit with a
--with-opcache-capstoneflag. Instead of something similar for oprofile, it has been removed.