Skip to content

Rustup to rustc 1.28.0-nightly (952f344cd 2018-05-18) #378

New issue

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

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

Already on GitHub? # to your account

Closed
wants to merge 7 commits into from

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented May 13, 2018

No description provided.

@oli-obk
Copy link
Contributor

oli-obk commented May 13, 2018

run-pass/closures is failing:

librustc_mir/interpret/eval_context.rs:1111: value_to_primval can't work with fat pointers

@bjorn3
Copy link
Member Author

bjorn3 commented May 13, 2018

Backtrace:

[...]
  13: rustc::session::bug_fmt
  14: <rustc_mir::interpret::eval_context::EvalContext<'a, 'mir, 'tcx, M>>::value_to_primval
  15: rustc_mir::interpret::operator::<impl rustc_mir::interpret::eval_context::EvalContext<'a, 'mir, 'tcx, M>>::intrinsic_with_overflow
  16: <rustc_mir::interpret::eval_context::EvalContext<'a, 'mir, 'tcx, M>>::eval_rvalue_into_place
  17: rustc_mir::interpret::step::<impl rustc_mir::interpret::eval_context::EvalContext<'a, 'mir, 'tcx, M>>::step
  18: miri::eval_main
  19: <miri::MiriCompilerCalls as rustc_driver::CompilerCalls<'a>>::build_controller::{{closure}}
[...]

Doesn't seem to be related to the changes in this PR

@oli-obk
Copy link
Contributor

oli-obk commented May 13, 2018

Indeed. I'll see what I can do on the rustc side

@oli-obk
Copy link
Contributor

oli-obk commented May 14, 2018

Maybe related : rust-lang/rust#50706

@bjorn3 bjorn3 changed the title Rustup to rustc 1.27.0-nightly (ff2ac35db 2018-05-12) Rustup to rustc 1.28.0-nightly (952f344cd 2018-05-18) May 19, 2018
src/bin/miri.rs Outdated
@@ -67,7 +67,7 @@ impl<'a> CompilerCalls<'a> for MiriCompilerCalls {
}
fn late_callback(
&mut self,
trans: &TransCrate,
trans: &CodegenBackend,
Copy link
Member

Choose a reason for hiding this comment

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

This argument should be renamed codegen_backend.

@oli-obk
Copy link
Contributor

oli-obk commented May 20, 2018

There's a bunch of new failures: Size::from_bytes: 18446744073709551614 bytes in bits doesn't fit in u64

@bjorn3
Copy link
Member Author

bjorn3 commented May 20, 2018

Those failures are inside rustc:

   7: rustc_target::abi::Size::from_bytes
   8: rustc::mir::interpret::value::Pointer::wrapping_signed_offset
   9: <rustc_mir::interpret::eval_context::EvalContext<'a, 'mir, 'tcx, miri::Evaluator<'tcx>> as miri::helpers::EvalContextExt<'tcx>>::wrapping_pointer_offset
  10: <rustc_mir::interpret::eval_context::EvalContext<'a, 'mir, 'tcx, miri::Evaluator<'tcx>> as miri::intrinsic::EvalContextExt<'tcx>>::call_intrinsic
  11: rustc_mir::interpret::terminator::<impl rustc_mir::interpret::eval_context::EvalContext<'a, 'mir, 'tcx, M>>::eval_fn_call
  12: rustc_mir::interpret::terminator::<impl rustc_mir::interpret::eval_context::EvalContext<'a, 'mir, 'tcx, M>>::eval_terminator
  13: rustc_mir::interpret::step::<impl rustc_mir::interpret::eval_context::EvalContext<'a, 'mir, 'tcx, M>>::step
  14: miri::eval_main

@bjorn3
Copy link
Member Author

bjorn3 commented May 20, 2018

screenshot_2018-05-20 miri tests run-pass ptr_arith_offset_overflow rs

@bjorn3
Copy link
Member Author

bjorn3 commented May 20, 2018

Submitted rust-lang/rust#50917

bors added a commit to rust-lang/rust that referenced this pull request May 23, 2018
Allow `Size` to be any valid `u64`

cc rust-lang/miri#378 (comment)

The alternative is to make mir::interpret's pointer offsets not be `Size`

fixes #50917

r? @eddyb
@oli-obk
Copy link
Contributor

oli-obk commented May 25, 2018

We need to allow pointers one past the end of an allocation:

pointer computed at offset 10, outside bounds of allocation 462 which has size 9

@RalfJung
Copy link
Member

RalfJung commented May 25, 2018

Nope, if the size is 9 then 8 is the last dereferencable offset and 10 is two past the end.

@bjorn3
Copy link
Member Author

bjorn3 commented May 26, 2018

rust-lang/rust#50967 required a huge amount of renaming and I still haven't got the majority of the tests passing after several hours :(

@bjorn3
Copy link
Member Author

bjorn3 commented May 26, 2018

Blocked on: rust-lang/rust#51086

@bjorn3
Copy link
Member Author

bjorn3 commented Jun 1, 2018

Closing in favour of #379

@bjorn3 bjorn3 closed this Jun 1, 2018
@bjorn3 bjorn3 deleted the rustup branch June 1, 2018 10:48
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants