[Driver/SourceKit] Handle filelist driver args in getSingleFrontendInvocationFromDriverArguments #32281
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
|
@swift-ci please test |
|
Build failed |
|
@swift-ci please test OS X Platform |
|
@swift-ci please test Linux |
benlangmuir
reviewed
Jun 10, 2020
lib/Driver/FrontendUtil.cpp
Outdated
| @@ -27,9 +29,21 @@ bool swift::driver::getSingleFrontendInvocationFromDriverArguments( | |||
| ArrayRef<const char *> Argv, DiagnosticEngine &Diags, | |||
| llvm::function_ref<bool(ArrayRef<const char *> FrontendArgs)> Action, | |||
| bool ForceNoOutputs) { | |||
|
|
|||
| // Expand any file list args. | |||
| SmallVector<const char *, 256> ExpandedArgv(Argv.begin(), Argv.end()); | |||
There was a problem hiding this comment.
We shouldn't need two SmallVectors here; can we just use "Args"?
…vocationFromDriverArguments getSingleFrontendInvocationFromDriverArguments is set up to never produce file lists in the output frontend arguments, but since the driver accepts file lists as input arguments, this should too.
nathawes
force-pushed
the
handle-filelists-in-sourcekit-driver-args
branch
from
ab56ee9 to
50dc7d8
Compare
|
@swift-ci please test |
|
Build failed |
|
Build failed |
benlangmuir
approved these changes
Jun 10, 2020
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.
getSingleFrontendInvocationFromDriverArgumentsis set up to never produce file lists in the output frontend arguments (since none of its clients care about command line argument limits), but since the driver proper accepts file lists as input arguments it seems like this function should handle them too.This was causing the sourcekitd stress tester (which passes whatever the build gives to the driver through to sourcekitd verbatim) to report failures that didn't reproduce in Xcode (which seems to never include file lists when computing the arguments to pass through to sourcekitd).