[3.14] gh-140104: Set next_instr properly in the JIT during exceptions (GH-140233) - #141495
Merged
Fidget-Spinner merged 6 commits intoNov 13, 2025
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
efimov-mikhail
requested review from
Fidget-Spinner
and removed request for
markshannon
November 13, 2025 09:54
This was referenced Nov 13, 2025
Comment thread
Python/ceval_macros.h
Comment thread
Python/ceval_macros.h
Copy link
Copy Markdown
Member
|
Could you pleas trigger the JIT CI by pushing whitespace to a jit file? We can revert that after I see it's green. |
Sorry, something went wrong.
efimov-mikhail
requested review from
brandtbucher and
savannahostrowski
as code owners
November 13, 2025 15:31
Copy link
Copy Markdown
Member
Author
Sure! I hope that I understand correctly what file do you mean (Tools/jit/template.c). |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
|
Very cool. It's green! Ok, please revert the jit file change and I'll merge it. |
Sorry, something went wrong.
Fidget-Spinner
approved these changes
Nov 13, 2025
Copy link
Copy Markdown
Member
|
Thanks again. |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
Author
|
Thank you for review and merge! |
Sorry, something went wrong.
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
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.
It's an another attempt to backport GH-140233.
The first one was buggy and we reverted it.
CC @Fidget-Spinner.
I'm not sure that this fix is fully correct.
But it passes all the tests on my machine (Debian 12, x86_64) in both build configurations: