Move span to conditional header in libstdc++ module map
#84722
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
`span` is not available in all versions of libstd++, so make it a conditional header. Also adds other missing c++20 headers. Fixing this triggered an assert when importing a constant initialized `wchar_t` variable, so that is also fixed. The reason is that `wchar_t` is mapped to `Unicode.Scalar`, which cannot be directly initialized by integer literals in Swift, triggering an assert when looking up the protocol conformance for `_ExpressibleByBuiltinIntegerLiteral`. rdar://162074714
hnrklssn
requested review from
zoecarver,
egorzhdan,
Xazax-hun,
j-hui,
fahadnayyar,
susmonteiro,
beccadax,
ian-twilightcoder,
hborla,
slavapestov and
xedin
as code owners
|
@swift-ci please smoke test |
egorzhdan
reviewed
Oct 7, 2025
Comment on lines
+4678
to
+4681
| // Do not attempts to import CWideChar (wchar_t) values. CWideChar is | ||
| // a typealias for Unicode.Scalar, which does not | ||
| // implement _ExpressibleByBuiltinIntegerLiteral. | ||
| // FIXME: import using _ExpressibleByUnicodeScalarLiteral. |
There was a problem hiding this comment.
Would this be a source breaking change?
There was a problem hiding this comment.
This change only affects sources that would previously trigger an assert, so I would not say it's source breaking.
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.
spanis not available in all versions of libstd++, so make it a conditional header. Also adds other missing c++20 headers.Fixing this triggered an assert when importing a constant initialized
wchar_tvariable, so that is also fixed. The reason is thatwchar_tis mapped toUnicode.Scalar, which cannot be directly initialized by integer literals in Swift, triggering an assert when looking up the protocol conformance for_ExpressibleByBuiltinIntegerLiteral.rdar://162074714
rdar://161999183