Commit Graph

5547 Commits

Author SHA1 Message Date
bors
62046bf8b4 Auto merge of #1814 - RalfJung:rustup, r=RalfJung
avoid unnecessary RefCell calls

Blocked on https://github.com/rust-lang/rust/pull/85599
2021-05-23 16:08:53 +00:00
Ralf Jung
a03f700fc9 rustup 2021-05-23 18:05:50 +02:00
Ralf Jung
393ce98b32 fix a Stacked Borrows test whose output changed 2021-05-23 18:04:13 +02:00
Ralf Jung
c60efa0c69 allocate backtrace strings mutably 2021-05-23 18:04:13 +02:00
Ralf Jung
9e0e9386a6 better approach to skip ZST reborrows 2021-05-23 18:04:13 +02:00
Ralf Jung
e09c571eec avoid some borrow_mut calls in data_race 2021-05-23 18:04:13 +02:00
Ralf Jung
543777acbd avoid unnecessary RefCell calls in Stacked Borrows 2021-05-23 18:04:13 +02:00
bors
cf7e4b9df6 Auto merge of #1815 - RalfJung:rustup2, r=RalfJung
rustup

Cc https://github.com/rust-lang/rust/issues/85591
2021-05-23 10:40:13 +00:00
Ralf Jung
d77d95d0a8 rustup 2021-05-23 12:39:27 +02:00
bors
10c495643a Auto merge of #1811 - RalfJung:less-rc, r=RalfJung
get rid of some `Rc`

Now that the memory access hooks get references to `MemoryExtra`, we can avoid refcounting for the global state of Stacked Borrows and the data race detector.
2021-05-22 12:56:51 +00:00
Ralf Jung
c73f8b1097 fmt 2021-05-22 14:55:33 +02:00
Ralf Jung
1bbd6e609c get rid of Rc in data_race 2021-05-22 14:47:14 +02:00
Ralf Jung
ca7283d746 get rid of Rc in Stacked Borrows 2021-05-22 13:24:08 +02:00
bors
3a24958128 Auto merge of #1809 - RalfJung:rustup, r=RalfJung
rustup
2021-05-20 17:54:56 +00:00
Ralf Jung
c151af5cf5 rustup 2021-05-20 13:32:18 +02:00
bors
b0e5d5f1ef Auto merge of #1804 - RalfJung:ptrless-allocs, r=RalfJung
update for Memory API changes

The Miri side of https://github.com/rust-lang/rust/pull/85376.
2021-05-19 14:34:39 +00:00
Ralf Jung
aba96b82b4 fix write_os_str_to_wide_str 2021-05-19 16:34:14 +02:00
Ralf Jung
e4a27150cb fmt 2021-05-19 16:10:28 +02:00
Ralf Jung
d1e5eeebdf rustup 2021-05-19 15:58:05 +02:00
Ralf Jung
dd404cc92e avoid importing C functions in alloc_write_race test 2021-05-19 15:27:58 +02:00
Ralf Jung
801a1744cd update for Memory API changes 2021-05-19 15:27:58 +02:00
bors
cda0b07121 Auto merge of #1808 - RalfJung:fmt, r=oli-obk
add (bors-ignored) formatting check job
2021-05-19 12:19:24 +00:00
Ralf Jung
74ae89e6ca over 'default' instead of 'override' (consistent with main build job) 2021-05-19 10:58:29 +02:00
Ralf Jung
6f3ad27416 fmt 2021-05-19 10:50:51 +02:00
Ralf Jung
952066f545 add (bors-ignored) formatting check job 2021-05-19 10:47:17 +02:00
bors
25a43c7783 Auto merge of #1806 - RalfJung:rustup, r=RalfJung
rustup

`@bors` r+
2021-05-17 22:27:31 +00:00
Ralf Jung
1bfd9ac56c rustup 2021-05-18 00:11:05 +02:00
bors
0d87afe5a5 Auto merge of #1805 - RalfJung:c_str, r=RalfJung
stop relying on c_str/wide_str helpers in rustc

This is a part of https://github.com/rust-lang/miri/pull/1804 that we can already do.
2021-05-17 12:33:51 +00:00
Ralf Jung
4f171d7fe3 stop relying on c_str/wide_str helpers in rustc 2021-05-17 14:31:59 +02:00
bors
516e905cab Auto merge of #1803 - RalfJung:fmt, r=RalfJung
fix rustfmt fallout
2021-05-17 08:59:20 +00:00
Ralf Jung
78f74c69e3 fix rustfmt fallout 2021-05-17 10:57:21 +02:00
bors
55664bc8ac Auto merge of #1802 - RalfJung:rustup, r=RalfJung
rustup

Cc https://github.com/rust-lang/rust/issues/85397
2021-05-17 07:37:04 +00:00
Ralf Jung
cf3376e541 rustup 2021-05-17 09:34:39 +02:00
bors
c6fefa5f5a Auto merge of #1801 - RalfJung:rustfmt, r=oli-obk
rustfmt

I liberally applied `rustfmt::skip` where I really did not like the rustfmt formatting.
2021-05-16 23:30:29 +00:00
Ralf Jung
d6fdfaa047 hand-held formatting for remaining files 2021-05-16 11:51:39 +02:00
Ralf Jung
4e231bab5e format much of Miri 2021-05-16 11:48:28 +02:00
Ralf Jung
7b3566096c configure rustfmt; fmt cargo-miri 2021-05-16 11:11:35 +02:00
bors
6608d2232b Auto merge of #1799 - RalfJung:rustup, r=RalfJung
rustup

Also fixes the line ending in our version file.
2021-05-15 13:33:26 +00:00
Ralf Jung
e824321aa4 rustup 2021-05-15 15:14:19 +02:00
bors
e5b340017e Auto merge of #1798 - RalfJung:nogit, r=oli-obk
support building Miri outside a git repo

Fixes https://github.com/rust-lang/rust/issues/84182

`@semarie` this should fix your problem... but I think any version of Miri actually shipped to users should have the proper git version information embedded, so I am not sure if this is the right fix. How do you do this for rustc proper? Even stable builds usually have a git version:
```
$ rustc +stable --version
rustc 1.51.0 (2fd73fabe 2021-03-23)
```
2021-05-15 13:14:14 +00:00
Ralf Jung
64f128c456 support building Miri outside a git repo 2021-05-15 14:36:53 +02:00
bors
bcae3315a7 Auto merge of #1794 - cbeuw:83813, r=RalfJung
Sync with rustc_span changes

rust-lang/rust#83813 made some changes to SourceMap and RealFileName. Now to get a string from a `rustc_span::FileName`, we need to specify if we would like the local filesystem path or remapped path via `--remap-path-prefix`. There seems to be only one place in miri that requires change.
2021-05-12 14:57:42 +00:00
Andy Wang
5b88045bfa
Update rust commit sha 2021-05-12 15:49:44 +01:00
Andy Wang
0d2278c6c6
Prefer remapped filename in backtrace to match rustc behaviour 2021-05-12 15:49:33 +01:00
bors
0bd2981bb4 Auto merge of #1792 - RalfJung:rustup, r=RalfJung
rustup
2021-05-11 13:33:21 +00:00
Ralf Jung
7af7e9e4f3 rustup 2021-05-11 15:32:05 +02:00
bors
38b5f236d2 Auto merge of #1790 - hyd-dev:rustup, r=RalfJung
Update pointer error messages

cc rust-lang/rust#85027
2021-05-08 09:43:01 +00:00
hyd-dev
1ab9fd50a4
Update pointer error messages 2021-05-08 15:33:27 +08:00
bors
ee8dbbc40f Auto merge of #1789 - RalfJung:array-to-elem, r=RalfJung
stacked borrows: ensure array-to-elem casts behave correctly

When "as"-casting an entire array, that should create a raw ptr usable for all elements in the array, even if we immediately cast to the element type.
2021-05-07 07:25:41 +00:00
Ralf Jung
a2b227f95a stacked borrows: ensure array-to-elem casts behave correctly 2021-05-07 09:24:33 +02:00