[WinSDK] Modularize <guiddef.h>
#83914
Conversation
|
@swift-ci please smoke test |
|
Ugh, looks like this header is under |
|
Yeah, the GUID definition is shared between um and km. We currently get it through transitive includes. |
egorzhdan
force-pushed
the
egorzhdan/guiddef
branch
2 times, most recently
from
6388790 to
862b799
Compare
egorzhdan
requested review from
Xazax-hun,
beccadax,
edymtt,
etcwilde,
fahadnayyar,
ian-twilightcoder,
j-hui,
justice-adams-apple,
susmonteiro and
zoecarver
as code owners
There was a problem hiding this comment.
Do we still support older SDKs? This might be a bit simpler if we don't.
There was a problem hiding this comment.
Yes, we do support older SDKs, which is why this gets tricky, but only from 10.0.17763 (Windows 10 RS5).
There was a problem hiding this comment.
I see, so we should be able to remove this check then.
egorzhdan
force-pushed
the
egorzhdan/guiddef
branch
from
862b799 to
d154f8f
Compare
There was a problem hiding this comment.
Perhaps we should rename this to winsdk_um.modulemap?
There was a problem hiding this comment.
Sounds reasonable! Renamed it.
egorzhdan
force-pushed
the
egorzhdan/guiddef
branch
from
d154f8f to
014a0ec
Compare
This fixes modularization errors that arise when importing a C++ header that contains `#include <guiddef.h>`, which might hijack this header from the WinSDK module where it belongs.
egorzhdan
force-pushed
the
egorzhdan/guiddef
branch
from
014a0ec to
28f9db7
Compare
This is a companion to swiftlang/swift#83914.
|
swiftlang/swift-installer-scripts#458 @swift-ci please test Windows |
|
@swift-ci please smoke test macOS |
|
@swift-ci please smoke test Linux |
|
swiftlang/swift-installer-scripts#458 @swift-ci please build toolchain Windows ARM64 |
|
swiftlang/swift-installer-scripts#458 @swift-ci please build toolchain Windows |
|
The toolchain seems to work for me locally – @compnerd would you be OK with landing this? |
compnerd
left a comment
compnerd
left a comment
There was a problem hiding this comment.
Builds, works. I think that it's a bit unfortunate that we have to split it up, but so be it.
Thanks for doing this!
This PR changes the name of the clang module introduced in #83914 from `_GUID` to `_GUIDDef`. This change is necessary because the Windows SDK declares a type named `_GUID` and Swift gets confused when a module and a type have the same name. This confusion is the motivation for [SE-0491](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0491-module-selectors.md), but we can't just wait for a fix because the new module is a source-breaking change and clients won't be able to adopt the proposed syntax for some time.
This PR changes the name of the clang module introduced in #83914 from `_GUID` to `_GUIDDef`. This change is necessary because the Windows SDK declares a type named `_GUID` and Swift gets confused when a module and a type have the same name. This confusion is the motivation for [SE-0491](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0491-module-selectors.md), but we can't just wait for a fix because the new module is a source-breaking change and clients won't be able to adopt the proposed syntax for some time.
3 participants
This fixes modularization errors that arise when importing a C++ header that contains
#include <guiddef.h>, which might hijack this header from the WinSDK module where it belongs.