[5.5] stdlib: change the console to UTF-8 on start #40929
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
This adjusts the Windows console to switch the codepage to UTF-8. This is important as the default codepage (CP437) does not allow for UTF-8 output, but expects ASCII. However, strings in Swift are assumed to be UTF-8, which means that there is now a conversion mismatch. Because the console mode persists beyond the duration of the application as it is state local to the console and not the C runtime, we should restore the state of the console before termination. We do this by registering a termination handler via `atexit`. This means that an abnormal termination (e.g. via `fatalError`) will irrevocably alter the state of the console (interestingly enough, `chcp` will still report the original console codepage even though the console will internally be set to UTF-8). Fixes: SR-13807 (cherry picked from commit 9847cab)
|
@swift-ci please test |
|
CC: @shahmishal @mikeash |
mikeash
approved these changes
Jan 20, 2022
We need to re-enable this test? |
|
Hmm, that is intriguing ... it is enabled on main. I just am not sure what it picked up to now pass on 5.5. It might be the LLVM fix? Afterall, the 5.5.2 and 5.5.3 changes are to fix the concurrency runtime issues. |
Enable the test that was previously failing on 5.5. This has been stable on main for a while, and seems to also be now passing on 5.5
|
@swift-ci please test Windows platform |
|
Ah, yeah, seems that the other tests are similarly now passing. |
|
@swift-ci please test Windows platform |
|
@swift-ci please test |
compnerd
changed the title
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.
This adjusts the Windows console to switch the codepage to UTF-8. This
is important as the default codepage (CP437) does not allow for UTF-8
output, but expects ASCII. However, strings in Swift are assumed to be
UTF-8, which means that there is now a conversion mismatch.
Because the console mode persists beyond the duration of the application
as it is state local to the console and not the C runtime, we should
restore the state of the console before termination. We do this by
registering a termination handler via
atexit. This means that anabnormal termination (e.g. via
fatalError) will irrevocably alter thestate of the console (interestingly enough,
chcpwill still report theoriginal console codepage even though the console will internally be set
to UTF-8).
Fixes: SR-13807
(cherry picked from commit 9847cab)
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.