rustc_llvm: Fix flattened CLI args #131805
Merged
Conversation
This file contains 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
Fixes string manipulation errors introduced in rust-lang#130446.
rustbot
added
S-waiting-on-review
|
r? augie |
|
Failed to set assignee to
|
|
r? durin42 |
This comment has been minimized.
This comment has been minimized.
|
Thanks. I'm... actually not sure how rustc finished bootstrap on the LLVM 20 integration build with this error? It has built since then, right? |
workingjubilee
added
the
llvm-main
|
This only affects the command line portion in debug info on windows AFAIK. The only reason we found this was because we had tests for deterministic builds on windows, and the bad strings were sometimes garbage. |
|
huuuh. |
Comment on lines
+493
to
+499
| auto ArgsCppStr = std::string(ArgsCstrBuff + buffer_offset, | ||
| ArgsCstrBuffLen - buffer_offset); | ||
| auto i = 0; | ||
| while (i != std::string::npos) { | ||
| i = ArgsCppStr.find('\0', i + 1); | ||
| if (i != std::string::npos) | ||
| ArgsCppStr.replace(i, i + 1, " "); | ||
| ArgsCppStr.replace(i, 1, " "); |
There was a problem hiding this comment.
So, re-reading the reference about std::string::npos, I think I may have misunderstood something about it.
Why is it correct at all as part of a conditional expression like a while or if? It only takes on its magic "until the end of the string" meaning when used as an argument to std::string's functions, doesn't it? Which the control-flow expressions are not invocations of.
There was a problem hiding this comment.
https://cplusplus.com/reference/string/string/find/
Return Value
The position of the first character of the first match.
If no matches were found, the function returns string::npos.
npos isn't magic, it's in practice just a way to say -1. find() returns npos if something isn't found, and at that point we don't take this if / exit the loop.
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 17, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#129620 (Provide a more convinient way of developing rustc on NixOS) - rust-lang#131805 (rustc_llvm: Fix flattened CLI args) - rust-lang#131818 (Enable XRay instrumentation for LoongArch Linux targets) - rust-lang#131825 (SolverDelegate add assoc type for Infcx) - rust-lang#131833 (Add `must_use` to `CommandExt::exec`) - rust-lang#131835 (Do not run test where it cannot run) - rust-lang#131844 (Add mailmap entry for kobzol) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 17, 2024
Rollup merge of rust-lang#131805 - aeubanks:flat, r=durin42 rustc_llvm: Fix flattened CLI args Fixes string manipulation errors introduced in rust-lang#130446.
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.
Fixes string manipulation errors introduced in #130446.