Commit graph

9904 commits

Author SHA1 Message Date
Ralf Jung
4b955f14db Preparing for merge from rustc 2024-03-06 19:40:31 +01:00
bors
033c1e00b0 Auto merge of #3340 - RalfJung:no-disable-abi-check, r=oli-obk
remove the ability to disable ABI checking

This got deprecated in https://github.com/rust-lang/miri/pull/3071, about half a year ago.

`@rust-lang/miri` I think it's fine to remove this now.
2024-03-06 07:37:33 +00:00
dependabot[bot]
5294dd8afd
Bump mio from 0.8.10 to 0.8.11 in /test_dependencies
Bumps [mio](https://github.com/tokio-rs/mio) from 0.8.10 to 0.8.11.
- [Release notes](https://github.com/tokio-rs/mio/releases)
- [Changelog](https://github.com/tokio-rs/mio/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tokio-rs/mio/compare/v0.8.10...v0.8.11)

---
updated-dependencies:
- dependency-name: mio
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-04 21:30:41 +00:00
bors
65ec028455 Auto merge of #3358 - RalfJung:zzz, r=RalfJung
give macOS even more time to sleep
2024-03-04 18:45:12 +00:00
Ralf Jung
2b40181cb3 give macOS even more time to sleep 2024-03-04 19:11:09 +01:00
bors
790287a08f Auto merge of #3357 - RalfJung:imports, r=RalfJung
reorder rustc crate imports a bit
2024-03-04 17:57:38 +00:00
bors
4fdb2152d9 Auto merge of #3356 - RalfJung:typo, r=RalfJung
Conjob → Cronjob

Same as https://github.com/rust-lang/miri-test-libstd/pull/44
2024-03-04 16:08:52 +00:00
Ralf Jung
45d955edb0 reorder rustc crate imports a bit 2024-03-04 16:23:25 +01:00
Ralf Jung
a477cf45ff Conjob → Cronjob 2024-03-04 16:22:30 +01:00
Ben Kimock
75f6694ce8 Use cargo miri clean in build-all-targets.sh 2024-03-04 10:13:49 -05:00
Ralf Jung
974446eb92 we properly rebuild the cache now when MIRI_LIB_SRC contents change 2024-03-04 15:07:35 +01:00
bors
e87f82578d Auto merge of #3351 - RalfJung:diagnostic-dedup-considered-harmful, r=RalfJung
disable diagnostic deduplication

`@oli-obk` is there a better way to do this? Ideally we'd only set this when interpretation starts but the value in the compiler session seems to be immutable. I assume people will do `cargo check` before `cargo miri` so hopefully this won't lead to too much confusion.

Fixes https://github.com/rust-lang/miri/issues/3350
2024-03-04 09:21:33 +00:00
bors
ede97c6510 Auto merge of #3339 - RalfJung:remove-old-flags, r=saethlin
remove some flags that haven't had an effect in a while

`@rust-lang/miri` any objections to this?
2024-03-04 08:34:11 +00:00
Ralf Jung
f70feaf604 linux-futex test: add comment 2024-03-04 09:34:07 +01:00
Ralf Jung
d5f31bda4f implement manual deduplication for isolation-error=warn-nobacktrace 2024-03-04 09:34:07 +01:00
Ralf Jung
fbafd36333 disable diagnostic deduplication 2024-03-04 09:34:07 +01:00
bors
f47732b55e Auto merge of #3330 - RossSmyth:win-fmt, r=RalfJung
Fix .\miri fmt on Windows

This allows .\miri fmt to work on Windows. Closes #3317.

To reiterate, the problem with using `miri fmt` on Windows is that the CLI arguments to rustfmt are too long. Currently over 65,000 characters are used in the call to rustfmt, [which is incompatible with Windows](https://devblogs.microsoft.com/oldnewthing/20031210-00/?p=41553) as it is limited to (2^15 - 1) for all arguments plus all env vars.

Two things are done do get around this limit:

1. Call out to cargo-fmt for the crates that exist.
2. Batch rustfmt calls by length

Another alternative would be to just use rustfmt for everything and don't use cargo-fmt for the crates.

I don't know how much you guys may care about `miri fmt` time to run. I don't know the diff as it did not work before on my computer.

[I have another branch that solves this, but in a less permanent way](RossSmyth/miri/tree/windows-fmt). That was my initial attempt, and I learned that even with cargo-fmt and relative paths, the rustfmt call still has 27k characters. This is closer to the limit than I expected, so it would not be a permanent solution. So I went back to absolute paths & batching.
2024-03-03 14:02:57 +00:00
Ralf Jung
83e2e2d89d
nits and typos 2024-03-03 15:00:47 +01:00
Ralf Jung
983c2c59c9 do not rely on tracing's scope exit logging, it is wrong 2024-03-03 13:29:14 +01:00
Ralf Jung
3041c78c9c log when we change the active thread 2024-03-03 13:11:52 +01:00
Ralf Jung
cfc10f0aab fix MIRI_LOG=info not setting the level for miri itself 2024-03-03 12:50:55 +01:00
bors
639fab7f9a Auto merge of #3345 - RalfJung:win-get-thread-name, r=RalfJung
Windows: support getting the thread name

Also organize the thread name tests a bit.
2024-03-03 10:32:43 +00:00
Ralf Jung
c72b48778d Windows: support getting the thread name 2024-03-03 10:43:44 +01:00
Ralf Jung
931e45389a fix wording of alloc access tracking message 2024-03-03 10:27:24 +01:00
Ralf Jung
7f485fc923 readme 2024-03-03 10:12:19 +01:00
Ralf Jung
8deb651603 move thread-panic tests to their own file; test getting the thread name 2024-03-03 09:00:38 +01:00
Ross Smyth
32643dc853 Fix .\miri fmt on Windows 2024-03-02 19:45:54 -05:00
Ralf Jung
21527d23d2 Tree Borrows: print where the forbidden access happens; make tag tracking less verbose 2024-03-02 21:14:58 +01:00
Ralf Jung
c1a5906d54 remove the ability to disable ABI checking 2024-03-02 20:08:14 +01:00
Ralf Jung
fe545d62db add option to track all read/write accesses to tracked allocations 2024-03-02 19:06:43 +01:00
Ralf Jung
fe9dede3e2 print thread name in miri error backtraces 2024-03-02 17:56:56 +01:00
Ralf Jung
81fed2f200 remove some flags that haven't had an effect in a while 2024-03-02 16:41:29 +01:00
Ralf Jung
2a376ceb8d add regression test 2024-02-29 19:45:14 +01:00
Ralf Jung
70758a788b Merge from rustc 2024-02-29 19:40:52 +01:00
Ralf Jung
96edeb8989 Preparing for merge from rustc 2024-02-29 19:40:27 +01:00
Guillaume Gomez
0e9f02d6fa
Rollup merge of #121783 - nnethercote:emitter-cleanups, r=oli-obk
Emitter cleanups

Some cleanups I made when reading emitter code. In particular, `HumanEmitter` and `JsonEmitter` have gone from three constructors to one.

r? `@oli-obk`
2024-02-29 17:08:38 +01:00
Guillaume Gomez
a5945b5d8d
Rollup merge of #121669 - nnethercote:count-stashed-errs-again, r=estebank
Count stashed errors again

Stashed diagnostics are such a pain. Their "might be emitted, might not" semantics messes with lots of things.

#120828 and #121206 made some big changes to how they work, improving some things, but still leaving some problems, as seen by the issues caused by #121206. This PR aims to fix all of them by restricting them in a way that eliminates the "might be emitted, might not" semantics while still allowing 98% of their benefit. Details in the individual commit logs.

r? `@oli-obk`
2024-02-29 17:08:38 +01:00
Nicholas Nethercote
067d7c3d00 Inline and remove HumanEmitter::stderr.
Because `HumanEmitter::new` is enough, in conjunction with the (renamed)
`stderr_destination` function.
2024-02-29 17:50:23 +11:00
Nicholas Nethercote
880c1c585f Rename DiagCtxt::with_emitter as DiagCtxt::new.
Because it's now the only constructor.
2024-02-29 16:30:12 +11:00
The Miri Conjob Bot
1b41d791f9 Merge from rustc 2024-02-29 05:02:18 +00:00
The Miri Conjob Bot
f43c07c037 Preparing for merge from rustc 2024-02-29 04:55:07 +00:00
Nicholas Nethercote
82961c0abc Reinstate emit_stashed_diagnostics in DiagCtxtInner::drop.
I removed it in #121206 because I thought thought it wasn't necessary.
But then I had to add an `emit_stashed_diagnostics` call elsewhere in
rustfmt to avoid the assertion failure (which took two attempts to get
right, #121487 and #121615), and now there's an assertion failure in
clippy as well (https://github.com/rust-lang/rust-clippy/issues/12364).

So this commit just reinstates the call in `DiagCtxtInner::drop`. It
also reverts the rustfmt changes from #121487 and #121615, though it
keeps the tests added for those PRs.
2024-02-29 11:08:29 +11:00
Nicholas Nethercote
9aff357e53 Stop miri if delayed bugs are present.
Seems wise, since it shouldn't proceed in that case.
2024-02-29 11:08:29 +11:00
Nicholas Nethercote
260ae70140 Overhaul how stashed diagnostics work, again.
Stashed errors used to be counted as errors, but could then be
cancelled, leading to `ErrorGuaranteed` soundness holes. #120828 changed
that, closing the soundness hole. But it introduced other difficulties
because you sometimes have to account for pending stashed errors when
making decisions about whether errors have occured/will occur and it's
easy to overlook these.

This commit aims for a middle ground.
- Stashed errors (not warnings) are counted immediately as emitted
  errors, avoiding the possibility of forgetting to consider them.
- The ability to cancel (or downgrade) stashed errors is eliminated, by
  disallowing the use of `steal_diagnostic` with errors, and introducing
  the more restrictive methods `try_steal_{modify,replace}_and_emit_err`
  that can be used instead.

Other things:
- `DiagnosticBuilder::stash` and `DiagCtxt::stash_diagnostic` now both
  return `Option<ErrorGuaranteed>`, which enables the removal of two
  `delayed_bug` calls and one `Ty::new_error_with_message` call. This is
  possible because we store error guarantees in
  `DiagCtxt::stashed_diagnostics`.
- Storing the guarantees also saves us having to maintain a counter.
- Calls to the `stashed_err_count` method are no longer necessary
  alongside calls to `has_errors`, which is a nice simplification, and
  eliminates two more `span_delayed_bug` calls and one FIXME comment.
- Tests are added for three of the four fixed PRs mentioned below.
- `issue-121108.rs`'s output improved slightly, omitting a non-useful
  error message.

Fixes #121451.
Fixes #121477.
Fixes #121504.
Fixes #121508.
2024-02-29 11:08:27 +11:00
Matthias Krüger
686a4b1c17
Rollup merge of #121724 - nnethercote:LitKind-Err-for-floats, r=fmease
Use `LitKind::Err` for malformed floats

#121120 changed `StringReader::cook_lexer_literal` to return `LitKind::Err` for malformed integer literals. This commit does the same for float literals, for consistency.

r? ``@fmease``
2024-02-29 00:17:00 +01:00
bors
c475e2303b Auto merge of #121489 - nnethercote:diag-renaming, r=davidtwco
Diagnostic renaming

Renaming various diagnostic types from `Diagnostic*` to `Diag*`. Part of https://github.com/rust-lang/compiler-team/issues/722. There are more to do but this is enough for one PR.

r? `@davidtwco`
2024-02-28 20:39:38 +00:00
bors
bf9c7a64ad Auto merge of #121741 - GuillaumeGomez:rollup-msrsrnk, r=GuillaumeGomez
Rollup of 12 pull requests

Successful merges:

 - #120051 (Add `display` method to `OsStr`)
 - #121226 (Fix issues in suggesting importing extern crate paths)
 - #121423 (Remove the `UntranslatableDiagnosticTrivial` lint.)
 - #121527 (unix_sigpipe: Simple fixes and improvements in tests)
 - #121572 (Add test case for primitive links in alias js)
 - #121661 (Changing some attributes to only_local.)
 - #121680 (Fix link generation for foreign macro in jump to definition feature)
 - #121686 (Adjust printing for RPITITs)
 - #121691 (handle unavailable creation time as `io::ErrorKind::Unsupported`)
 - #121695 (Split rustc_type_ir to avoid rustc_ast from depending on it)
 - #121698 (CFI: Fix typo in test file names)
 - #121702 (Process alias-relate obligations in CoerceUnsized loop)

r? `@ghost`
`@rustbot` modify labels: rollup
2024-02-28 17:30:25 +00:00
Nicholas Nethercote
951f2d9ae2 Use LitKind::Err for floats with empty exponents.
This prevents a follow-up type error in a test, which seems fine.
2024-02-28 20:59:27 +11:00
Ralf Jung
a676afafa5 remove a wrong bitwise negation 2024-02-28 07:43:49 +01:00
Nicholas Nethercote
5e29e26b96 Remove the UntranslatableDiagnosticTrivial lint.
It's a specialized form of the `UntranslatableDiagnostic` lint that is
deny-by-default.

Now that `UntranslatableDiagnostic` has been changed from
allow-by-default to deny-by-default, the trivial variant is no longer
needed.
2024-02-28 10:53:04 +11:00