RFC: array_find #14108
Draft
RFC: array_find #14108
Conversation
This file contains 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
morrisonlevi
reviewed
May 2, 2024
Comment on lines
+6627
to
+6629
| if (negate_condition) { | ||
| retval_true = !retval_true; | ||
| } |
There was a problem hiding this comment.
I think this can be simplified to:
Suggested change
| if (negate_condition) { | |
| retval_true = !retval_true; | |
| } | |
| retval_true ^= negate_condition; |
I believe this truth table matches both pieces of code to prove it:
| retval_true | negate_condition | result |
|---|---|---|
| 0 | 0 | 0 |
| 0 | 1 | 1 |
| 1 | 0 | 1 |
| 1 | 1 | 0 |
However, it is late for me, so sorry if I made a mistake.
|
|
||
| ZVAL_COPY(&args[0], operand); | ||
|
|
||
| if (zend_call_function(&fci, &fci_cache) == SUCCESS) { |
There was a problem hiding this comment.
I would save this to a variable which we can use to clean up below, and also mark it as EXPECTED:
Suggested change
| if (zend_call_function(&fci, &fci_cache) == SUCCESS) { | |
| zend_result result = zend_call_function(&fci, &fci_cache); | |
| if (EXPECTED(result == SUCCESS)) { |
Comment on lines
+6644
to
+6653
| } else { | ||
| zval_ptr_dtor(&args[0]); | ||
| zval_ptr_dtor(&args[1]); | ||
| } | ||
| } else { | ||
| zval_ptr_dtor(&args[0]); | ||
| zval_ptr_dtor(&args[1]); | ||
|
|
||
| return FAILURE; | ||
| } |
There was a problem hiding this comment.
This uses the suggestion of saving result to a variable to coalesce the dtor code:
Suggested change
| } else { | |
| zval_ptr_dtor(&args[0]); | |
| zval_ptr_dtor(&args[1]); | |
| } | |
| } else { | |
| zval_ptr_dtor(&args[0]); | |
| zval_ptr_dtor(&args[1]); | |
| return FAILURE; | |
| } | |
| } | |
| } | |
| zval_ptr_dtor(&args[0]); | |
| zval_ptr_dtor(&args[1]); | |
| if (UNEXPECTED(result != SUCCESS)) { | |
| return FAILURE; | |
| } |
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.
RFC: https://wiki.php.net/rfc/array_find