[PackageModel] Toolchain: A few fixes for features supported by Swift compiler #8761
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
…nteger Older versions of `-print-supported-features` emitted `enabled_in` field as an integer (major compiler version only), newer ones emit it as a string to support major+minor.
… section `JSON.get` would throw if the key couldn't be found, let's handle that gracefully for an optional "optional features" section.
xedin
requested review from
jakepetroules,
dschaefer2,
shawnhyam,
bripeticca,
plemarquand,
owenv,
bkhouri,
cmcgee1024 and
daveyc123
as code owners
|
@swift-ci please test |
jakepetroules
approved these changes
Jun 4, 2025
xedin
added a commit
that referenced
this pull request
Jun 4, 2025
…Swift compiler (#8762) - Explanation: `swift package migrate` is broken when used with older toolchains. - Fix "supported features" parsing with older toolchains. `-print-supported-features` flag used to output "enabled_in" version as an integer (major only). - Handle absence of optional features section. `JSON.get` would throw if the key couldn't be found, let's handle that gracefully for an optional "optional features" section. - Main Branch PR: #8761 - Risk: Low (only `swift package migrate` is affected by this changes). - Resolves: rdar://152533205 - Reviewed By: @dschaefer2 - Testing: Updated existing tests in the suite, added new test-cases.
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.
Motivation:
-print-supported-featuresflag used to output "enabled_in" version as an integer (major only).JSON.getwould throw if the key couldn't be found, let's handle that gracefully for an optional "optional features" section.Modifications:
Toolchain.swiftCompilerSupportedFeaturesto usetry?when querying JSON for an optional "optional" key.Toolchain.swiftCompilerSupportedFeaturesto attempt to retrieve "enabled_in" key as a String first and if that fails - as an integer.Result:
swift package migratecan now support older toolchains that have "enabled_in" printed as an integer and have no "optional features" section in their-print-supported-featuresoutput.