Add tests for Intptrcast when doing explicit casts by pvdrz · Pull Request #803 · rust-lang/miri

pvdrz · 2019-06-29T18:24:52Z

r? @RalfJung

RalfJung

Looking good!

Blocked on landing rust-lang/rust#62229.

pvdrz · 2019-07-03T18:08:48Z

rust-lang/rust#62229 just landed

Edit: I closed and opened the PR to trigger CI :P

RalfJung · 2019-07-03T18:22:36Z

@christianpoveda you need to update the rust-version file. Closing and reopening just wastes CI time. ;)

RalfJung · 2019-07-03T18:29:11Z

I wonder if we will see rust-lang/rust#62347 on our CI here. Bors will tell. ;)

bors · 2019-07-03T18:35:07Z

☔ The latest upstream changes (presumably #820) made this pull request unmergeable. Please resolve the merge conflicts.

RalfJung · 2019-07-03T18:41:12Z

Thanks!

I'm afraid I introduced a merge conflict here, sorry. :/ Can you take care of that? Then I will r+.

pvdrz · 2019-07-03T18:55:09Z

I wonder if we will see rust-lang/rust#62347 on our CI here. Bors will tell. ;)

It happened. I am not sure why tho

RalfJung · 2019-07-03T21:01:17Z

@bors r+

bors · 2019-07-03T21:01:18Z

📌 Commit 8dfb278 has been approved by RalfJung

bors · 2019-07-03T21:01:25Z

⌛ Testing commit 8dfb278 with merge fea220c...

@RalfJung

…fJung Add tests for Intptrcast when doing explicit casts r? @RalfJung

bors · 2019-07-03T21:16:22Z

💔 Test failed - checks-travis

RalfJung · 2019-07-04T08:50:48Z

Essentially blocked on rust-lang/rust#62245.

bors · 2019-07-04T22:07:36Z

📌 Commit 802dcb7 has been approved by RalfJung

bors · 2019-07-04T22:07:43Z

⌛ Testing commit 802dcb7 with merge 58e6530...

@RalfJung

…fJung Add tests for Intptrcast when doing explicit casts r? @RalfJung

bors · 2019-07-04T22:23:52Z

💔 Test failed - checks-travis

RalfJung · 2019-07-05T17:23:47Z

Temporarily disabling more stuff. It's messy, but I think having to land the changes for all the upcoming braking changes at once will be even more messy...

@bors r+

bors · 2019-07-05T17:23:48Z

📌 Commit 9b58492 has been approved by RalfJung

bors · 2019-07-05T17:23:55Z

⌛ Testing commit 9b58492 with merge a72c005...

@RalfJung

…fJung Add tests for Intptrcast when doing explicit casts r? @RalfJung

RalfJung · 2019-07-05T19:21:57Z

sigh Windows still fails. :( We should have done this cast thing from the start, turns out the intptrcast we landed was very incomplete but we didn't notice, and now that bites us. :/

bors · 2019-07-05T19:23:55Z

💥 Test timed out

RalfJung · 2019-07-05T19:28:30Z

@bors r+

bors · 2019-07-05T19:28:31Z

📌 Commit 4d76dd1 has been approved by RalfJung

bors · 2019-07-05T20:30:31Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout intptrcast-explicit-casts (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self intptrcast-explicit-casts --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging tests/run-pass-noseed/ptr_offset.rs
Auto-merging src/shims/foreign_items.rs
CONFLICT (content): Merge conflict in src/shims/foreign_items.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2019-07-05T20:30:48Z

☔ The latest upstream changes (presumably #825) made this pull request unmergeable. Please resolve the merge conflicts.

RalfJung · 2019-07-05T20:46:31Z

@bors r+

bors · 2019-07-05T20:46:31Z

📌 Commit 89696a4 has been approved by RalfJung

bors · 2019-07-05T20:46:38Z

⌛ Testing commit 89696a4 with merge 285fc0d...

@RalfJung

…fJung Add tests for Intptrcast when doing explicit casts r? @RalfJung

bors · 2019-07-05T21:08:49Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing 285fc0d to master...

uninit intrinsic is gone Finally. :D However, to land this we'll need to fix the intptrcast issues that block #803.

RalfJung reviewed Jun 29, 2019

View reviewed changes

Comment thread tests/compile-fail/ptr_int_cast.rs Outdated

RalfJung reviewed Jun 29, 2019

View reviewed changes

Comment thread tests/run-pass/intptrcast.rs Outdated

RalfJung reviewed Jun 30, 2019

View reviewed changes

Comment thread tests/compile-fail/ptr_int_cast.rs Outdated

RalfJung reviewed Jun 30, 2019

View reviewed changes

Comment thread tests/run-pass/intptrcast.rs Outdated

RalfJung reviewed Jun 30, 2019

View reviewed changes

Comment thread tests/run-pass/intptrcast.rs Outdated

pvdrz changed the title ~~Intptrcast explicit casts~~ Add tests for Intptrcast when doing explicit casts Jun 30, 2019

RalfJung approved these changes Jun 30, 2019

View reviewed changes

RalfJung added the S-blocked-on-rust Status: Blocked on landing a Rust PR label Jun 30, 2019

pvdrz closed this Jul 3, 2019

pvdrz reopened this Jul 3, 2019

RalfJung removed the S-blocked-on-rust Status: Blocked on landing a Rust PR label Jul 3, 2019

RalfJung reviewed Jul 3, 2019

View reviewed changes

Comment thread tests/run-pass/intptrcast.rs Outdated

pvdrz and others added 2 commits July 3, 2019 13:38

Add intptrcast test for explicit casts

074e20e

Update rust-version

39d383d

RalfJung reviewed Jul 3, 2019

View reviewed changes

Comment thread tests/run-pass-noseed/intptrcast.rs Outdated

Fix explicit cast test

8dfb278

bors added a commit that referenced this pull request Jul 3, 2019

Auto merge of #803 - christianpoveda:intptrcast-explicit-casts, r=Ral…

fea220c

…fJung Add tests for Intptrcast when doing explicit casts r? @RalfJung

RalfJung added the S-blocked-on-rust Status: Blocked on landing a Rust PR label Jul 4, 2019

temporarily disable ptr_offset, maybe that helps

802dcb7

bors added a commit that referenced this pull request Jul 4, 2019

Auto merge of #803 - christianpoveda:intptrcast-explicit-casts, r=Ral…

58e6530

…fJung Add tests for Intptrcast when doing explicit casts r? @RalfJung

RalfJung removed the S-blocked-on-rust Status: Blocked on landing a Rust PR label Jul 5, 2019

RalfJung mentioned this pull request Jul 5, 2019

uninit intrinsic is gone #826

Merged

RalfJung added 3 commits July 5, 2019 19:21

fix deallocating/reallocating with integer pointers

aad5fde

temporarily disable validation for 'cargo miri test' testing

6c58d40

temporarily disable intptrcast advanced testing on Windows

9b58492

bors added a commit that referenced this pull request Jul 5, 2019

Auto merge of #803 - christianpoveda:intptrcast-explicit-casts, r=Ral…

a72c005

…fJung Add tests for Intptrcast when doing explicit casts r? @RalfJung

oli-obk mentioned this pull request Jul 5, 2019

implement intptrcast model #224

Closed

10 tasks

temporarily disable validation on Windows

4d76dd1

Merge remote-tracking branch 'origin/master'

89696a4

bors added a commit that referenced this pull request Jul 5, 2019

Auto merge of #803 - christianpoveda:intptrcast-explicit-casts, r=Ral…

285fc0d

…fJung Add tests for Intptrcast when doing explicit casts r? @RalfJung

bors merged commit 89696a4 into rust-lang:master Jul 5, 2019

pvdrz deleted the intptrcast-explicit-casts branch July 6, 2019 03:30

bors added a commit that referenced this pull request Jul 6, 2019

Auto merge of #826 - RalfJung:uninit, r=RalfJung

e4a98ea

uninit intrinsic is gone Finally. :D However, to land this we'll need to fix the intptrcast issues that block #803.

Uh oh!

Conversation

pvdrz commented Jun 29, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

RalfJung left a comment

Choose a reason for hiding this comment

Uh oh!

pvdrz commented Jul 3, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RalfJung commented Jul 3, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RalfJung commented Jul 3, 2019

Uh oh!

Uh oh!

bors commented Jul 3, 2019

Uh oh!

RalfJung commented Jul 3, 2019

Uh oh!

pvdrz commented Jul 3, 2019

Uh oh!

Uh oh!

RalfJung commented Jul 3, 2019

Uh oh!

bors commented Jul 3, 2019

Uh oh!

bors commented Jul 3, 2019

Uh oh!

bors commented Jul 3, 2019

Uh oh!

RalfJung commented Jul 4, 2019

Uh oh!

bors commented Jul 4, 2019

Uh oh!

bors commented Jul 4, 2019

Uh oh!

bors commented Jul 4, 2019

Uh oh!

RalfJung commented Jul 5, 2019

Uh oh!

bors commented Jul 5, 2019

Uh oh!

bors commented Jul 5, 2019

Uh oh!

RalfJung commented Jul 5, 2019

Uh oh!

bors commented Jul 5, 2019

Uh oh!

RalfJung commented Jul 5, 2019

Uh oh!

bors commented Jul 5, 2019

Uh oh!

bors commented Jul 5, 2019

Uh oh!

bors commented Jul 5, 2019

Uh oh!

RalfJung commented Jul 5, 2019

Uh oh!

bors commented Jul 5, 2019

Uh oh!

bors commented Jul 5, 2019

Uh oh!

bors commented Jul 5, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

pvdrz commented Jul 3, 2019 •

edited

Loading

RalfJung commented Jul 3, 2019 •

edited

Loading