Commit Graph

3868 Commits

Author SHA1 Message Date
Aaron Hill 5960e8b80e Rename XARGO env var to XARGO_CHECK
This reflects the fact that we want bootstrap to override `xargo-check`,
not `xargo
2020-03-02 14:17:14 -05:00
bors 7cdcdecb01 Auto merge of #1178 - RalfJung:rustup-visitor, r=RalfJung
adjust for rustc changes

The Miri side of https://github.com/rust-lang/rust/pull/69257
2020-03-02 12:52:40 +00:00
Ralf Jung 88c45f9891 adjust for rustc changes 2020-03-02 13:51:08 +01:00
bors 64bfe81cae Auto merge of #1190 - RalfJung:canonical-alloc-id, r=RalfJung
Canonical AllocID

This is the Miri side of https://github.com/rust-lang/rust/pull/69408.
This just ports the existing extern statics to the new system; no new shims are added.

Cc @christianpoveda
2020-03-02 08:06:30 +00:00
Ralf Jung 59bddba5f3 remove unused import 2020-03-02 09:05:55 +01:00
Ralf Jung 21a5da99a4 rustup 2020-03-02 09:03:11 +01:00
Ralf Jung 90327335fc canonicalize alloc ID for ptr-to-int cast 2020-03-02 09:03:08 +01:00
Ralf Jung 8ef303cd32 port from find_foreign_static to canonical_alloc_id 2020-03-02 09:03:08 +01:00
Ralf Jung 5d8fbfcb5f rename memory kind: Env -> Machine 2020-03-02 09:01:23 +01:00
Ralf Jung 340e14ee42 tweak benchmark 2020-03-02 09:01:23 +01:00
bors 263eedc6ea Auto merge of #1199 - RalfJung:cargo-miri, r=RalfJung
cargo-miri: fix trailing indent in xargo files
2020-03-01 20:24:37 +00:00
Ralf Jung 48a4e3f4d8 format a few things 2020-03-01 11:54:19 +01:00
Ralf Jung af98bd9a53 fix trailing indent in xargo files 2020-03-01 11:53:34 +01:00
bors fe5d977480 Auto merge of #1197 - RalfJung:rustup, r=RalfJung
Rustup
2020-03-01 09:31:08 +00:00
Ralf Jung cc1ebd0af6 some formatting 2020-03-01 10:29:05 +01:00
Ralf Jung ea5aa19487 rustup 2020-03-01 10:22:13 +01:00
bors b9eb21aa2c Auto merge of #1196 - RalfJung:winlock, r=RalfJung
Remove incorrect try_lock from Windows critical section shim
2020-02-29 19:58:38 +00:00
Ralf Jung 2b04e3954a Remove incorrect try_lock from Windows critical section shim 2020-02-29 20:47:57 +01:00
bors 335859210d Auto merge of #1195 - RalfJung:rustup, r=RalfJung
rustup

Just the occasional bump can't hurt...

@bors r+
2020-02-29 12:29:48 +00:00
Ralf Jung df732c863e rustup 2020-02-29 13:28:59 +01:00
bors b0c74182b8 Auto merge of #1194 - RalfJung:no-to-bits, r=RalfJung
avoid Scalar::to_bits
2020-02-28 09:02:17 +00:00
Ralf Jung 5187e5ddd6 avoid Scalar::to_bits 2020-02-28 10:00:20 +01:00
bors c0934e1eca Auto merge of #1152 - divergentdave:shim-directory, r=RalfJung
Add directory-related shims

This PR adds support for `mkdir`, `rmdir`, `opendir`, `closedir`, and `readdir64_r`.

Open directory streams are tracked through a HashMap indexed by pointer locations, which holds directory iterators. Since `DIR` is an opaque type in glibc, I represent them with 1-byte allocations, and then just use their pointers in HashMap lookups.

Tests are included to exercise the new functionality.
2020-02-26 14:15:55 +00:00
Ralf Jung 62f9f4c578 fix Windows build failure 2020-02-26 15:15:16 +01:00
David Cook df59d7ff74 Review comments 2020-02-26 07:59:11 -06:00
bors 070cecb6fc Auto merge of #1192 - RalfJung:disable-stacked-borrows, r=RalfJung
add an option to disable Stacked Borrows

while keeping validation enabled. Fixes https://github.com/rust-lang/miri/issues/1183.
2020-02-26 12:50:48 +00:00
Ralf Jung 7e128beff9 fix build failures 2020-02-26 13:50:33 +01:00
bors 05a9d9b410 Auto merge of #1193 - RalfJung:rustup, r=RalfJung
rustup

@bors r+
2020-02-25 23:07:59 +00:00
Ralf Jung 739d796b05 rustup 2020-02-25 18:12:00 +01:00
David Cook ad8c784009 Return length from write_os_str_to_c_str 2020-02-24 19:50:25 -06:00
David Cook 9e03b41338 Migrate readdir_r from pointers to places 2020-02-24 19:38:17 -06:00
David Cook 9fcc8a2a91 Review comments 2020-02-24 19:16:41 -06:00
Ralf Jung 25ddc659d0 move validate field from memory to machine 2020-02-24 16:25:29 +01:00
Ralf Jung 274ae0438f add an option to disable Stacked Borrows 2020-02-24 16:22:02 +01:00
bors 36305e3a50 Auto merge of #1136 - Aaron1011:feature/check-libstd, r=RalfJung
Use 'cargo check' to build the sysroot and target crate

Fixes #1057

I'm using my original approach from PR #1048. Ideally, we would
distinguish between build-deps/dependencies/'final crate' via a
different approach (e.g. the target directory). However, I
haven't been able to get that to work just yet.

However, everything should be working with the approach I'm using. At a
minimum, we can use this PR to verify that everything works as expected
when we don't actually produce native build outputs.
2020-02-24 13:45:51 +00:00
Ralf Jung faf7bf538d update lockfile 2020-02-24 14:45:35 +01:00
Ralf Jung 47f2b12735 fix Cargo.toml 2020-02-24 14:42:45 +01:00
Ralf Jung 443163f930 refactor cargo-miri a bit 2020-02-24 14:41:04 +01:00
Aaron Hill e530829797 Use 'cargo check' to build the sysroot and target crate
Fixes #1057

Since we are no longer using "cargo rustc", we now use the rustc
arguments passed by Cargo to determine whether we are building a
build dependency, normal dependency, or "target" (final binary or test)
crate.
2020-02-24 14:41:04 +01:00
David Cook dd00e5830f Use ID numbers in lieu of allocations for DIR* 2020-02-23 15:46:18 -06:00
bors 3c444bf6a6 Auto merge of #1191 - RalfJung:cargup, r=RalfJung
cargo update
2020-02-23 21:46:05 +00:00
David Cook 89cbe0ae56 Add comments 2020-02-23 15:45:04 -06:00
Ralf Jung a555e1ec25 cargo update 2020-02-23 22:44:16 +01:00
David Cook 725d6bfa9c Move error up, early return 2020-02-23 15:39:50 -06:00
David Cook d6da4ab4b8 Add comments 2020-02-23 15:38:32 -06:00
David Cook 94f611348f Use os_str_length_as_c_str in readdir[64]_r 2020-02-23 15:37:22 -06:00
David Cook 947fa1fa26 Miscellaneous review comments 2020-02-23 15:36:03 -06:00
David Cook 341212acd6 Rewrite fs tests 2020-02-23 15:34:49 -06:00
David Cook d4b73efa81 Fix interpreted OS detection 2020-02-23 15:33:37 -06:00
David Cook 9a6921a17f Add doc comment inside DirHandler 2020-02-23 15:32:24 -06:00