only allow restricting scalar layouts

oli-obk · oli-obk · commit 88ebb95f46c0 · 2018-09-11T11:25:51.000+02:00
diff --git a/src/librustc/ty/layout.rs b/src/librustc/ty/layout.rs
@@ -779,7 +779,8 @@ impl<'a, 'tcx> LayoutCx<'tcx, TyCtxt<'a, 'tcx, 'tcx>> {
                                 scalar.valid_range = *scalar.valid_range.start()..=end;
                             }
                         }
-                        _ => bug!(
+                        _ => assert!(
+                            start == Bound::Unbounded && end == Bound::Unbounded,
                             "nonscalar layout for layout_scalar_valid_range type {:?}: {:#?}",
                             def,
                             st,

Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,8 @@ impl<'a, 'tcx> LayoutCx<'tcx, TyCtxt<'a, 'tcx, 'tcx>> {`
`779`	`779`	`scalar.valid_range = *scalar.valid_range.start()..=end;`
`780`	`780`	`}`
`781`	`781`	`}`
`782`		`- _ => bug!(`
	`782`	`+ _ => assert!(`
	`783`	`+ start == Bound::Unbounded && end == Bound::Unbounded,`
`783`	`784`	`"nonscalar layout for layout_scalar_valid_range type {:?}: {:#?}",`
`784`	`785`	`def,`
`785`	`786`	`st,`