Rollup of 5 pull requests #110789

matthiaskrgr · 2023-04-25T04:46:51Z

Successful merges:

Break up long function in trait selection error reporting + clean up nearby code #110563 (Break up long function in trait selection error reporting + clean up nearby code)
[LLVM17] Adapt to ExplicitEmulatedTLS removal. #110755 ([LLVM17] Adapt to ExplicitEmulatedTLS removal.)
Update books #110775 (Update books)
configure.py: add flag for riscv{64,32}gc musl-root #110779 (configure.py: add flag for riscv{64,32}gc musl-root)
Revert panic oom #110782 (Revert panic oom)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

- Move blocks of code into their own functions - Replace a few function argument types with their type aliases

This patch creates an enum to replace a nested `Option`.

This reverts commit 4da05e0.

This reverts commit 4b981c2.

This reverts commit abc0660.

This reverts commit c9a6e41.

…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`.

[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

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)

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.

…manieu Revert panic oom This temporarily reverts rust-lang#109507 until rust-lang#110771 is addressed r? `@Amanieu`

matthiaskrgr · 2023-04-25T04:47:11Z

@bors r+ rollup=never p=5

bors · 2023-04-25T04:47:13Z

📌 Commit 2d72abc has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-04-25T04:58:57Z

⌛ Testing commit 2d72abc with merge ed3ddb3...

bors · 2023-04-25T07:05:42Z

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

rust-timer · 2023-04-25T07:07:11Z

📌 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

rust-timer · 2023-04-25T11:31:59Z

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.

bryangarza and others added 14 commits April 21, 2023 09:04

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

Create "AppendConstMessage" enum

55e5a1d

This patch creates an enum to replace a nested `Option`.

[LLVM17] Adapt to ExplicitEmulatedTLS removal.

047ed32

Update books

d4e81bd

configure.py: add flag for riscv{64,32}gc musl-root

d2516c1

Revert "Adjust expected result for coverage test"

653cfdb

This reverts commit 4da05e0.

Revert "Rename -Zoom=panic to -Zoom=unwind"

33253fa

This reverts commit 4b981c2.

Revert "Remove #[alloc_error_handler] from the compiler and library"

f54dbe6

This reverts commit abc0660.

Revert "Report allocation errors as panics"

23a3638

This reverts commit c9a6e41.

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`

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 added the merged-by-bors This PR was explicitly merged by bors. label Apr 25, 2023

bors merged commit ed3ddb3 into rust-lang:master Apr 25, 2023

rustbot added this to the 1.71.0 milestone Apr 25, 2023

bors mentioned this pull request Apr 25, 2023

Safe Transmute: Pass ErrorGuaranteed up to error reporting #110669

Closed

This was referenced Apr 25, 2023

format panic message only once #110721

Merged

Add tracking issue for panic_oom_payload #110731

Closed

matthiaskrgr deleted the rollup-92e764u branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests #110789

Rollup of 5 pull requests #110789

Uh oh!

matthiaskrgr commented Apr 25, 2023

Uh oh!

matthiaskrgr commented Apr 25, 2023

Uh oh!

bors commented Apr 25, 2023

Uh oh!

bors commented Apr 25, 2023

Uh oh!

bors commented Apr 25, 2023

Uh oh!

rust-timer commented Apr 25, 2023

Uh oh!

rust-timer commented Apr 25, 2023

Uh oh!

Uh oh!

Rollup of 5 pull requests #110789

Rollup of 5 pull requests #110789

Uh oh!

Conversation

matthiaskrgr commented Apr 25, 2023

Uh oh!

matthiaskrgr commented Apr 25, 2023

Uh oh!

bors commented Apr 25, 2023

Uh oh!

bors commented Apr 25, 2023

Uh oh!

bors commented Apr 25, 2023

Uh oh!

rust-timer commented Apr 25, 2023

Uh oh!

rust-timer commented Apr 25, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Uh oh!