Commit Graph

5416 Commits

Author SHA1 Message Date
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
bors
67c04afc25 Auto merge of #1788 - hyd-dev:rustup, r=RalfJung
`encountered a NULL reference` -> `encountered a null reference`

It's changed from "NULL" to "null" (probably by rust-lang/rust#84842) in `rustc`, and causing some test failures:
https://github.com/rust-lang/miri/runs/2498333632#step:8:640
2021-05-04 08:27:00 +00:00
bors
cf9d77de47 Auto merge of #1787 - DianaNites:patch-1, r=RalfJung
Fix broken self-link
2021-05-04 08:08:31 +00:00
hyd-dev
47c5b6eb08
encountered a NULL reference -> encountered a null reference 2021-05-04 15:53:19 +08:00
Diana
67ec0a5ce3 Fix dead self-link 2021-05-03 22:52:09 -04:00
bors
bdce1ddf88 Auto merge of #1785 - Smittyvb:fast-math-ub, r=RalfJung
Throw UB if f*_fast intrinsic called with non-finite value

Calling these intrinsics with non-finite values is undefined behaviour, since they result in `f*` intrinsics in LLVM with the `fast` flag, and `fast` math on non-finite values results in `poison` values. (technically LLVM only considers it UB upon _using_ the value, but that shouldn't make much of a difference)
2021-05-03 17:32:50 +00:00
Smitty
e0e59f6020 Simplify finiteness checking 2021-05-03 10:08:42 -04:00
Smitty
68d29554a8 test for infinite value in f*_fast 2021-05-03 09:56:51 -04:00
bors
43ae3148e7 Auto merge of #1786 - RalfJung:rustup, r=RalfJung
fix checking os_family

Cc https://github.com/rust-lang/rust/issues/84848
2021-05-03 09:25:41 +00:00
Ralf Jung
c3ae8a6f90 adjust for different 'yield' hint on aarch64 2021-05-03 11:25:05 +02:00
Ralf Jung
aac6e2ad3e fix checking os_family 2021-05-03 09:57:13 +02:00
Smitty
e591b83185 UB if f*_fast intrinsic called with nonfinite value 2021-05-02 12:25:00 -04:00
bors
0e3038571c Auto merge of #1784 - hyd-dev:harness-false, r=RalfJung
Use `harness = false` instead of `#![feature(custom_test_frameworks)]`

Quoting from the comment in `tests/compiletest.rs`:
> Custom test runner, to avoid libtest being wrapped around compiletest which wraps libtest.

I believe `harness = false` is more suitable for that purpose.

I have verified that both `./miri test` and `LD_LIBRARY_PATH=$PWD/build/x86_64-unknown-linux-gnu/stage2/lib PATH=$PWD/build/bin:$PATH ./x.py test src/tools/miri` work well.
2021-05-01 16:07:48 +00:00
hyd-dev
2da6bedaec
Use harness = false instead of #![feature(custom_test_frameworks)] 2021-05-01 22:28:33 +08:00
bors
41f3fe6431 Auto merge of #1783 - hyd-dev:rustup, r=RalfJung
Rustup for rust-lang/rust#84401

cc rust-lang/rust#84741
2021-04-30 14:08:13 +00:00
hyd-dev
b30c5fef5b
Rustup for rust-lang/rust#84401 2021-04-30 19:35:59 +08:00
bors
5faf5a5ca0 Auto merge of #1781 - RalfJung:rustup, r=RalfJung
rustup
2021-04-25 14:58:18 +00:00
Ralf Jung
4c741e5fb2 rustup 2021-04-25 16:57:48 +02:00
bors
58436e942a Auto merge of #1769 - RalfJung:remove-compat, r=oli-obk
remove compatibility code for passing miri flags via cargo arguments

With https://github.com/rust-lang/miri/pull/1540, we deprecated `cargo miri test -- -Zmiri-disable-stacked-borrows` as a style of passing flags to Miri, introducing `MIRIFLAGS="-Zmiri-disable-stacked-borrows" cargo miri test` instead. This made `cargo miri` more compatible with `cargo`; both now behave the same in terms of argument parsing.

However, to avoid breaking things, I introduced some backwards compatibility hack such that the old way would still work. Six months later, I think it is time to remove that hack.
2021-04-22 07:47:56 +00:00
bors
36176cde68 Auto merge of #1778 - RalfJung:thread-local-const-init, r=RalfJung
test thread_local_const_init

Blocked on https://github.com/rust-lang/rust/pull/84291
2021-04-20 08:01:46 +00:00
Ralf Jung
2ae699c56d make TLS-drop-test more cross-platform 2021-04-20 09:59:26 +02:00
bors
74ffda2dd7 Auto merge of #1779 - RalfJung:cargo-miri-xargo, r=RalfJung
fix MIRI_BE_RUSTC value during sysroot build

`@hyd-dev` pointed out that `MIRI_BE_RUSTC` is set to an incorrect value during the xargo sysroot build. This fixes that.
2021-04-20 07:41:41 +00:00
Ralf Jung
f73cc11f3f rustup 2021-04-20 09:40:18 +02:00
Ralf Jung
6834944fd3 fix MIRI_BE_RUSTC value during sysroot build 2021-04-18 12:29:31 +02:00
Ralf Jung
d512ba2ae2 test thread_local_const_init 2021-04-18 11:01:08 +02:00
bors
a86eab3e6c Auto merge of #1777 - crlf0710:fix_compilation, r=RalfJung
Remove `main_fn.rs` test.

Fixes build error caused by https://github.com/rust-lang/rust/issues/84240 .
2021-04-16 16:46:05 +00:00
Charles Lew
85f7dd6131 Remove main_fn.rs test. 2021-04-17 00:04:09 +08:00
bors
b13b79db73 Auto merge of #1775 - ABouttefeux:master, r=RalfJung
Fix failing test after merge of PR rust#83948

Cc https://github.com/rust-lang/rust/issues/84202
2021-04-15 08:19:18 +00:00
Aliénore Bouttefeux
64d07ea217 change rust version to head 2021-04-15 10:17:54 +02:00
Aliénore Bouttefeux
648638976a allow deref of null ptr in test 2021-04-15 10:00:39 +02:00
bors
f76e256086 Auto merge of #1774 - RalfJung:contrib, r=RalfJung
fix CONTRIBUTING example

Fixes https://github.com/rust-lang/miri/issues/1773
2021-04-12 17:01:45 +00:00
Ralf Jung
67b8844628 fix CONTRIBUTING example 2021-04-12 19:01:10 +02:00