Rollup of 4 pull requests#157158
Closed
JonathanBrouwer wants to merge 10 commits into
Closed
Conversation
- the test was ported from this commit: llvm/llvm-project@3009211
This reverts commit 29e9273
Make hint::cold_path #[cold] so that it works even if the MIR inliner can't inline it This fixes rust-lang#156859 because the branch weight metadata is actually keyed off seeing a `#[cold]` function call in an arm. We don't need the intrinsic, any `#[cold]` function will do. So if the hint wrapper itself is made `#[cold]`, we will still get the desired effect, and LLVM will clean up the call to an empty function when optimizations are enabled.
…acro-expansion, r=Urgau [rustdoc] Fix foreign items macro expansion Fixes rust-lang#156486. The ICE was coming from ast pretty printing not handling `...` (C var args). To handle that, I added a `CVarArgs` variants for all `PatKind` enums. Second part (and second commits) was to correctly handle foreign items in rustdoc. r? @Urgau
…zelmann Revert "drop derive helpers during ast lowering" Fixes rust-lang#157107 By undoing commit rust-lang@29e9273 from rust-lang#153540 cc @scrabsha @jdonszelmann
…ofiling-switch, r=folkertdev Rename `-Zdebuginfo-for-profiling` switch The PR was raised from this [comment](rust-lang#155942 (comment)) from another stabilization PR: rust-lang#155942 I renamed `-Zdebug-info-for-profiling` into `-Zdebuginfo-for-profiling` before stabilization to be consistent with other `debuginfo`-related Rustc flags like `-C split-debuginfo` and `-C debuginfo`. One important note is that Clang has the [flag](https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fdebug-info-for-profiling) under `-fdebug-info-for-profiling`. I decided that consistency with other Rustc flags is more important here than to be consistent with Clang. r? folkertdev (as was proposed [here](rust-lang#155942 (comment)))
rustbot
added
A-attributes
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
rust-bors
Bot
added
S-waiting-on-author
Contributor
|
This pull request was unapproved due to being closed. |
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
4 participants
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.
Successful merges:
-Zdebuginfo-for-profilingswitch #156887 (Rename-Zdebuginfo-for-profilingswitch)r? @ghost
Create a similar rollup