Repository navigation
Expand response file arguments in a single pass - #43546
Open
arpitjain099 wants to merge 1 commit into
Open
arpitjain099 wants to merge 1 commit into
arpitjain099 wants to merge 1 commit into
Conversation
Signed-off-by: Arpit Jain <arpitjain099@gmail.com>
This branch has not been deployed
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
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.
ResponseFileMixincollects the(index, arg)pairs of every@fileargument up front, then callsinsert_items_at_idxonce per pair. That helper replaces one element with a list of a different length, so after the first expansion every remaining index is stale. With two response files where the first expands to anything other than exactly one argument, the second replacement overwrites an unrelated argument and leaves the real@filetoken unexpanded.Concretely,
cc -a @args1 -b @args2 -cwithargs1holding-one -unoandargs2holding-twocanonicalizes to-a -one -uno -two @args2 -c:-bis gone and@args2was never expanded. The same thing happens for two nested refs inside one response file. The existing tests only ever use a single ref, so nothing caught it.Both loops now build the expanded list in one pass, which drops the last user of
insert_items_at_idx, so I removed the helper. That also takes out the strayprint(item)sitting in its inner generator, which was writing the wrapped compiler's arguments to its own stdout whenever an action was enabled (blight-cc -E @rsp src.cwithBLIGHT_ACTIONS=Recordemitted-Eandsrc.cinto the preprocessed output). Happy to keepinsert_items_at_idxaround instead if you would rather not drop it.