bpo-40130: _PyUnicode_AsKind() should not be exported. #19265
Merged
Conversation
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
Make it a static function, and pass known attributes (kind, data, length) instead of the PyUnicode object.
vstinner
approved these changes
Mar 31, 2020
| @@ -2458,13 +2458,15 @@ unicode_adjust_maxchar(PyObject **p_unicode) | |||
| if (max_char >= 256) | |||
| return; | |||
| } | |||
| else { | |||
| else if (kind == PyUnicode_4BYTE_KIND) { | |||
There was a problem hiding this comment.
Maybe a switch/case would be more appropriate.
There was a problem hiding this comment.
Maybe. I left a chain of ifs because I am sure that in this case the compiler would generate the optimal code for PyUnicode_1BYTE_KIND, and I am not so sure about this in the case of switch/case. It may be a matter of other issue, I do not want to introduce regression.
There was a problem hiding this comment.
It was just a remark. You can leave the code as it is, I already approved your PR.
Objects/unicodeobject.c
Outdated
| @@ -2525,8 +2517,8 @@ _PyUnicode_AsKind(PyObject *s, unsigned int kind) | |||
| assert(skind == PyUnicode_1BYTE_KIND); | |||
| _PyUnicode_CONVERT_BYTES( | |||
| Py_UCS1, Py_UCS2, | |||
| PyUnicode_1BYTE_DATA(s), | |||
| PyUnicode_1BYTE_DATA(s) + len, | |||
| (Py_UCS1 *)data, | |||
There was a problem hiding this comment.
it should be const Py_UCS1*, no?
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.
Make it a static function, and pass known attributes (kind, data, length) instead of the PyUnicode object.
https://bugs.python.org/issue40130