Rollup of 6 pull requests #110821

matthiaskrgr · 2023-04-25T19:06:36Z

Successful merges:

Switch to EarlyBinder for explicit_item_bounds #110556 (Switch to EarlyBinder for explicit_item_bounds)
Add impl_tag! macro to implement Tag for tagged pointer easily #110615 (Add impl_tag! macro to implement Tag for tagged pointer easily)
Fix no_global_oom_handling build #110649 (Fix no_global_oom_handling build)
Consider polarity in new solver #110671 (Consider polarity in new solver)
Fix ICE on --print=... i/o errors #110783 (Fix ICE on --print=... i/o errors)
Updating Wake example to use new 'pin!' macro #110796 (Updating Wake example to use new 'pin!' macro)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…icit_item_bounds usages; remove bound_explicit_item_bounds query

…lyBinder; use this to simplify some EarlyBinder noise around explicit_item_bounds calls

`provide_sorted_batch` in core is incorrectly marked with `#[cfg(not(no_global_oom_handling))]` which prevents core from building with the cfg enabled. Nothing in core allocates memory including this function, so the `cfg` gate is incorrect.

…tem-bounds, r=compiler-errors Switch to `EarlyBinder` for `explicit_item_bounds` Part of the work to finish rust-lang#105779. This PR adds `EarlyBinder` to the return type of the `explicit_item_bounds` query and removes `bound_explicit_item_bounds`. r? `@compiler-errors` (hope it's okay to request you, since you reviewed rust-lang#110299 and rust-lang#110498 😃)

Add `impl_tag!` macro to implement `Tag` for tagged pointer easily r? `@Nilstrieb` This should also lifts the need to think about safety from the callers (`impl_tag!` is robust (ish, see the macro issue)) and removes the possibility of making a "weird" `Tag` impl.

… r=Mark-Simulacrum Fix no_global_oom_handling build `provide_sorted_batch` in core is incorrectly marked with `#[cfg(not(no_global_oom_handling))]` which prevents core from building with the cfg enabled. Nothing in `core` allocates memory (including this function). The `cfg` gate is incorrect. cc ``@dpaoliello`` r? ``@wesleywiser`` The cfg was added by rust-lang#107191

Consider polarity in new solver It's kinda ugly to have a polarity check in all of the builtin impls -- I guess I could consider the polarity at the top of assemble-builtin but that would require adding a polarity fn to `GoalKind`... :shrug: putting this up just so i dont forget, since it's needed to bootstrap core during coherence (this alone does not allow core to bootstrap though, additional work is needed!) r? ``@lcnr``

Fix ICE on --print=... i/o errors `rustc --print=cfg > /dev/full` **Before:** ICE (see below) **After:** exits quietly with code 1. ```console thread 'rustc' panicked at 'failed printing to stdout: No space left on device (os error 28)', library/std/src/io/stdio.rs:1019:9 stack backtrace: 0: 0x7ffa84d68f33 - std::backtrace_rs::backtrace::libunwind::trace::h527d8d64d53ade2d at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/../../backtrace/src/backtrace/libunwind.rs:93:5 1: 0x7ffa84d68f33 - std::backtrace_rs::backtrace::trace_unsynchronized::hfb55b01517dd6379 at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/../../backtrace/src/backtrace/mod.rs:66:5 2: 0x7ffa84d68f33 - std::sys_common::backtrace::_print_fmt::hd134e914eea0bd97 at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/sys_common/backtrace.rs:65:5 3: 0x7ffa84d68f33 - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::h1480db11ec399d77 at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/sys_common/backtrace.rs:44:22 4: 0x7ffa84dc9d4f - core::fmt::write::h67ec4c4171c92b26 at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/core/src/fmt/mod.rs:1247:17 5: 0x7ffa84d5bed1 - std::io::Write::write_fmt::h3b12aef0fff2463b at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/io/mod.rs:1712:15 6: 0x7ffa84d68d45 - std::sys_common::backtrace::_print::h584400135abdbd51 at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/sys_common/backtrace.rs:47:5 7: 0x7ffa84d68d45 - std::sys_common::backtrace::print::hce41d3c8bd91096b at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/sys_common/backtrace.rs:34:9 8: 0x7ffa84d6b84f - std::panicking::default_hook::{{closure}}::h2043b657a3791225 9: 0x7ffa84d6b507 - std::panicking::default_hook::h99252b8d3dd5719c at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/panicking.rs:293:9 10: 0x7ffa87fdf915 - <rustc_driver_impl[d30cd2737d9d343a]::DEFAULT_HOOK::{closure#0}::{closure#0} as core[cc19a662f3570270]::ops::function::FnOnce<(&core[cc19a662f3570270]::panic::panic_info::PanicInfo,)>>::call_once::{shim:vtable#0} 11: 0x7ffa84d6c005 - <alloc::boxed::Box<F,A> as core::ops::function::Fn<Args>>::call::h222a2b674b9f4762 at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/alloc/src/boxed.rs:1976:9 12: 0x7ffa84d6c005 - std::panicking::rust_panic_with_hook::h7f49b36bf7f8ff77 at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/panicking.rs:704:13 13: 0x7ffa84d6bd73 - std::panicking::begin_panic_handler::{{closure}}::haa23a7352589e31e at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/panicking.rs:595:13 14: 0x7ffa84d69376 - std::sys_common::backtrace::__rust_end_short_backtrace::h3d0cf6e3c96e3fe9 at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/sys_common/backtrace.rs:150:18 15: 0x7ffa84d6ba72 - rust_begin_unwind at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/panicking.rs:584:5 16: 0x7ffa84dc5fe3 - core::panicking::panic_fmt::hf4b4ea11e3fdb110 at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/core/src/panicking.rs:67:14 17: 0x7ffa84d5aa07 - std::io::stdio::print_to::h55760b9ede306280 at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/io/stdio.rs:1019:9 18: 0x7ffa84d5aa07 - std::io::stdio::_print::h93deb6099db33eab at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/io/stdio.rs:1095:5 19: 0x7ffa871e163b - rustc_driver_impl[d30cd2737d9d343a]::print_crate_info 20: 0x7ffa87fb8e01 - rustc_span[9551eaa044f53f4f]::set_source_map::<(), rustc_interface[c2b70c9b1dae0906]::interface::run_compiler<(), rustc_driver_impl[d30cd2737d9d343a]::run_compiler::{closure#0}>::{closure#0}::{closure#0}> 21: 0x7ffa87fb6d59 - std[71a32ca0600a6a04]::sys_common::backtrace::__rust_begin_short_backtrace::<rustc_interface[c2b70c9b1dae0906]::util::run_in_thread_pool_with_globals<rustc_interface[c2b70c9b1dae0906]::interface::run_compiler<(), rustc_driver_impl[d30cd2737d9d343a]::run_compiler::{closure#0}>::{closure#0}, ()>::{closure#0}::{closure#0}, ()> 22: 0x7ffa87fe25b4 - std[71a32ca0600a6a04]::panicking::try::<(), core[cc19a662f3570270]::panic::unwind_safe::AssertUnwindSafe<<std[71a32ca0600a6a04]::thread::Builder>::spawn_unchecked_<rustc_interface[c2b70c9b1dae0906]::util::run_in_thread_pool_with_globals<rustc_interface[c2b70c9b1dae0906]::interface::run_compiler<(), rustc_driver_impl[d30cd2737d9d343a]::run_compiler::{closure#0}>::{closure#0}, ()>::{closure#0}::{closure#0}, ()>::{closure#1}::{closure#0}>> 23: 0x7ffa87fb0cf1 - <<std[71a32ca0600a6a04]::thread::Builder>::spawn_unchecked_<rustc_interface[c2b70c9b1dae0906]::util::run_in_thread_pool_with_globals<rustc_interface[c2b70c9b1dae0906]::interface::run_compiler<(), rustc_driver_impl[d30cd2737d9d343a]::run_compiler::{closure#0}>::{closure#0}, ()>::{closure#0}::{closure#0}, ()>::{closure#1} as core[cc19a662f3570270]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0} 24: 0x7ffa84d763e5 - <alloc::boxed::Box<F,A> as core::ops::function::FnOnce<Args>>::call_once::hf15d802f31f86225 at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/alloc/src/boxed.rs:1962:9 25: 0x7ffa84d763e5 - <alloc::boxed::Box<F,A> as core::ops::function::FnOnce<Args>>::call_once::hac564355b46c52d6 at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/alloc/src/boxed.rs:1962:9 26: 0x7ffa84d763e5 - std::sys::unix::thread::Thread::new::thread_start::h86fb3aedb7811f07 at /rustc/7f94b314cead7059a71a265a8b64905ef2511796/library/std/src/sys/unix/thread.rs:108:17 27: 0x7ffa84a94b43 - start_thread at ./nptl/pthread_create.c:442:8 28: 0x7ffa84b26a00 - clone3 at ./misc/../sysdeps/unix/sysv/linux/x86_64/clone3.S:81 29: 0x0 - <unknown> error: the compiler unexpectedly panicked. this is a bug. note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md note: rustc 1.71.0-nightly (7f94b31 2023-04-23) running on x86_64-unknown-linux-gnu query stack during panic: end of query stack ```

…lacrum Updating Wake example to use new 'pin!' macro Closes: rust-lang#109965 I have already had this reviewed and approved here: rust-lang#110026 . But because I had some git issues and chose the "nuke it" option as my solution it didn't get merged. I nuked it too quickly. I am sorry for trouble of reviewing twice.

matthiaskrgr · 2023-04-25T19:07:22Z

@bors r+ rollup=never p=6

bors · 2023-04-25T19:07:24Z

📌 Commit 77752a0 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-04-25T19:21:45Z

⌛ Testing commit 77752a0 with merge 458d4da...

bors · 2023-04-25T21:30:59Z

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

rust-timer · 2023-04-25T21:32:42Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#110796	e0324c35232e6d56a200622204ef9464a46e4f2b
#110783	0a28e51e6fb133bba49d638552c4d4cdfaf72e51
#110671	7136b1c78b35ebcf6b4320be8dfe62ba9c584b6a
#110649	878ccb43a5b571059913c44b2a95c66a9aa4dfa0
#110615	acae03e848cfd1fec3682686452a20f06421a8dd
#110556	fd5d8e587f360d64637501ace3219e5f64c98b63

previous master: 666fee2a5f

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-25T23:17:12Z

Finished benchmarking commit (458d4da): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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)	1.0%	[1.0%, 1.0%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Cycles

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

WaffleLapkin and others added 21 commits April 20, 2023 17:14

Add impl_tag! macro to implement Tag for tagged pointer easily

77c83c0

change usages of explicit_item_bounds to bound_explicit_item_bounds

0892a73

add EarlyBinder to output of explicit_item_bounds; replace bound_expl…

f3b279f

…icit_item_bounds usages; remove bound_explicit_item_bounds query

add subst_identity_iter and subst_identity_iter_copied methods on Ear…

e54854f

…lyBinder; use this to simplify some EarlyBinder noise around explicit_item_bounds calls

Use impl Tag for $T syntax for impl_tag!

96905d5

Remove confusing comment

7cfecf2

Simplify bits_for_tags impl

ad8c7b6

Fix no_global_oom_handling build

5731655

`provide_sorted_batch` in core is incorrectly marked with `#[cfg(not(no_global_oom_handling))]` which prevents core from building with the cfg enabled. Nothing in core allocates memory including this function, so the `cfg` gate is incorrect.

Changes from review

5a69b5d

Switch impl_tag! from explicit tags to ${index()}

2b8d27b

Consider polarity in new solver

794cb89

Negative coherence test

bb2cb89

Updating Wake example to use new 'pin!' macro

3b196fb

Fix ICE on --print=... i/o errors

040e1b6

Add #[inline] in impl_tag

bec7ce4

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 25, 2023

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 25, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 25, 2023

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

rustbot added this to the 1.71.0 milestone Apr 25, 2023

This was referenced Apr 25, 2023

test the parallel compiler #109776

Closed

rustdoc: catch and don't blow up on impl Trait cycles #110631

Merged

Make alias bounds sound in the new solver (take 2) #110673

Merged

matthiaskrgr deleted the rollup-mzxrvw7 branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests #110821

Rollup of 6 pull requests #110821

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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Rollup of 6 pull requests #110821

Rollup of 6 pull requests #110821

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: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants