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

bump Rust #777

Merged
merged 3 commits into from
Jun 21, 2019
Merged

bump Rust #777

merged 3 commits into from
Jun 21, 2019

Conversation

RalfJung
Copy link
Member

Mostly to make sure rust-lang/rust#60341 doesn't break us on macOS (Rust CI does not test tools on macOS).

@RalfJung
Copy link
Member Author

Failure only on 32bit Windows... WTF.^^

@RalfJung
Copy link
Member Author

I had to add some more special rules to allow pointer > 1-style comparisons.

I didn't bother doing this in full generality because hopefully @christianpoveda will have intptrcast finished sooner rather than later, and then we can talk about pretty much requiring that to be enabled to allow executing pre-main stuff...

@RalfJung
Copy link
Member Author

@oli-obk does this look good to you?

@RalfJung RalfJung changed the title bump Rust, no changes needed bump Rust Jun 20, 2019
@@ -109,6 +109,27 @@ impl<'mir, 'tcx> EvalContextExt<'tcx> for super::MiriEvalContext<'mir, 'tcx> {
err!(InvalidPointerMath)
}
}
Gt | Ge if left.is_ptr() && right.is_bits() => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean it doesn't really matter with int2ptr around the corner, but why is this not implemented commutatively?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't find a good way to do this without copying the code and, as you said, with int2ptr around the corner it just does not seem worth the effort.

@oli-obk
Copy link
Contributor

oli-obk commented Jun 21, 2019

lgtm

@RalfJung RalfJung merged commit 03cc719 into rust-lang:master Jun 21, 2019
@RalfJung RalfJung deleted the rustup branch June 21, 2019 07:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants