Support -Z merge-functions with gcc and add stack-protector asm tests - #163274
Conversation
|
Some changes occurred in src/tools/compiletest cc @jieyouxu
|
rustbot
added
A-compiletest
ea4b38c to
6ea4c5d
Compare
6ea4c5d to
2e0497b
Compare
|
Looks good to me, thanks! Let's wait for @antoyo's confirmation too. |
|
Do you care enough about investigating the exact reason for the split in local_large_var_cloned behavior? I don't feel its important enough to be in scope, though maybe worth further investigation later on since we may be missing an attribute on the argument. |
2e0497b to
374d72a
Compare
No, I think we're good here.
I'm not sure I understand: do you mean cg_gcc has the correct behavior while |
374d72a to
9c5b3e1
Compare
There are 2 behaviors, both are basically fine. cg_gcc, cg_llvm, clang++ do one thing, g++ does the other. Pushed a version with the comment slightly edited. |
0217cc1 to
14e759e
Compare
|
@GuillaumeGomez so bjorn approved, can you r+ this? |
|
I don't see a Bjorn's approval. Gonna let them do the r+ to ensure it's all good for everyone. |
There was a problem hiding this comment.
What caused this change by the way?
There was a problem hiding this comment.
I don't know, I run x.py test --bless and the change happened
There was a problem hiding this comment.
Maybe we just don't check it in CI?
There was a problem hiding this comment.
I have no idea, removed the test change since it doesn't have anything to do with the PR. Maybe its gcc-related? (though why?)
|
LGTM, though the above test change is a bit weird. |
This is a part of the stack-protector work. Adding support for merge-functions is not strictly needed, but it does prevent breakage if the GCC function merging logic changes. Not adding tests for -Z merge-functions since I don't see any such tests for the LLVM side of it.
|
Lets see what happens without the snap change + after a rebase |
14e759e to
c6dc511
Compare
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
|
You OK with the version without the incidental snapshot change if it passes CI? |
|
@bors r=GuillaumeGomez,bjorn3 |
|
Thanks! |
rust-bors
Bot
added
S-waiting-on-bors
… r=GuillaumeGomez,bjorn3 Support -Z merge-functions with gcc and add stack-protector asm tests This is a part of the stack-protector work. Adding support for merge-functions is not strictly needed, but it does prevent breakage if the GCC function merging logic changes. Not adding tests for -Z merge-functions since I don't see any such tests for the LLVM side of it. No lines in this PR were written by LLM, though I did use it for help in reviewing and reading documentation.
…uwer Rollup of 7 pull requests Successful merges: - #162493 (Add support for -Zsanitizer-cfi-minimal-runtime) - #163133 ([rustdoc] Fix invalid jump to def link when `#[rustc_allow_incoherent_impl]` is involved) - #163215 (Fix suggestion for Option to bool with proper precedence handling) - #163266 (More deferred liveness cleanups) - #163274 (Support -Z merge-functions with gcc and add stack-protector asm tests) - #163312 (Add rustdoc regression test for glob import of a crate that re-exports) - #163332 (Add some docs to `Global`)
Rollup of 13 pull requests Successful merges: - #160695 (Detect bad number of generics caused by bad derive) - #162883 (No longer auto-inline `f16` and `f128` on well-supported platforms) - #163133 ([rustdoc] Fix invalid jump to def link when `#[rustc_allow_incoherent_impl]` is involved) - #163215 (Fix suggestion for Option to bool with proper precedence handling) - #163266 (More deferred liveness cleanups) - #163274 (Support -Z merge-functions with gcc and add stack-protector asm tests) - #163290 (Merge `ForceWarning`/`Allow`/`Expect` into `Warning`) - #163298 (Don't emit sugg for pub-reexport extern std) - #163312 (Add rustdoc regression test for glob import of a crate that re-exports) - #163357 (Borrowck cleanups part trois) - #161710 (Stabilize `mem::conjure_zst`) - #163332 (Add some docs to `Global`) - #163362 (simplify ndk compiler test)
Rollup merge of #163274 - arielb1:stack-protector-tests-gcc, r=GuillaumeGomez,bjorn3 Support -Z merge-functions with gcc and add stack-protector asm tests This is a part of the stack-protector work. Adding support for merge-functions is not strictly needed, but it does prevent breakage if the GCC function merging logic changes. Not adding tests for -Z merge-functions since I don't see any such tests for the LLVM side of it. No lines in this PR were written by LLM, though I did use it for help in reviewing and reading documentation.
5 participants
View all comments
This is a part of the stack-protector work.
Adding support for merge-functions is not strictly needed, but it does prevent breakage if the GCC function merging logic changes.
Not adding tests for -Z merge-functions since I don't see any such tests for the LLVM side of it.
No lines in this PR were written by LLM, though I did use it for help in reviewing and reading documentation.