Only emit a discrimiant tag for enums

oli-obk · oli-obk · commit 5582b1955961 · 2021-03-29T12:30:55.000Z
diff --git a/compiler/rustc_mir/src/const_eval/mod.rs b/compiler/rustc_mir/src/const_eval/mod.rs
@@ -110,7 +110,7 @@ fn const_to_valtree_inner<'tcx>(
 
             let variant = ecx.read_discriminant(&place.into()).unwrap().1;
 
-            branches(def.variants[variant].fields.len(), Some(variant))
+            branches(def.variants[variant].fields.len(), def.is_enum().then_some(variant))
         }
 
         ty::Never

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ fn const_to_valtree_inner<'tcx>(`
`110`	`110`
`111`	`111`	`let variant = ecx.read_discriminant(&place.into()).unwrap().1;`
`112`	`112`
`113`		`- branches(def.variants[variant].fields.len(), Some(variant))`
	`113`	`+ branches(def.variants[variant].fields.len(), def.is_enum().then_some(variant))`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`ty::Never`