[clang][Darwin] Simplify deployment version assignment in the Driver (#142013) #10802
+222
−147
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
…lvm#142013) To be able to handle all of the ways the platform & deployment version can be represented in command line flags, the Darwin toolchain holds a type `DarwinPlatform` to help represent them. This patch simplifies the logic by: * reducing the amount of work done between string & version tuples conversions * renaming variables to reduce confusion about what target triple information is being manipulated. * allowing implicit transformation of macOS10.16 -> 11, there are other places in the compiler where this happens, and it was a bit confusing that the driver didn't do that for the cc1 call. This is not a major refactor, but more simple & common tweaks across the file, in hopes to make it more readable. (cherry picked from commit 752adc3)
|
@swfit-ci please test |
|
@swift-ci please test |
|
@swift-ci please test macOS |
|
@swift-ci please smoke test macOS |
|
@swift-ci please test macOS |
JDevlieghere
approved these changes
Jun 10, 2025
Comment on lines
+2060
to
+2063
| // We allow multiple ways to set or default the OS | ||
| // version used for compilation. When set, UnderlyingOSVersion represents | ||
| // the intended version to match the platform information computed from | ||
| // arguments. |
There was a problem hiding this comment.
Nit: seems like this can be reflowed.
Suggested change
| // We allow multiple ways to set or default the OS | |
| // version used for compilation. When set, UnderlyingOSVersion represents | |
| // the intended version to match the platform information computed from | |
| // arguments. | |
| // We allow multiple ways to set or default the OS version used for | |
| // compilation. When set, UnderlyingOSVersion represents the intended version | |
| // to match the platform information computed from arguments. |
There was a problem hiding this comment.
The only change is formatting, right? clang-format may be the reason for this, but if not, I'll fix it upstream & cherry-pick.
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.
To be able to handle all of the ways the platform & deployment version can be represented in command line flags, the Darwin toolchain holds a type
DarwinPlatformto help represent them. This patch simplifies the logic by:This is not a major refactor, but more simple & common tweaks across the file, in hopes to make it more readable.
(cherry picked from commit 752adc3)