File tree Expand file tree Collapse file tree 2 files changed +5
-10
lines changed Expand file tree Collapse file tree 2 files changed +5
-10
lines changed Original file line number Diff line number Diff line change @@ -564,7 +564,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
564
564
opt_so_far = Some ( so_far) ;
565
565
} else {
566
566
// When there's a jump, push what we have so far and start anew
567
- into. push ( ( so_far. start as usize + p) ..( so_far. end as usize + p) ) ;
567
+ into. push (
568
+ ( so_far. start as usize + p) ..( so_far. end as usize + p) ,
569
+ ) ;
568
570
opt_so_far = Some ( bit..bit + 1 ) ;
569
571
} ,
570
572
// 1st time we obviously need to insert it
Original file line number Diff line number Diff line change @@ -275,9 +275,7 @@ pub fn sv_loop(
275
275
// end_ffi was called by the child
276
276
ExecEvent :: End => {
277
277
// Hand over the access info we traced
278
- event_tx
279
- . send ( MemEvents { acc_events, alloc_cutoff : page_size } )
280
- . unwrap ( ) ;
278
+ event_tx. send ( MemEvents { acc_events, alloc_cutoff : page_size } ) . unwrap ( ) ;
281
279
// And reset our values
282
280
acc_events = Vec :: new ( ) ;
283
281
ch_stack = None ;
@@ -723,12 +721,7 @@ pub unsafe extern "C" fn mempr_on() {
723
721
let len = PAGE_SIZE . load ( Ordering :: Relaxed ) . wrapping_mul ( PAGE_COUNT . load ( Ordering :: Relaxed ) ) ;
724
722
// SAFETY: Upheld by caller
725
723
unsafe {
726
- if libc:: mprotect (
727
- PAGE_ADDR . load ( Ordering :: Relaxed ) . cast ( ) ,
728
- len,
729
- libc:: PROT_NONE ,
730
- ) != 0
731
- {
724
+ if libc:: mprotect ( PAGE_ADDR . load ( Ordering :: Relaxed ) . cast ( ) , len, libc:: PROT_NONE ) != 0 {
732
725
std:: process:: exit ( -1 ) ;
733
726
}
734
727
}
You can’t perform that action at this time.
0 commit comments