bpo-39156: Break up COMPARE_OP into four logically distinct opcodes. #17754
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
markshannon
force-pushed
the
breakup-compare-op
branch
3 times, most recently
from
3f4e3d4 to
2ee4c16
Compare
ZackerySpytz
reviewed
Jan 9, 2020
Doc/library/dis.rst
Outdated
| @@ -961,6 +975,13 @@ All of the following opcodes use their arguments. | |||
|
|
|||
| .. versionadded:: 3.1 | |||
|
|
|||
| .. opcode:: JUMP_IF_NOT_EXC_MATCH (target) | |||
|
|
|||
| Tests whether the second value on the stack is an exception matching TOS, and jumps if it is not. | |||
There was a problem hiding this comment.
This should be wrapped at 80 chars.
Python/ceval.c
Outdated
| PyObject *left = POP(); | ||
| if (PyTuple_Check(right)) { | ||
| Py_ssize_t i, length; | ||
| length = PyTuple_Size(right); |
There was a problem hiding this comment.
I think PyTuple_GET_SIZE() should be used here.
Python/ceval.c
Outdated
| if (PyTuple_Check(right)) { | ||
| Py_ssize_t i, length; | ||
| length = PyTuple_Size(right); | ||
| for (i = 0; i < length; i += 1) { |
| int res = PyErr_GivenExceptionMatches(left, right); | ||
| Py_DECREF(left); | ||
| Py_DECREF(right); | ||
| if (res > 0) { |
There was a problem hiding this comment.
IMO, this check for res > 0 should not be included.
COMPARE_OP for rich comparisons IS_OP for 'is' and 'is not' tests CONTAINS_OP for 'in' and 'is not' tests JUMP_IF_NOT_EXC_MATCH for checking exceptions in 'try-except' statements.
markshannon
force-pushed
the
breakup-compare-op
branch
from
3e24674 to
8dbef33
Compare
markshannon
force-pushed
the
breakup-compare-op
branch
from
8dbef33 to
1486559
Compare
markshannon
force-pushed
the
breakup-compare-op
branch
from
8f56c51 to
449cb17
Compare
markshannon
force-pushed
the
breakup-compare-op
branch
from
449cb17 to
5c9a327
Compare
shihai1991
pushed a commit
to shihai1991/cpython
that referenced
this pull request
Jan 31, 2020
…ythonGH-17754) Break up COMPARE_OP into four logically distinct opcodes: * COMPARE_OP for rich comparisons * IS_OP for 'is' and 'is not' tests * CONTAINS_OP for 'in' and 'is not' tests * JUMP_IF_NOT_EXC_MATCH for checking exceptions in 'try-except' statements.
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.
Breaks up COMPARE_OP into four logically distinct opcodes:
This improves the clarity of the interpreter and should provide a modest speedup.
https://bugs.python.org/issue39156