[5.9] backport platform modularisation changes for Windows #67632
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 adds the Windows credentials API to the modulemap for the Windows SDK module.
Add a module definition for importing the URL Monikers interfaces. This is in service of DocC.
Specify the C++ standard required for these submodules. Although this has no practical implications, it is useful for isolating the features with different C++ standards.
Add the missing submodule for `iomanip` on Windows.
These headers are not meant to be publicly consumed, introduce a `_Private` module for internal use for the `std` module.
This adds the `xutility` module to strip that from the first modular inclusion of the header.
Add a couple of missing submodules to the modulemap. This is for completeness and to help with newer MSVCPRT releases.
These modules were deprecated and do not exist in the distribution, remove the commented out form.
This was detected as missing when trying to re-modularise MSVCPRT.
Add the missing `std._Private.xstddef`, `std._Private.yvals`, and `std._Private.yvals_core` modules. This repairs the use of `std.map` as a private member variable of a type with an explicit ctor.
compnerd
requested review from
hborla,
slavapestov,
xedin,
ahoppen,
bnbarham,
rintaro,
hamishknight,
shahmishal,
adrian-prantl,
ktoso,
AnthonyLatsis,
QuietMisdreavus,
artemcm,
CodaFi,
DougGregor,
zoecarver,
hyp,
egorzhdan and
MaxDesiatov
as code owners
compnerd
requested review from
kavon,
al45tair,
tshortli and
eeckstein
as code owners
compnerd
removed request for
xedin,
slavapestov,
ktoso,
rintaro,
kavon,
bnbarham,
CodaFi,
adrian-prantl,
al45tair,
ahoppen,
QuietMisdreavus,
artemcm,
hborla,
zoecarver,
hamishknight,
eeckstein,
tshortli and
AnthonyLatsis
|
@swift-ci please test |
egorzhdan
approved these changes
Jul 31, 2023
DougGregor
approved these changes
Jul 31, 2023
etcwilde
approved these changes
Jul 31, 2023
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.
Explanation:
This cherry-picks a number of changes that have been applied to the platform modularisation on main to enable C++ interop (and some dependencies). This enables fixes to the use of
std.mapon Windows.Scope:
Changes the platform specific modularisation for Windows' platform SDK to enable importing a greater number of APIs properly into Windows. The primary one that motivated this change was the fixes to enable the use of
std.mapon Windows for C++ interop.Issue:
Risk:
This should be a relatively low risk change as it is platform constrained and impacts the manner in which headers are imported through the Clang Importer, changing the module definitions to allow better modularisation. Any issues caused by this would be caught during the CI as this path is exercised for the unit tests and building the SDK Overlay components.
Testing:
The standard CI testing to ensure that the CI hosts are comfortable with the alternations to the module definition. Locally, tested with the Firebase C++ SDK to ensure that
std.mapmembers are now imported properly.Reviewer:
@hyp