Skip to content

mangle exported functions for PyPy#3040

Merged
bors[bot] merged 2 commits intoPyO3:mainfrom
mattip:pypy310-2
Mar 15, 2023
Merged

mangle exported functions for PyPy#3040
bors[bot] merged 2 commits intoPyO3:mainfrom
mattip:pypy310-2

Conversation

@mattip
Copy link
Contributor

@mattip mattip commented Mar 11, 2023

Continuation of #3031. This turned up in the run of PyPy 3.10 HEAD against PyO3 HEAD. Should I add a new news fragment or is the one from #3031 sufficient?

@adamreichold adamreichold added the CI-skip-changelog Skip checking changelog entry label Mar 12, 2023
@adamreichold
Copy link
Member

I think the existing news fragment is sufficient. Thanks!

bors r+

bors bot added a commit that referenced this pull request Mar 12, 2023
3040: mangle exported functions for PyPy r=adamreichold a=mattip

Continuation of #3031. This [turned up](https://github.com/pypy/binary-testing/actions/runs/4390086363/jobs/7688256133#step:6:179) in the run of PyPy 3.10 HEAD against PyO3 HEAD. Should I add a new news fragment or is the one from #3031 sufficient?

Co-authored-by: Matti Picus <matti.picus@gmail.com>
@bors
Copy link
Contributor

bors bot commented Mar 12, 2023

Build failed:

@adamreichold
Copy link
Member

@mattip Could you have a look at the build failure in https://github.com/PyO3/pyo3/actions/runs/4396220835/jobs/7698525481 ? Does this need a version limit?

@mattip
Copy link
Contributor Author

mattip commented Mar 12, 2023

Yes, there should be a version guard. Only PyPy3.10 mangles the name of PySlice_AdjustIndices, before that it exported (by mistake) the unmangled name. I see there is a Py_3_10 designator, how would that work together with the cfg_attr designator?

Copy link
Member

@davidhewitt davidhewitt left a comment

Choose a reason for hiding this comment

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

Sorry I had a pending review comment, just posted - we can do #[cfg_attr(all(PyPy, Py_3_10), ...)]

Co-authored-by: David Hewitt <1939362+davidhewitt@users.noreply.github.com>
@messense
Copy link
Member

bors retry

@bors
Copy link
Contributor

bors bot commented Mar 15, 2023

Build succeeded:

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

Labels

CI-skip-changelog Skip checking changelog entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants