Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 5 pull requests #110789

Merged
merged 14 commits into from
Apr 25, 2023
Merged

Rollup of 5 pull requests #110789

merged 14 commits into from
Apr 25, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

bryangarza and others added 14 commits April 21, 2023 09:04
@bryangarza
Break up long function in trait selection error reporting
d0d40d2 
- Move blocks of code into their own functions
- Replace a few function argument types with their type aliases
@bryangarza
Create "AppendConstMessage" enum
55e5a1d 
This patch creates an enum to replace a nested `Option`.
@TimNN
[LLVM17] Adapt to ExplicitEmulatedTLS removal.
047ed32
@rustbot
Update books
d4e81bd
@jchzhou
configure.py: add flag for riscv{64,32}gc musl-root
d2516c1
@matthiaskrgr
Revert "Adjust expected result for coverage test"
653cfdb 
This reverts commit 4da05e0.
@matthiaskrgr
Revert "Rename -Zoom=panic to -Zoom=unwind"
33253fa 
This reverts commit 4b981c2.
@matthiaskrgr
Revert "Remove #[alloc_error_handler] from the compiler and library"
f54dbe6 
This reverts commit abc0660.
@matthiaskrgr
Revert "Report allocation errors as panics"
23a3638 
This reverts commit c9a6e41.
@matthiaskrgr
Rollup merge of rust-lang#110563 - bryangarza:refactor-trait-selectio…
5f33a8c 
…n-error-reporting, r=compiler-errors

Break up long function in trait selection error reporting + clean up nearby code

- Move blocks of code into their own functions
- Replace a few function argument types with their type aliases
- Create "AppendConstMessage" enum to replace a nested `Option`.
@matthiaskrgr
Rollup merge of rust-lang#110755 - TimNN:exp-tls, r=durin42
7e143e9 
[LLVM17] Adapt to `ExplicitEmulatedTLS` removal.

llvm/llvm-project@0d333bf removed the `ExplicitEmulatedTLS` field from `TargetOptions`.

Before that commit, `TargetMachine::useEmulatedTLS()` fell back to `TheTriple.hasDefaultEmulatedTLS()` if `ExplicitEmulatedTLS` was `false`/unset.

After that commit, `TargetMachine::useEmulatedTLS()` directly returns `Options.EmulatedTLS`, and the fallback to `TheTriple.hasDefaultEmulatedTLS()` was moved to `InitTargetOptionsFromCodeGenFlags`.

Since `rustc` does not use `InitTargetOptionsFromCodeGenFlags` (AFAICT) and instead manually builds `TargetOptions`, this PR initializes `EmulatedTLS` to `TheTriple.hasDefaultEmulatedTLS()`.

(I'm not really familiar with the details of what this option does, or if there are any tests that depend on `hasDefaultEmulatedTLS` being used correctly, so this PR is mostly untested (it does compile against LLVM17, though)).

`@rustbot` label: +llvm-main
@matthiaskrgr
Rollup merge of rust-lang#110775 - rustbot:docs-update, r=ehuss
02196bd 
Update books

## rust-lang/book

1 commits in c06006157b14b3d47b5c716fc392b77f3b2e21ce..8fa6b854d515506d825390fe0d817f5ef0c89350
2023-04-13 00:05:30 UTC to 2023-04-13 00:05:30 UTC

- Update copyright in LICENSE-APACHE (rust-lang/book#3611)

## rust-embedded/book

1 commits in 701d1551429da4cb609082c0ac99df569e336710..897fcf566f16bf87bf37199bdddec1801fd00532
2023-04-20 13:24:51 UTC to 2023-04-20 13:24:51 UTC

- typos (rust-embedded/book#347)

## rust-lang/rustc-dev-guide

5 commits in 6337ed1..2a5eb92
2023-04-22 11:50:11 UTC to 2023-04-16 11:30:24 UTC

- Add docs for compare-output-lines-by-subset flag (rust-lang/rustc-dev-guide#1677)
- fix typo (rust-lang/rustc-dev-guide#1674)
- Fix links in how-to-build-and-run.md (rust-lang/rustc-dev-guide#1679)
- docs: document new `suggest-tests` tool (rust-lang/rustc-dev-guide#1660)
- Fix extra slash (rust-lang/rustc-dev-guide#1673)
@matthiaskrgr
Rollup merge of rust-lang#110779 - jchzhou:patch, r=albertlarsan68
2212354 
configure.py: add flag for riscv{64,32}gc musl-root

Add the corresponding flag for detecting `--musl-root-riscv64gc` and `--musl-root-riscv32gc` with ./configure, which is beneficial for downstream Linux distros to create the rust package with the same "recipe" from other architectures.
@matthiaskrgr
Rollup merge of rust-lang#110782 - matthiaskrgr:revert_panic_oom, r=A…
2d72abc 
…manieu

Revert panic oom

This temporarily reverts rust-lang#109507 until rust-lang#110771 is addressed

r? `@Amanieu`
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 25, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 25, 2023

📌 Commit 2d72abc has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 25, 2023
@bors
Copy link
Contributor

bors commented Apr 25, 2023

⌛ Testing commit 2d72abc with merge ed3ddb3...

@bors
Copy link
Contributor

bors commented Apr 25, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing ed3ddb3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 25, 2023
@bors bors merged commit ed3ddb3 into rust-lang:master Apr 25, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 25, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#110782 6d3b7b9c970604075f0cc5c312daa0f17065eb19
#110779 ba7dc1bb6d909b6f68116854c6e29ff7595a3b2d
#110775 269537a202268c2b73b2856459f04887317d8602
#110755 792049eec3a695c521bde1dae76b320598f5adc6
#110563 32a4baaf3635f93fede1360a8ad1a62e73dad9fd

previous master: f6830a2129

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@bors bors mentioned this pull request Apr 25, 2023
Closed
This was referenced Apr 25, 2023
Merged
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ed3ddb3): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 0.4% [0.3%, 0.4%] 5
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 4.5% [3.2%, 5.8%] 2
Improvements ✅
(primary)		 -0.4% [-0.4%, -0.4%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.4% [-0.4%, -0.4%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

@matthiaskrgr matthiaskrgr deleted the rollup-92e764u branch March 16, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.71.0
Development

Successfully merging this pull request may close these issues.
7 participants
@matthiaskrgr @bors @rust-timer @rustbot @bryangarza @TimNN @jchzhou