Commit graph

602 commits

Author SHA1 Message Date
bors
d61d359d5e Auto merge of #2753 - RalfJung:rustup, r=RalfJung
Rustup

Pulls in https://github.com/rust-lang/rust/pull/104658
2023-01-09 13:13:35 +00:00
Ralf Jung
8740443c35 Preparing for merge from rustc 2023-01-09 13:48:31 +01:00
bors
87a202e6f2 Auto merge of #2752 - RalfJung:win-env-current-exe, r=RalfJung
make env::current_exe work on Windows
2023-01-09 12:47:38 +00:00
Ralf Jung
5977a1626d make env::current_exe work on Windows 2023-01-09 13:46:15 +01:00
dependabot[bot]
90600e0b7d
Bump tokio from 1.23.0 to 1.23.1 in /test_dependencies
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.23.0 to 1.23.1.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.23.0...tokio-1.23.1)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-06 22:01:53 +00:00
Aaron Hill
a474872b5d
Test again wasm32-unknown-unknown 2023-01-05 21:44:37 -06:00
Aaron Hill
54be8aad79
Ignore symbol shim clash when symbol is provided by compiler_builtins
When this happens, we ignore the symbol from `compiler_builtins`
in favor of Miri's builtin support.

This allows Miri to target platforms like wasm32-unknown-unknown,
where functions like `memcmp` are provided by `compiler_builtins`.
2023-01-05 21:41:53 -06:00
Ralf Jung
794cc0854a clippy 2023-01-03 14:49:53 +01:00
Ralf Jung
d96592b4fd Merge from rustc 2023-01-03 12:22:11 +01:00
Ralf Jung
99fc745656 Preparing for merge from rustc 2023-01-03 12:21:37 +01:00
Ralf Jung
1296a4c689 tweaks to retag diagnostic handling 2023-01-02 16:05:49 +01:00
bjorn3
8c000a68c5 Add missing extern crate rustc_driver 2022-12-31 17:20:13 +00:00
Ralf Jung
dfe1898437 no need to do a no_std build for wasi 2022-12-28 18:01:20 +01:00
Ralf Jung
40d65f0152 test using a JSON target file 2022-12-28 18:01:20 +01:00
Ralf Jung
fbd6a69937 bump dependencies 2022-12-28 17:21:20 +01:00
Ralf Jung
4fa51925fa print sysroot build failure error 2022-12-28 17:18:14 +01:00
Ralf Jung
041ad1fcfe simplify path joining code a bit 2022-12-28 12:44:41 +01:00
Ralf Jung
7bdb5da916 handle unknown targets more gracefully 2022-12-28 10:51:13 +01:00
Ralf Jung
d31029226b cargo-miri: use rustc to determine the output filename 2022-12-27 20:34:45 +01:00
Ralf Jung
92b6562a25 enable some warnings that rustc bootstrap enables 2022-12-25 14:18:41 +01:00
Ralf Jung
fed7e2c935 use cargo-install to install josh-proxy 2022-12-25 14:16:10 +01:00
Ralf Jung
e52e0d8557 fix warnings 2022-12-24 10:40:50 +01:00
Ralf Jung
9c01e9f7f5 Merge from rustc 2022-12-24 10:12:14 +01:00
Ralf Jung
0c14ad4d9f Preparing for merge from rustc 2022-12-24 09:58:29 +01:00
bors
245357f619 Auto merge of #2646 - saethlin:data-race-spans, r=RalfJung
Data race spans

Fixes https://github.com/rust-lang/miri/issues/2205

This adds output to data race errors very similar to the spans we emit for Stacked Borrows errors. For example, from our test suite:
```
help: The Atomic Load on thread `<unnamed>` is here
  --> tests/fail/data_race/atomic_read_na_write_race1.rs:23:13
   |
23 | ...   (&*c.0).load(Ordering::SeqCst) //~ ERROR: Data race detected between Atomic Load on thread `<unnamed>` and Write o...
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
help: The Write on thread `<unnamed>` is here
  --> tests/fail/data_race/atomic_read_na_write_race1.rs:19:13
   |
19 |             *(c.0 as *mut usize) = 32;
   |             ^^^^^^^^^^^^^^^^^^^^^^^^^```
```

Because of https://github.com/rust-lang/miri/pull/2647 this comes without a perf regression, according to our benchmarks.
2022-12-24 08:13:31 +00:00
Ben Kimock
81fe37a900 Mention and number the components of a race in the order the interpreter sees them 2022-12-23 13:45:43 -05:00
Ralf Jung
a48d2e1783 fix one more unaligned self.ptr, and add tests 2022-12-23 15:49:23 +01:00
Ralf Jung
19422fcbfe attempt to clarify what the backtrace belongs to when there could be ambiguity 2022-12-23 15:39:14 +01:00
Ralf Jung
d0f404d77a fix IntoIter::drop on high-alignment ZST 2022-12-23 15:18:18 +01:00
Ben Kimock
f4165be780 Add a (1) and (2) to the data race errors 2022-12-22 14:24:10 -05:00
bors
cca80b9a81 Auto merge of #103957 - JakobDegen:drop-retag, r=RalfJung
Retag as FnEntry on `drop_in_place`

This commit changes the mir drop shim to always retag its argument as if it were a `&mut`.

cc rust-lang/unsafe-code-guidelines#373
2022-12-22 17:48:43 +00:00
Ben Kimock
a2e09baa32 Fix phrasing 2022-12-21 23:21:40 -05:00
Ben Kimock
c2f459ca74 Clean up implementation, deduplicate in errors 2022-12-21 21:11:19 -05:00
Jakob Degen
0229281d03 Don't run Drop terminators on types that do not have drop glue in const eval 2022-12-21 16:15:56 -08:00
Yuki Okushi
5689a7b372
Rollup merge of #105986 - eltociear:patch-18, r=RalfJung
Fix typo in reading_half_a_pointer.rs

gurantee -> guarantee
2022-12-22 08:32:11 +09:00
Yuki Okushi
4f29ca386f
Rollup merge of #105602 - RalfJung:read-convenience, r=oli-obk
interpret: add read_machine_[ui]size convenience methods

We have `read_pointer`, so it felt inconsistent to not also have these.

r? ```@oli-obk```
2022-12-22 08:32:10 +09:00
Jakob Degen
37e00165e4 Bless tests 2022-12-21 14:59:55 -08:00
Jakob Degen
c359ab0b5d Retag argument to drop_in_place unconditionally 2022-12-21 14:59:55 -08:00
Jakob Degen
102040ce76 Retag as FnEntry on drop_in_place 2022-12-21 14:59:55 -08:00
Ralf Jung
90d8fc6240 update josh onstructions 2022-12-21 17:54:10 +01:00
Ikko Ashimine
5538c92837
Fix typo in reading_half_a_pointer.rs
gurantee -> guarantee
2022-12-21 15:34:21 +09:00
Ben Kimock
749b2b077d Re-enable the VClock ordering tests 2022-12-20 22:54:44 -05:00
Ben Kimock
d2e1c3738e Fix span management 2022-12-20 22:48:23 -05:00
Ben Kimock
d1184ae58d Include a Span in VClock 2022-12-16 11:39:08 -05:00
Ralf Jung
39bb865759 fmt 2022-12-16 14:19:48 +01:00
Ralf Jung
3d67703e75 Merge from rustc 2022-12-16 12:19:43 +01:00
Ralf Jung
33e5b953de Preparing for merge from rustc 2022-12-16 12:19:21 +01:00
Oli Scherer
d9d92ed7da Move alignment failure error reporting to machine 2022-12-15 16:07:35 +00:00
Oli Scherer
d66824dbc4 Make alignment checks a future incompat lint 2022-12-15 16:07:28 +00:00
DebugSteven
1b51f372eb implement minimal epoll_create1 shim 2022-12-13 14:04:30 -07:00