Change Triple.isiOS to no longer match tvOS #1955
Open
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 behavior is confusing and leads to wrong answers in a number of places. All usage sites of isiOS have been audited to ensure they're now correct. - unsupportedTargetVariant was showing an error message including -target-variant, which should have only matched iOS and not tvOS - getDefaultDwarfVersion checked isiOS in two places, but just so happened to always get the right answer anyways (tvOS's first version was 9, so checking for tvOS < 9 was nonsensical and didn't matter, and iOS and tvOS version numbers have always been aligned, so a < 18 check was right for both)
jakepetroules
commented
Jul 8, 2025
| /// | ||
| /// This accessor is semi-private; it's typically better to use `version(for:)` or | ||
| /// `Triple.FeatureAvailability`. | ||
| public var _tvOSVersion: Version { |
There was a problem hiding this comment.
This part (and changes to _iOSVersion) could use extra scrutiny, I'm not super clear what the true intent is here in terms of what's supposed to be able to map to what.
|
@swift-ci test |
|
@swift-ci test windows |
artemcm
reviewed
Jul 10, 2025
| var version = self.osVersion | ||
| // Default to 5.0 (or 7.0 for arm64). | ||
| if version.major == 0 { | ||
| version.major = arch == .aarch64 ? 7 : 5 | ||
| } | ||
| return version | ||
| case .tvos: | ||
| return osVersion |
There was a problem hiding this comment.
Should this become fatalError("conflicting triple info") like .watchos?
artemcm
reviewed
Jul 10, 2025
| case .ios, .tvos: | ||
| var version = self.osVersion | ||
| if version.major == 0 { | ||
| version.major = 9 |
There was a problem hiding this comment.
Could you add a comment for why we default to 9?
|
I believe we must also update |
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.
This behavior is confusing and leads to wrong answers in a number of places. All usage sites of isiOS have been audited to ensure they're now correct.