test cleanup for nightly #641

workingjubilee · 2024-07-15T01:57:20Z

A collage of random bugfixes.

format! now has #[must_use]: Mark format! with must_use hint rust#127355
miri randomizes inlineable fn addrs: Miri function identity hack: account for possible inlining rust#123781
my own petard: treat &raw (const|mut) UNSAFE_STATIC implied deref as safe rust#125834
some permissive provenance warnings became louder and it's easier to just start fixing the provenance issues throughout the API than to try to wish them away, so we introduce TracePtr internally to help with this.

ChrisDenton · 2024-07-15T05:39:45Z

failures:

---- backtrace_new_should_start_with_call_site_trace stdout ----
  0: backtrace_new_should_start_with_call_site_trace

...they're the same picture???

workingjubilee · 2024-07-27T22:08:32Z

...yeah I have no idea why this is an unused_unsafe now :ferrisClueless:

            pub fn dbghelp(&self) -> *mut Dbghelp {
                unsafe {
                    ptr::addr_of_mut!(DBGHELP)
                }
            }

certainly someone didn't actually implement and merge rust-lang/rust#125834

use a few less sus casts for skip_inner_frames and use inline(never) to appease miri. miri now tries to pretend this frame may differ.

stable doesn't know yet, so just allow the lint.

This allows us to both - retain provenance throughout - describe why these are Send and Sync - progressively reduce errors by reducing the conflation of pointers

ChrisDenton

Looks good to me. ~~One nit~~ but r=me even without it.

src/dbghelp.rs

ChrisDenton · 2024-07-28T12:48:53Z

tests/concurrent-panics.rs

-    let a = thread::spawn(move || {
-        while !done2.load(SeqCst) {
-            format!("{:?}", backtrace::Backtrace::new());
+    let a = thread::spawn(move || loop {
+        if done2.load(SeqCst) {
+            break format!("{:?}", backtrace::Backtrace::new());


The new version looks right to me. Or at least I do not understand why the old version was doing that.

ChrisDenton · 2024-07-28T13:05:01Z

Ok after re-reviewing with coffee in hand, let's do this...

workingjubilee · 2024-07-28T21:51:17Z

Completely understandable. Thank you!

workingjubilee · 2024-07-30T01:39:17Z

tests/smoke.rs

-            if sp == 0 {
+            let sp = frame.sp();
+            eprintln!("sp  = {sp:p}");
+            if sp as usize == 0 {


...why didn't I just write is_null() lol

eugh, I really shouldn't have reviewed that day even with a dose of caffeine

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [backtrace](https://redirect.github.com/rust-lang/backtrace-rs) | dependencies | patch | `0.3.73` -> `0.3.74` | | [backtrace](https://redirect.github.com/rust-lang/backtrace-rs) | dev-dependencies | patch | `0.3.73` -> `0.3.74` | --- ### Release Notes <details> <summary>rust-lang/backtrace-rs (backtrace)</summary> ### [`v0.3.74`](https://redirect.github.com/rust-lang/backtrace-rs/releases/tag/0.3.74) [Compare Source](https://redirect.github.com/rust-lang/backtrace-rs/compare/0.3.73...0.3.74) #### What's Changed - QNX Neutrino 7.0 support, thanks to [@nyurik](https://redirect.github.com/nyurik) in [https://github.com/rust-lang/backtrace-rs/pull/648](https://redirect.github.com/rust-lang/backtrace-rs/pull/648) - Cleaned up our Android support. This should massively improve backtraces for ones with the API level sufficient to ship with libunwind, etc. Unfortunately, it comes at the cost of dropping support for older ones! Thanks to [@fengys](https://redirect.github.com/fengys) in [https://github.com/rust-lang/backtrace-rs/pull/656](https://redirect.github.com/rust-lang/backtrace-rs/pull/656) - Made PrintFmt, which was using the `Enum::__NonExhaustiveVariant` pattern, use `#[non_exhaustive]` for real. Don't @ me if you were matching on that! Thanks to [@nyurik](https://redirect.github.com/nyurik) in [https://github.com/rust-lang/backtrace-rs/pull/651](https://redirect.github.com/rust-lang/backtrace-rs/pull/651) - Massively cleaned up the windows code! We moved from winapi to windows-sys with windows-targets thanks to [@CraftSpider](https://redirect.github.com/CraftSpider) and [@ChrisDenton](https://redirect.github.com/ChrisDenton) in - Don't cast HANDLE to usize and back by [@CraftSpider](https://redirect.github.com/CraftSpider) in [https://github.com/rust-lang/backtrace-rs/pull/635](https://redirect.github.com/rust-lang/backtrace-rs/pull/635) - Switch from `winapi` to `windows-sys` by [@CraftSpider](https://redirect.github.com/CraftSpider) in [https://github.com/rust-lang/backtrace-rs/pull/641](https://redirect.github.com/rust-lang/backtrace-rs/pull/641) - Update windows bindings and use windows-targets by [@ChrisDenton](https://redirect.github.com/ChrisDenton) in [https://github.com/rust-lang/backtrace-rs/pull/653](https://redirect.github.com/rust-lang/backtrace-rs/pull/653) - A bunch of updated dependencies. Thanks [@djc](https://redirect.github.com/djc) and [@khuey](https://redirect.github.com/khuey)! - Sorry if you were testing this code in miri! It started yelling about sussy casts. A lot. We did a bunch of internal cleanups that should make it quiet down, thanks to [@workingjubilee](https://redirect.github.com/workingjubilee) in [https://github.com/rust-lang/backtrace-rs/pull/641](https://redirect.github.com/rust-lang/backtrace-rs/pull/641) - Uhhh we had to tweak `dl_iterate_phdr` in [https://github.com/rust-lang/backtrace-rs/pull/660](https://redirect.github.com/rust-lang/backtrace-rs/pull/660) after Android revealed it was... kind of unsound actually and not doing things like checking for null pointers before making slices! WHOOPS! Thanks to [@saethlin](https://redirect.github.com/saethlin) for implementing detection for precisely that in rustc! It's really hard to find soundness issues in inherited codebases like this one... #### New Contributors - [@CraftSpider](https://redirect.github.com/CraftSpider) made their first contribution in [https://github.com/rust-lang/backtrace-rs/pull/635](https://redirect.github.com/rust-lang/backtrace-rs/pull/635) - [@fengys1996](https://redirect.github.com/fengys1996) made their first contribution in [https://github.com/rust-lang/backtrace-rs/pull/656](https://redirect.github.com/rust-lang/backtrace-rs/pull/656) - [@djc](https://redirect.github.com/djc) made their first contribution in [https://github.com/rust-lang/backtrace-rs/pull/657](https://redirect.github.com/rust-lang/backtrace-rs/pull/657) **Full Changelog**: rust-lang/backtrace-rs@0.3.73...0.3.74 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 3pm on Wednesday" in timezone America/New_York, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- Release Notes: - N/A  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

workingjubilee force-pushed the appease-miri branch 2 times, most recently from e70fddd to ae89807 Compare July 15, 2024 04:07

workingjubilee changed the title ~~Try to fix the miri CI~~ test cleanup for miri and windows Jul 27, 2024

workingjubilee changed the title ~~test cleanup for miri and windows~~ test cleanup for miri Jul 27, 2024

workingjubilee mentioned this pull request Jul 27, 2024

Switch from winapi to windows-sys #634

Merged

workingjubilee force-pushed the appease-miri branch from 2275e1b to 5d1de88 Compare July 27, 2024 22:02

workingjubilee force-pushed the appease-miri branch 2 times, most recently from 6c6b1cb to ddcbd97 Compare July 27, 2024 22:16

workingjubilee added 3 commits July 27, 2024 15:20

tell miri to stop fake-inlining test fn

6ab8f3d

use a few less sus casts for skip_inner_frames and use inline(never) to appease miri. miri now tries to pretend this frame may differ.

Format trace in test

02d1221

addr_of_mut!(STATIC_MUT) is safe on nightly

db9f528

stable doesn't know yet, so just allow the lint.

workingjubilee force-pushed the appease-miri branch 2 times, most recently from 1d56ec5 to b64e37f Compare July 27, 2024 22:33

workingjubilee added 2 commits July 27, 2024 15:52

fix sus provenance in tests/smoke.rs for miri

bc6ba8e

Introduce TracePtr for Send and Syncness

dfa7d9b

This allows us to both - retain provenance throughout - describe why these are Send and Sync - progressively reduce errors by reducing the conflation of pointers

workingjubilee force-pushed the appease-miri branch from c3ac2a5 to dfa7d9b Compare July 27, 2024 22:53

workingjubilee requested a review from ChrisDenton July 27, 2024 22:53

workingjubilee mentioned this pull request Jul 27, 2024

Format trace in test #642

Closed

workingjubilee changed the title ~~test cleanup for miri~~ test cleanup for nightly Jul 27, 2024

ChrisDenton approved these changes Jul 28, 2024

View reviewed changes

ChrisDenton merged commit 3ad7f66 into rust-lang:master Jul 28, 2024
41 checks passed

workingjubilee deleted the appease-miri branch July 28, 2024 21:51

workingjubilee commented Jul 30, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test cleanup for nightly #641

test cleanup for nightly #641

workingjubilee commented Jul 15, 2024 •

edited

Loading

ChrisDenton commented Jul 15, 2024

workingjubilee commented Jul 27, 2024

ChrisDenton left a comment •

edited

Loading

ChrisDenton Jul 28, 2024

ChrisDenton commented Jul 28, 2024

workingjubilee commented Jul 28, 2024

workingjubilee Jul 30, 2024

ChrisDenton Jul 30, 2024

test cleanup for nightly #641

test cleanup for nightly #641

Conversation

workingjubilee commented Jul 15, 2024 • edited Loading

ChrisDenton commented Jul 15, 2024

workingjubilee commented Jul 27, 2024

ChrisDenton left a comment • edited Loading

Choose a reason for hiding this comment

ChrisDenton Jul 28, 2024

Choose a reason for hiding this comment

ChrisDenton commented Jul 28, 2024

workingjubilee commented Jul 28, 2024

workingjubilee Jul 30, 2024

Choose a reason for hiding this comment

ChrisDenton Jul 30, 2024

Choose a reason for hiding this comment

workingjubilee commented Jul 15, 2024 •

edited

Loading

ChrisDenton left a comment •

edited

Loading