diff options
| author | bors <bors@rust-lang.org> | 2022-09-18 12:07:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-18 12:07:56 +0000 |
| commit | fd05ff5290afb19e9c79984e3802dca1cb2800f3 (patch) | |
| tree | 2fb9a19decf90aca067ba3765c2748091eea8def | |
| parent | bb3bac0373b44e77252ee92dda77ff76c7094f03 (diff) | |
| parent | 7fdd924ce49fd35e6d1b56fa43ede8b7975ad49c (diff) | |
| download | rust-fd05ff5290afb19e9c79984e3802dca1cb2800f3.tar.gz rust-fd05ff5290afb19e9c79984e3802dca1cb2800f3.zip | |
Auto merge of #2546 - RalfJung:comments, r=RalfJung
add/fix some comments
| -rw-r--r-- | src/eval.rs | 5 | ||||
| -rw-r--r-- | src/shims/windows/foreign_items.rs | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/eval.rs b/src/eval.rs index e1ef7fa9817..1be2a8990a6 100644 --- a/src/eval.rs +++ b/src/eval.rs @@ -295,7 +295,10 @@ pub fn create_ecx<'mir, 'tcx: 'mir>( let main_ptr = ecx.create_fn_alloc_ptr(FnVal::Instance(entry_instance)); - let sigpipe = 2; // Inlining of `DEFAULT` from https://github.com/rust-lang/rust/blob/master/compiler/rustc_session/src/config/sigpipe.rs + // Inlining of `DEFAULT` from + // https://github.com/rust-lang/rust/blob/master/compiler/rustc_session/src/config/sigpipe.rs. + // Alaways using DEFAULT is okay since we don't support signals in Miri anyway. + let sigpipe = 2; ecx.call_function( start_instance, diff --git a/src/shims/windows/foreign_items.rs b/src/shims/windows/foreign_items.rs index 05014a3331d..88129ed8857 100644 --- a/src/shims/windows/foreign_items.rs +++ b/src/shims/windows/foreign_items.rs @@ -294,8 +294,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx let flags = this.read_scalar(flags)?.to_u32()?; match flags { 0 => { - // BCRYPT_RNG_ALG_HANDLE if algorithm != 0x81 { + // BCRYPT_RNG_ALG_HANDLE throw_unsup_format!( "BCryptGenRandom algorithm must be BCRYPT_RNG_ALG_HANDLE when the flag is 0" ); |