Skip to content

[3.14] gh-140104: Set next_instr properly in the JIT during exceptions (GH-140233) - #141495

Merged
Fidget-Spinner merged 6 commits into
python:3.14from
efimov-mikhail:Fidget-Spinner-this_instr_exception-3.14-2
Nov 13, 2025
Merged

[3.14] gh-140104: Set next_instr properly in the JIT during exceptions (GH-140233)#141495
Fidget-Spinner merged 6 commits into
python:3.14from
efimov-mikhail:Fidget-Spinner-this_instr_exception-3.14-2

Conversation

@efimov-mikhail

@efimov-mikhailefimov-mikhail commented Nov 13, 2025

Copy link
Copy Markdown
Member

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:

./configure --enable-experimental-jit=yes --with-pydebug
./configure --enable-experimental-jit=interpreter --with-pydebug

Comment threadPython/ceval_macros.h
Comment threadPython/ceval_macros.h
@pythonpython deleted a comment from Fidget-SpinnerNov 13, 2025
@Fidget-Spinner

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.

@efimov-mikhail

Copy link
Copy Markdown
MemberAuthor

Could you pleas trigger the JIT CI by pushing whitespace to a jit file? We can revert that after I see it's green.

Sure! I hope that I understand correctly what file do you mean (Tools/jit/template.c).

@Fidget-Spinner

Copy link
Copy Markdown
Member

Very cool. It's green! Ok, please revert the jit file change and I'll merge it.

@Fidget-Spinner

Copy link
Copy Markdown
Member

Thanks again.

@Fidget-Spinner
Fidget-Spinner merged commit af20b88 into python:3.14Nov 13, 2025
57 checks passed
@efimov-mikhail

Copy link
Copy Markdown
MemberAuthor

Thank you for review and merge!

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@efimov-mikhail@Fidget-Spinner