Skip to content

update Miri #103571

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 12 commits into from
Oct 26, 2022
Merged

update Miri #103571

merged 12 commits into from
Oct 26, 2022

Conversation

RalfJung
Copy link
Member

r? @ghost

RalfJung and others added 12 commits October 24, 2022 12:00
@RalfJung
rustup
7b83059
@bors
Auto merge of rust-lang#2616 - RalfJung:rustup, r=RalfJung
cfd99a2 
rustup

With rust-lang#103360 having landed, I don't think we still need this `GetFileInformationByHandleEx` shim.
@RalfJung
Merge branch 'master' of http://localhost:8000/rust-lang/rust.git:at_…
705390c 
…commit=75dd959a3a40eb5b4574f8d2e23aa6efbeb33573[:prefix=src/tools/miri]:/src/tools/miri
@RalfJung
rustup
543afa8
@RalfJung
bless clippy
5a5a3e4
@bors
Auto merge of rust-lang#2618 - RalfJung:rustup, r=RalfJung
a46ccba 
Rustup
@saethlin
Rename, improve docs, fail better
d86bbd5
@RalfJung
tweak docs
71e6815
@bors
Auto merge of rust-lang#2614 - saethlin:stack-inspection-tools, r=Ral…
136a1db 
…fJung

Improve miri_print_borrow_stacks

Per post-merge review on rust-lang/miri#2322

* `miri_print_stacks` renamed to `miri_print_borrow_stacks`
* A bit more details in docs, clarified how unstable these functions are meant to be
* Print an `unknown_bottom` if one exists

Open question: Currently `miri_get_alloc_id` gets the expected `AllocId` for `Wildcard` pointers, but for pointers with no provenance, the function reports UB and halts the interpreter. That's definitely wrong. But what _should_ we do? Is it reasonable to check if the pointer has `None` provenance and try to get an `AllocId` for its address? That still leaves us with a failure path, which in this case might be best-handled as an ICE? I'm just not sure that changing the return type of `miri_get_alloc_id` to `Option` is a win because it complicates all normal uses of this.
@RalfJung
add pthread_getname_np
70087ea
@RalfJung
account for different max thread name lengths on different platforms
dac2412
@bors
Auto merge of rust-lang#2620 - RalfJung:getname, r=RalfJung
6ce5226 
add pthread_getname_np

A new libstd test needs this, and there doesn't seem to be a good reason not to have this.
@rustbot
Copy link
Collaborator

rustbot commented Oct 26, 2022

The Miri subtree was changed

cc @rust-lang/miri

@RalfJung
Copy link
Member Author

@bors r+ p=1 (fixes miri-test-libstd)

@bors
Copy link
Collaborator

bors commented Oct 26, 2022

📌 Commit 6ce5226 has been approved by RalfJung

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 26, 2022
@bors
Copy link
Collaborator

bors commented Oct 26, 2022

⌛ Testing commit 6ce5226 with merge 1898c34...

@bors
Copy link
Collaborator

bors commented Oct 26, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 26, 2022
@bors bors merged commit 1898c34 into rust-lang:master Oct 26, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 26, 2022
@bors bors mentioned this pull request Oct 27, 2022
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1898c34): 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.

mean1 range count2
Regressions ❌
(primary)		 3.4% [1.5%, 5.4%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -5.2% [-5.2%, -5.2%] 1
All ❌✅ (primary) 3.4% [1.5%, 5.4%] 2

Cycles

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

Footnotes

  1. the arithmetic mean of the percent change ↩

  2. number of relevant changes ↩

@RalfJung RalfJung deleted the miri branch October 27, 2022 13:07
@RalfJung RalfJung restored the miri branch October 28, 2022 20:47
@RalfJung RalfJung deleted the miri branch October 29, 2022 09:29
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
@bors
Auto merge of rust-lang#103571 - RalfJung:miri, r=RalfJung
165a00f 
update Miri

r? `@ghost`
pietroalbini added a commit to ferrocene/sphinx-shared-resources that referenced this pull request Mar 22, 2023
@bors-ferrocene @Veykril
@pietroalbini @DropDemBits @bors
Merge #600
3f42cd2 
600: Pull changes from upstream `master` r=kirtchev-adacore a=pietroalbini

* rust-lang/rust#103605
* rust-lang/rust#103604
  * rust-lang/rust#103598
  * rust-lang/rust#103596
  * rust-lang/rust#103580
  * rust-lang/rust#103579
  * rust-lang/rust#103567
  * rust-lang/rust#103558
  * rust-lang/rust#103549
  * rust-lang/rust#103537
  * rust-lang/rust#103526
  * rust-lang/rust#103432
* rust-lang/rust#103571
* rust-lang/rust#103492
* rust-lang/rust#103572
  * rust-lang/rust#103554
  * rust-lang/rust#103546
  * rust-lang/rust#103543
  * rust-lang/rust#103428
  * rust-lang/rust#102706
  * rust-lang/rust#95710
* rust-lang/rust#103284
* rust-lang/rust#103562
  * rust-lang/rust#103542
  * rust-lang/rust#103536
  * rust-lang/rust#103533
  * rust-lang/rust#103520
  * rust-lang/rust#103444
  * rust-lang/rust#103430
  * rust-lang/rust#103416
  * rust-lang/rust#103287
  * rust-lang/rust#103209
  * rust-lang/rust#102951
* rust-lang/rust#103279
* rust-lang/rust#103158



Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Co-authored-by: Pietro Albini <pietro.albini@ferrous-systems.com>
Co-authored-by: DropDemBits <r3usrlnd@gmail.com>
Co-authored-by: bors <bors@rust-lang.org>
Co-authored-by: Pietro Albini <pietro@pietroalbini.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

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.

Projects

None yet

Milestone

1.66.0

Development

Successfully merging this pull request may close these issues.

5 participants

@RalfJung @rustbot @bors @rust-timer @saethlin