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

fix handling univariant enums (62)

Browse source
This commit is contained in:
Ralf Jung 2017-07-13 20:39:49 -07:00 • committed by Oliver Schneider
parent 5440fe4b52
commit ee209ccd74
No known key found for this signature in database
GPG key ID: A69F8D225B3AD7D9
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc_mir/interpret/lvalue.rs
View file

@ -652,8 +652,12 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
let variant = &adt.variants[variant_idx];
if variant.fields.len() > 0 {
// Downcast to this variant
let lvalue = self.eval_lvalue_projection(lvalue, ty, &mir::ProjectionElem::Downcast(adt, variant_idx))?;
// Downcast to this variant, if needed
let lvalue = if adt.variants.len() > 1 {
self.eval_lvalue_projection(lvalue, ty, &mir::ProjectionElem::Downcast(adt, variant_idx))?
} else {
lvalue
};
// Recursively validate the fields
self.validate_variant(lvalue, ty, variant, subst, vctx)