gh-96049: Fix some opcodes leave frame->prev_instr in an incorrect state #96051
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
(cherry picked from commit efb20a9) Co-authored-by: Oleg Iarygin <[email protected]>
Co-authored-by: Serhiy Storchaka <[email protected]> (cherry picked from commit 6442a9d) Co-authored-by: Ken Jin <[email protected]>
…thonGH-94693) (pythonGH-94708) Automerge-Triggered-By: GH:tiran
…ythonGH-94658) (cherry picked from commit 78307c7) Co-authored-by: Christian Heimes <[email protected]>
(cherry picked from commit a10cf2f) Co-authored-by: Tom Fryers <[email protected]>
…ps (pythonGH-94721) (cherry picked from commit 264b3dd)
…onGH-93994) (pythonGH-94740) Elide traceback column indicators when the entire line of the frame is implicated. This reduces traceback length and draws more attention to the remaining (very relevant) indicators. Example: ``` Traceback (most recent call last): File "query.py", line 99, in <module> bar() File "query.py", line 66, in bar foo() File "query.py", line 37, in foo magic_arithmetic('foo') File "query.py", line 18, in magic_arithmetic return add_counts(x) / 25 ^^^^^^^^^^^^^ File "query.py", line 24, in add_counts return 25 + query_user(user1) + query_user(user2) ^^^^^^^^^^^^^^^^^ File "query.py", line 32, in query_user return 1 + query_count(db, response['a']['b']['c']['user'], retry=True) ~~~~~~~~~~~~~~~~~~^^^^^ TypeError: 'NoneType' object is not subscriptable ``` Automerge-Triggered-By: GH:pablogsal
) * fix allocator and deallocator * 📜🤖 Added by blurb_it. * code review Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> (cherry picked from commit f5b7633) Co-authored-by: Kumar Aditya <[email protected]>
…tion is raised multiple times (pythonGH-30274) (python#94747) Co-authored-by: Kumar Aditya <[email protected]>
… (python#94752) Co-authored-by: Kumar Aditya <[email protected]>
…ythonGH-94775) (cherry picked from commit 0c66074) Co-authored-by: Christian Heimes <[email protected]>
* fix typo - double spelled word 'use' * change methods names to the infinitive form (cherry picked from commit 90a6e56) Co-authored-by: Max Zhenzhera <[email protected]>
(cherry picked from commit e39ce7d) Co-authored-by: Benjamin Peterson <[email protected]>
…ythonGH-94754) (python#94780) This is a quick-and-dirty way to run the C++ tests. It can definitely be improved in the future, but it should fail when things go wrong. - Run test functions on import (yes, this can definitely be improved) - Fudge setuptools metadata (name & version) to make the extension installable - Install and import the extension in test_cppext (cherry picked from commit ec5db53) Co-authored-by: Petr Viktorin <[email protected]>
(cherry picked from commit f5c02af) Co-authored-by: Christian Heimes <[email protected]>
…ythonGH-94790) Fixes the failure of PGO building with `mimalloc` on Windows, ensuring that `test_bpo20891` does not break profiling data (`python31*.pgc`). (cherry picked from commit 4a6bb30) Co-authored-by: neonene <[email protected]>
(cherry picked from commit 07374cc) Co-authored-by: Dong-hee Na <[email protected]>
…thongh-94836) (pythongh-94838) (cherry picked from commit 967da5f) Co-authored-by: Dong-hee Na <[email protected]>
(cherry picked from commit 6a15f91) Co-authored-by: Terry Jan Reedy <[email protected]>
…up (pythonGH-94298) (cherry picked from commit 01ef1f9) Co-authored-by: Kumar Aditya <[email protected]>
…ythonGH-94842) (cherry picked from commit 9b3f779) Co-authored-by: neonene <[email protected]>
Colum -> Column (cherry picked from commit 9ea72e9) Co-authored-by: Ikko Ashimine <[email protected]>
…nGH-94794) (cherry picked from commit 08f6897) Co-authored-by: Tin Tvrtković <[email protected]>
…types. (pythonGH-94854) (pythonGH-94871) (cherry picked from commit dc54193)
…python#94849) Co-authored-by: da-woods <[email protected]> (cherry picked from commit 6cbb57f)
…-94852) The case where there are more than (1 << 15) lines was not covered. I don't know if increasing test coverage requires a blurb -- let me know if it does. Automerge-Triggered-By: GH:brandtbucher (cherry picked from commit 582ae86) Co-authored-by: Michael Droettboom <[email protected]>
…hen ndigits is provided (pythonGH-94860) (pythonGH-94882) (cherry picked from commit 625ba9b) Co-authored-by: Michael Droettboom <[email protected]> Automerge-Triggered-By: GH:brandtbucher
tom-pytel
requested review from
ericvsmith,
rhettinger,
a team,
berkerpeksag,
gpshead,
erlend-aasland,
cjw296,
isidentical,
pablogsal,
lysnikolaou,
pganssle,
abalkin,
jaraco,
warsaw,
ericsnowcurrently,
ncoghlan,
vsajip,
tiran,
iritkatriel,
brandtbucher,
markshannon,
1st1 and
asvetlov
as code owners
|
All commit authors signed the Contributor License Agreement. |
Internal Server Error |
|
Thanks for your PR, but it seems you did something wrong with git; there are way too many commits and merge conflicts. I'm going to close this; please start from latest main, then apply your changes and make a PR. |
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.
Opcodes which have caches (specifically adaptive calls) leave
frame->prev_instrpointing to the last byte of the cache instead of the actual last instruction inPython/ceval.c. This fix stores the location of the actual previous instruction and steps over the cache on the next frame entry.