This commit is contained in:
Ralf Jung 2020-07-30 18:31:19 +02:00
parent 720c2bf8f8
commit d340933112
6 changed files with 14 additions and 7 deletions

View File

@ -1 +1 @@
1454bbd4fdac9b7272b93fe82860613dccc0afad 21867225a74d3b07c2b65e32c67f45197db36896

View File

@ -137,8 +137,7 @@ pub fn report_error<'tcx, 'mir>(
access.uninit_ptr.offset.bytes(), access.uninit_ptr.offset.bytes(),
access.uninit_ptr.offset.bytes() + access.uninit_size.bytes(), access.uninit_ptr.offset.bytes() + access.uninit_size.bytes(),
); );
ecx.memory.dump_alloc(access.uninit_ptr.alloc_id); eprintln!("{:?}", ecx.memory.dump_alloc(access.uninit_ptr.alloc_id));
eprintln!();
} }
_ => {} _ => {}
} }

View File

@ -1,5 +1,7 @@
use std::{convert::{TryInto, TryFrom}, iter}; use std::{convert::{TryInto, TryFrom}, iter};
use log::trace;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_middle::{mir, ty}; use rustc_middle::{mir, ty};
use rustc_target::abi::{Align, Size}; use rustc_target::abi::{Align, Size};
@ -175,7 +177,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
// Third: functions that return. // Third: functions that return.
if this.emulate_foreign_item_by_name(link_name, args, dest, ret)? { 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); this.go_to_block(ret);
} }

View File

@ -1,5 +1,7 @@
use std::iter; use std::iter;
use log::trace;
use rustc_attr as attr; use rustc_attr as attr;
use rustc_ast::ast::FloatTy; use rustc_ast::ast::FloatTy;
use rustc_middle::{mir, ty}; 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), name => throw_unsup_format!("unimplemented intrinsic: {}", name),
} }
this.dump_place(*dest); trace!("{:?}", this.dump_place(*dest));
this.go_to_block(ret); this.go_to_block(ret);
Ok(()) Ok(())
} }

View File

@ -1,5 +1,7 @@
use rustc_middle::mir; use rustc_middle::mir;
use log::trace;
use crate::*; use crate::*;
use helpers::check_arg_count; 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); this.go_to_block(ret);
Ok(()) Ok(())
} }

View File

@ -1,5 +1,7 @@
use rustc_middle::mir; use rustc_middle::mir;
use log::trace;
use crate::*; use crate::*;
use helpers::check_arg_count; use helpers::check_arg_count;
use shims::windows::sync::EvalContextExt as _; 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); this.go_to_block(ret);
Ok(()) Ok(())
} }