Add -scanner-prefix-map-paths option and fix multiArg option parsing
#1949
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
| @@ -216,7 +216,8 @@ public typealias ExternalTargetModuleDetailsMap = [ModuleDependencyId: ExternalT | |||
| // Add prefix mapping. The option is cache invariant so it can be added without affecting cache key. | |||
| for (key, value) in prefixMap { | |||
| commandLine.appendFlag("-cache-replay-prefix-map") | |||
| commandLine.appendFlag(value.pathString + "=" + key.pathString) | |||
| commandLine.appendFlag(value.pathString) | |||
There was a problem hiding this comment.
swift-driver needs to be compatible with a range of swift compiler. I suggest
isFrontendArgSupported(.scannerPrefixMapPaths)
then do the new option, otherwise, join them with =
| @@ -182,10 +182,8 @@ extension OptionTable { | |||
| throw OptionParseError.missingArgument( | |||
| index: index - 1, argument: argument) | |||
| } | |||
| parsedOptions.addOption(option, argument: .multiple(Array())) | |||
| arguments[index..<endIdx].map { String($0) }.forEach { parsedOptions.addInput($0) } | |||
| parsedOptions.addOption(option, argument: .multiple(arguments[index..<endIdx].map { String($0) })) | |||
There was a problem hiding this comment.
Let's add a test for this fix.
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.
The current command-line option for specifying prefix mappings for the dependency scanner does not handle paths containing equal signs. This PR adds a new option
-scanner-prefix-map-pathsthat has a multiArg format instead of being=-separated and fixes this issue. The old-scanner-prefix-mapoption is still preserved, but is made driver-only and gets translated to the new option format by the driver.This also fixes the parsing of
.multiArgoptions inOptionParsing.swiftso that their corresponding arguments are not added to the general inputs list and are attached to their option correctly.Corresponding PR on Swift: swiftlang/swift#82745