Disambiguation #16312
Merged
Disambiguation #16312
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
Rename `Base` to `InstBase`. This is needed to help MSVC disambiguate the typename from the enumerator member in certain specializations. The SILInstruction is used in LLDB and when building with MSVC would fail due to an ambiguous resolution.
The class contains two inline operator overloads which are marked as friends. These overloads actually will be promoted to a global function. MSVC will not mark them as friends resulting in access to the members being lost. Explicitly mark the overloads as friends. This is needed by LLDB.
swift::detail is ambiguous when building lldb for MSVC. It is unable to disambiguate between `lldb::swift::detail` and `swift::detail`. Explicitly qualify the namespace to help it disambiguate it.
|
CC: @dcci - helps get swift-lldb building on Windows! (@jrose-apple - you might care too :-)) |
|
@swift-ci please test |
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.
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.