Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update Miri #104456

Merged
merged 27 commits into from
Nov 16, 2022
Merged

update Miri #104456

merged 27 commits into from
Nov 16, 2022

Conversation

RalfJung
Copy link
Member

Not a huge sync, but there was a conflict and josh seems to prefer those to be merged back ASAP.

RalfJung and others added 24 commits November 5, 2022 15:21
Implement condvars for Windows

Adds 3 shims for Windows: `SleepConditionVariableSRW`, `WakeConditionVariable`, `WakeAllConditionVariable` to add support for condvars (which fixes rust-lang#2628).

Salvaged from what was removed from rust-lang#2231
README: Add macos cache deletion command
pthread: slight refactoring of how we access the sync object fields
Add miri_alloc, miri_dealloc

`miri_alloc` and `miri_dealloc` are basically the same as `__rust_alloc` and `__rust_dealloc` respectively, but without the check for a global allocator.

This should allow bootstrapping an allocator in environments, where no fundamental way of allocating memory is available (`no_std` + `alloc` in Miri).
update josh instructions

josh-project/josh#965 and josh-project/josh#994 have been merged so we don't need a forked josh any more. :)

However, this is blocked on josh-project/josh#1032 which currently prevents me from actually testing this...
adjust josh pushing, remove './miri toolchain HEAD/commit'

Looks like pushing works much better if we use as base commit the last commit we pulled from rustc and merged into Miri. Which I guess is fair. Conveniently, the `rust-version` file should usually be pretty much exactly that commit. Also adjust `rustc-pull` to update that file.

Pulling is now the way to update to a newer rustc, so I also removed `./miri toolchain HEAD`.
@rustbot
Copy link
Collaborator

rustbot commented Nov 15, 2022

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 15, 2022
@rustbot
Copy link
Collaborator

rustbot commented Nov 15, 2022

The Miri subtree was changed

cc @rust-lang/miri

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Nov 15, 2022
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 16, 2022
@bors
Copy link
Contributor

bors commented Nov 16, 2022

⌛ Testing commit 6906f08 with merge 5498ceec0821868408383632e2a5d7664b633f76...

@bors
Copy link
Contributor

bors commented Nov 16, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 16, 2022
@RalfJung
Copy link
Member Author

RalfJung commented Nov 16, 2022

duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:

the following dependencies have different features:
  rand_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` additionally enabled features {"std", "alloc", "getrandom"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/riscv64gc-unknown-linux-gnu/release/deps/librand_core-f84bd431fa787485.rlib"
    `cargo` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/riscv64gc-unknown-linux-gnu/release/deps/librand_core-a493ba75465e62c6.rlib"

No idea why that changes now but I guess I can add it to the workspace-hack-crate...

EDIT: Ah, tempfile used to depend on rand and enable the default features that way.

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Nov 16, 2022

📌 Commit 157b2d5 has been approved by RalfJung

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 16, 2022
@rust-log-analyzer

This comment has been minimized.

@Manishearth
Copy link
Member

@bors p=2

Manishearth added a commit to Manishearth/rust that referenced this pull request Nov 16, 2022
update Miri

Not a huge sync, but there was a conflict and [josh](https://github.com/josh-project/josh/) seems to prefer those to be merged back ASAP.
@bors
Copy link
Contributor

bors commented Nov 16, 2022

⌛ Testing commit 157b2d5 with merge e9493d6...

@bors
Copy link
Contributor

bors commented Nov 16, 2022

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing e9493d6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 16, 2022
@bors bors merged commit e9493d6 into rust-lang:master Nov 16, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 16, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e9493d6): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.8% [-2.8%, -2.8%] 2
All ❌✅ (primary) - - 0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.4% [-2.4%, -2.4%] 1
All ❌✅ (primary) - - 0

@RalfJung RalfJung deleted the miri branch November 17, 2022 08:00
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
update Miri

Not a huge sync, but there was a conflict and [josh](https://github.com/josh-project/josh/) seems to prefer those to be merged back ASAP.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants