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.

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

update Miri #111036

Merged
merged 59 commits into from
May 1, 2023
Merged

update Miri #111036

merged 59 commits into from
May 1, 2023

Conversation

RalfJung
Copy link
Member

r? @ghost

bors and others added 30 commits April 10, 2023 12:48
@bors
Auto merge of rust-lang#2835 - saethlin:rustup, r=oli-obk
2c45553 
rustup

`@oli-obk` I think this is the resolution we agreed to on Zulip?
@LegNeato
Add shim for SIGRTMIN
3bc5dab 
Fixes rust-lang/miri#2832.
@LegNeato @saethlin
Update tests/pass-dep/shims/libc-misc.rs
df36499 
Co-authored-by: Ben Kimock <[email protected]>
@bors
Auto merge of rust-lang#2837 - LegNeato:sigrtmin, r=saethlin
93a0575 
Add shim for SIGRTMIN

Fixes rust-lang/miri#2832.
@DebugSteven
throw unsupported for epoll_wait
42cce32
@DebugSteven
filter out notes
9311b4a
@bors
Auto merge of rust-lang#2838 - DebugSteven:disable-epoll_wait, r=oli-obk
dedac2d 
throw unsupported for `epoll_wait`

This PR throws unsupported to indicate miri doesn't yet return ready events. Previously it always returned 0, indicating no ready events, even if events for the epoll file descriptor may have been ready.
@kiscad
add memcpy/strcpy shims
aacd261 
add memcpy/strcpy/strncpy shims

fix bug

add memcpy/strcpy/strncpy shims

add a test for strncpy

remove strncpy shim
@RalfJung
typo
7e37783
@bors
Auto merge of rust-lang#2827 - mojave2:memcpy, r=oli-obk
fa8e02f 
add `memcpy` and `strcpy` shims
@RalfJung
compiletest: complain about unknown flags
69b023f
@oli-obk
Update to new ui_test crate
6c8cf4e
@bors
Auto merge of rust-lang#2841 - RalfJung:compiletest, r=oli-obk
b4ea414 
compiletest: complain about unknown flags

This would have avoided rust-lang#110102
@bors
Auto merge of rust-lang#2833 - oli-obk:ui_test_bump, r=RalfJung
ffb0dd9 
Update to new ui_test crate
@RalfJung
Preparing for merge from rustc
2386cd7
@RalfJung
Merge from rustc
06707ab
@RalfJung
add test for recent unwind UB issue
8a9e03a
@bors
Auto merge of rust-lang#2842 - RalfJung:rustup, r=RalfJung
cf6b862 
Rustup

Also add a test for rust-lang#110233
@jsoref
Fix spelling
49be529 
* additional
* addresses
* aggregates
* always
* around
* beginning
* behaviours
* borrows
* called
* canary
* deallocated
* determine
* division
* documentation
* empty
* endianness
* ensures
* existing
* github
* hygiene
* individual
* initialize
* instantiate
* library
* location
* miscellaneous
* mitigates
* needs
* nonexistent
* occurred
* occurring
* overridden
* parameter
* performable
* previous
* referential
* requires
* resolved
* scenarios
* semantics
* spurious
* structure
* subtracting
* suppress
* synchronization
* this
* timestamp
* to
* transferring
* unknown
* variable
* windows

Signed-off-by: Josh Soref <[email protected]>
@bors
Auto merge of rust-lang#2843 - jsoref:spelling, r=RalfJung
cd53a43 
Spelling

This PR corrects misspellings identified by the [check-spelling action](https://github.com/marketplace/actions/check-spelling).

The misspellings have been reported at https://github.com/jsoref/miri/actions/runs/4699927237#summary-12751183650

The action reports that the changes in this PR would make it happy: https://github.com/jsoref/miri/actions/runs/4699927572#summary-12751184493
@oli-obk
Preparing for merge from rustc
81e7b34
@oli-obk
Merge from rustc
b1e74f4
@bors
Auto merge of rust-lang#2845 - oli-obk:rustup, r=oli-obk
9635312 
Rustup
@oli-obk
Remove a test that wasn't carrying its weight
8a40ff9
@bors
Auto merge of rust-lang#2846 - oli-obk:rm_borked_test, r=RalfJung
f0c207f 
Remove a test that wasn't carrying its weight

See rust-lang#110107 (comment) for discussion.

TLDR: it keeps breaking out of unrelated reasons and the real thing to check (early alloc ids can be tracked without ICEing miri) is hard to check otherwise.
@RalfJung
disable preemption in tokio tests again
28f6297
@bors
Auto merge of rust-lang#2848 - RalfJung:tokio, r=RalfJung
2b066a3 
disable preemption in tokio tests again

The comment even still says we need preemption disabled, but the flag got lost in rust-lang/miri#2764.
@RalfJung
Preparing for merge from rustc
0d6736e
@RalfJung
Merge from rustc
cf32558
@bors
Auto merge of rust-lang#2849 - RalfJung:rustup, r=RalfJung
213c905 
Rustup
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 30, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 30, 2023

The Miri subtree was changed

cc @rust-lang/miri

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

@RalfJung
Copy link
Member Author

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Apr 30, 2023

📌 Commit f4acc67 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 Apr 30, 2023
@bors
Copy link
Contributor

bors commented Apr 30, 2023

⌛ Testing commit f4acc67 with merge 32a3204bf05b73b180ff2a2bd7ba08ff3556aba4...

@bors
Copy link
Contributor

bors commented May 1, 2023

💥 Test timed out

@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 May 1, 2023
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@RalfJung
Copy link
Member Author

RalfJung commented May 1, 2023 via email

@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 May 1, 2023
@bors
Copy link
Contributor

bors commented May 1, 2023

⌛ Testing commit f4acc67 with merge b7d8c88...

@bors
Copy link
Contributor

bors commented May 1, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 1, 2023
@bors bors merged commit b7d8c88 into rust-lang:master May 1, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 1, 2023
This was referenced May 1, 2023
Closed
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b7d8c88): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

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.8% [0.8%, 0.8%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.6% [-2.9%, -2.2%] 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)		 -3.7% [-4.8%, -2.9%] 3
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 656.925s -> 656.574s (-0.05%)

@RalfJung RalfJung deleted the miri branch May 2, 2023 06:25
flip1995 pushed a commit to flip1995/rust that referenced this pull request May 5, 2023
@bors
Auto merge of rust-lang#111036 - RalfJung:miri, r=RalfJung
8354b34 
update Miri

r? `@ghost`
calebcartwright pushed a commit to calebcartwright/rust that referenced this pull request Jun 20, 2023
@bors
Auto merge of rust-lang#111036 - RalfJung:miri, r=RalfJung
4351e50 
update Miri

r? `@ghost`
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.71.0
Development

Successfully merging this pull request may close these issues.