Skip to content

Conversation

@chris-eibl
Copy link
Member

@chris-eibl chris-eibl commented Dec 22, 2025

So much has happened on main that I started fresh over and sqash merged the needed things from #139962 onto latest main (mostly because I wanted to use it for my own experiments on main again).

Based on @markshannon's work in #142228 I've factored out _Py_VectorCallInstrumentation_StackRefSteal, because then @Fidget-Spinner's #138115 is not needed in this PR and can be done in a follow-up. An alternative would be to keep it and pass tstate into the Py_*_StackRefSteal functions.

@Fidget-Spinner
Copy link
Member

In the future, please communicate if you want to supercede a PR for other contributors. It's often considered not good etiquette to take over another person's PR unless they explicitly allow it. However, I'm more than happy to let you take over the PR in this case.

// MSVC fails during a tail call release build with loads of
// error C4737: Unable to perform required tail call.
// without using Py_NO_INLINE here, but PGO works fine.
#if defined(_MSC_VER) && !defined(__clang__) && _Py_TAIL_CALL_INTERP && !defined(_Py_USING_PGO)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It needed lots of trial and error to come up with this unintuive minimal change needed to convince MSVC that the local variable passed by reference into result here does not escape the tail call.

Using it as an return value in PyMapping_GetOptionalItem2 is more explicit, but might have other drawbacks?

@chris-eibl
Copy link
Member Author

In the future, please communicate if you want to supercede a PR for other contributors. It's often considered not good etiquette to take over another person's PR unless they explicitly allow it. However, I'm more than happy to let you take over the PR in this case.

Sorry, wasn't ment as superseding, more as a follow up and maybe just a draft for new discussions. Thought about you're gonna take whatever deems appropriate back into your original PR ...

If this here is going to fly, I'd like to include you and Brandt as authors for the commits, but don't know how atm ...

@hugovk
Copy link
Member

hugovk commented Dec 22, 2025

If this here is going to fly, I'd like to include you and Brandt as authors for the commits, but don't know how atm ...

Co-authored-by is the way:

https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors

@Fidget-Spinner
Copy link
Member

If this here is going to fly, I'd like to include you and Brandt as authors for the commits, but don't know how atm ...

Oh I'm happy to be superseded. If you'd like to attribute commit history though, you can just push a trivial commit with the co-author info like Hugo pointed out, and when I squash and merge I'll use that.

@Fidget-Spinner
Copy link
Member

Try pulling main in, I fixed a JIT bug there that should turn the JIT CI green again.

@chris-eibl
Copy link
Member Author

Co-authored-by is the way:

Done

chris-eibl and others added 2 commits December 22, 2025 17:44
Co-authored-by: Hugo van Kemenade <[email protected]>
I could not add this one to batch, so have to do it separately

Co-authored-by: Hugo van Kemenade <[email protected]>
@chris-eibl
Copy link
Member Author

https://github.com/python/cpython/actions/runs/20437258430/job/58722460806 failed inbetween
test_extractall_none_gid (test.test_tarfile.NoneInfoExtractTests_Tar.test_extractall_none_gid) ... Windows fatal exception: access violation
(but got green when rerunning the failed test) even though pulling in main.

I've found this: #143073

Hopefully, this will fix it ...

try to fix "Native Windows MSVC (release)"
@Fidget-Spinner
Copy link
Member

Fidget-Spinner commented Dec 22, 2025

Just ignore the JIT problems for now. The new JIT executor management has a known bug #143026

@Fidget-Spinner Fidget-Spinner added the 🔨 test-with-refleak-buildbots Test PR w/ refleak buildbots; report in status section label Dec 22, 2025
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @Fidget-Spinner for commit da1adaf 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F143068%2Fmerge

If you want to schedule another build, you need to add the 🔨 test-with-refleak-buildbots label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-refleak-buildbots Test PR w/ refleak buildbots; report in status section label Dec 22, 2025
@Fidget-Spinner
Copy link
Member

Fidget-Spinner commented Dec 22, 2025

Copy link
Member

@Fidget-Spinner Fidget-Spinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once again:

  • This PR is the successor of one that has been up for 2 months already #139962 . We've had enough discussion there to get a sensing of what we want.
  • Refleak tests are green, performance results are within noise for the default (computed goto) interpreter.
  • This PR adds CI for the new configuration, which is also green.
  • I have discussed this feature with the other core devs a few months back on our bi-weekly perf meetings. Everyone was in agreement that adding scopes to MSVC is fine as it isn't that invasive.
  • This PR is the minimal changeset required to get TC working on MSVC.
  • It uses the techniques suggested by Mark in the other PR (just adding scopes and commenting on them). So I expect he should be okay with the overall design I hope. I understand he might disagree on some of the smaller changes.
  • It LGTM, from my review of the changes.

Therefore, I'm merging this PR.

Any follow-ups can be done on future PRs. Any discussion about the design can be done on the issue itself.

@Fidget-Spinner Fidget-Spinner merged commit be3c131 into python:main Dec 22, 2025
94 of 95 checks passed
Sign up for free to 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.

4 participants