diff --git a/rust-version b/rust-version index 1ba022ac969..0765203ccbc 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -1454bbd4fdac9b7272b93fe82860613dccc0afad +21867225a74d3b07c2b65e32c67f45197db36896 diff --git a/src/diagnostics.rs b/src/diagnostics.rs index 1b41ba44183..a20e8126c13 100644 --- a/src/diagnostics.rs +++ b/src/diagnostics.rs @@ -137,8 +137,7 @@ pub fn report_error<'tcx, 'mir>( access.uninit_ptr.offset.bytes(), access.uninit_ptr.offset.bytes() + access.uninit_size.bytes(), ); - ecx.memory.dump_alloc(access.uninit_ptr.alloc_id); - eprintln!(); + eprintln!("{:?}", ecx.memory.dump_alloc(access.uninit_ptr.alloc_id)); } _ => {} } diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs index 98e66db92da..0379ec0c077 100644 --- a/src/shims/foreign_items.rs +++ b/src/shims/foreign_items.rs @@ -1,5 +1,7 @@ use std::{convert::{TryInto, TryFrom}, iter}; +use log::trace; + use rustc_hir::def_id::DefId; use rustc_middle::{mir, ty}; use rustc_target::abi::{Align, Size}; @@ -175,7 +177,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx // Third: functions that return. if this.emulate_foreign_item_by_name(link_name, args, dest, ret)? { - this.dump_place(*dest); + trace!("{:?}", this.dump_place(*dest)); this.go_to_block(ret); } diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs index ee64b1ffca4..105026c70d8 100644 --- a/src/shims/intrinsics.rs +++ b/src/shims/intrinsics.rs @@ -1,5 +1,7 @@ use std::iter; +use log::trace; + use rustc_attr as attr; use rustc_ast::ast::FloatTy; use rustc_middle::{mir, ty}; @@ -524,7 +526,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx name => throw_unsup_format!("unimplemented intrinsic: {}", name), } - this.dump_place(*dest); + trace!("{:?}", this.dump_place(*dest)); this.go_to_block(ret); Ok(()) } diff --git a/src/shims/posix/macos/dlsym.rs b/src/shims/posix/macos/dlsym.rs index 0236b10e5fc..c9f57090ff8 100644 --- a/src/shims/posix/macos/dlsym.rs +++ b/src/shims/posix/macos/dlsym.rs @@ -1,5 +1,7 @@ use rustc_middle::mir; +use log::trace; + use crate::*; use helpers::check_arg_count; @@ -42,7 +44,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx } } - this.dump_place(*dest); + trace!("{:?}", this.dump_place(*dest)); this.go_to_block(ret); Ok(()) } diff --git a/src/shims/windows/dlsym.rs b/src/shims/windows/dlsym.rs index 737fd4314f6..91bfedff8db 100644 --- a/src/shims/windows/dlsym.rs +++ b/src/shims/windows/dlsym.rs @@ -1,5 +1,7 @@ use rustc_middle::mir; +use log::trace; + use crate::*; use helpers::check_arg_count; use shims::windows::sync::EvalContextExt as _; @@ -73,7 +75,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx } } - this.dump_place(*dest); + trace!("{:?}", this.dump_place(*dest)); this.go_to_block(ret); Ok(()) }