user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply suggestions from code review

Browse source 
Co-Authored-By: Ralf Jung <post@ralfj.de>
Co-Authored-By: Oliver Scherer <github35764891676564198441@oli-obk.de>
This commit is contained in:
jumbatm 2020-04-30 14:38:02 +10:00
parent 5b1d6000a0
commit 894a83d409
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustc_mir/interpret/validity.rs
View file

@ -48,7 +48,7 @@ macro_rules! try_validation {
/// as a kind of validation blacklist:
///
/// ```rust
/// let v = try_validation_pat(some_fn(), Foo | Bar | Baz, "some failure", "some place");
/// let v = try_validation_pat(some_fn(), Foo | Bar | Baz, "some failure", path);
/// // Failures that match $p are thrown up as validation errors, but other errors are passed back
/// // unchanged.
/// ```
@ -59,7 +59,7 @@ macro_rules! try_validation_pat {
// We catch the error and turn it into a validation failure. We are okay with
// allocation here as this can only slow down builds that fail anyway.
$( Err($p) )|* if true => throw_validation_failure!($what, $where $(, $details)?),
Err(e) => Err::<!, _>(e)?,
Err(e) => Err::<!, _>(e)?,
}
}};
}
@ -843,10 +843,10 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
// Run it.
match visitor.visit_value(op) {
Ok(()) => Ok(()),
// Allow validation failures to be returned.
// Pass through validation failures.
Err(err) if matches!(err.kind, err_ub!(ValidationFailure { .. })) => Err(err),
// Also allow InvalidProgram to be returned, because it's likely that different callers
// will want to do different things in this situation.
// Also pass through InvalidProgram, those just indicate that we could not
// validate and each caller will know best what to do with them.
Err(err) if matches!(err.kind, InterpError::InvalidProgram(_)) => Err(err),
// Avoid other errors as those do not show *where* in the value the issue lies.
Err(err) => bug!("Unexpected error during validation: {}", err),