Prepare for layout use only params

bjorn3 · bjorn3 · commit 286a502b601e · 2018-03-29T13:44:23.000+02:00
diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs
@@ -834,7 +834,7 @@ for ty::TypeVariants<'gcx>
             TyStr   |
             TyError |
             TyNever |
-            TyUnusedParam => {
+            TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => {
                 // Nothing more to hash.
             }
             TyInt(int_ty) => {
diff --git a/src/librustc/infer/canonical.rs b/src/librustc/infer/canonical.rs
@@ -635,7 +635,8 @@ impl<'cx, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for Canonicalizer<'cx, 'gcx, 'tcx>
             | ty::TyForeign(..)
             | ty::TyParam(..)
             | ty::TyAnon(..)
-            | ty::TyUnusedParam => {
+            | ty::TyUnusedParam
+            | ty::TyLayoutOnlyParam(..) => {
                 if t.flags.intersects(self.needs_canonical_flags) {
                     t.super_fold_with(self)
                 } else {
diff --git a/src/librustc/infer/freshen.rs b/src/librustc/infer/freshen.rs
@@ -200,7 +200,7 @@ impl<'a, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for TypeFreshener<'a, 'gcx, 'tcx> {
             ty::TyAnon(..) => {
                 t.super_fold_with(self)
             }
-            ty::TyUnusedParam => bug!("Unexpected TyUnusedParam in TypeFreshener"),
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in TypeFreshener"),
         }
     }
 }
diff --git a/src/librustc/traits/coherence.rs b/src/librustc/traits/coherence.rs
@@ -481,7 +481,7 @@ fn ty_is_local_constructor(ty: Ty, in_crate: InCrate) -> bool {
         ty::TyGenerator(..) |
         ty::TyGeneratorWitness(..) |
         ty::TyAnon(..) |
-        ty::TyUnusedParam => {
+        ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => {
             bug!("ty_is_local invoked on unexpected type: {:?}", ty)
         }
     }
diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs
@@ -264,7 +264,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
                 ty::TyForeign(..) => Some(19),
                 ty::TyGeneratorWitness(..) => Some(20),
                 ty::TyInfer(..) | ty::TyError => None,
-                ty::TyUnusedParam => bug!("unexpected TyUnusedParam in fuzzy_match_tys"),
+                ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("unexpected TyUnusedParam in fuzzy_match_tys"),
             }
         }
 
diff --git a/src/librustc/traits/query/dropck_outlives.rs b/src/librustc/traits/query/dropck_outlives.rs
@@ -262,6 +262,8 @@ fn trivial_dropck_outlives<'cx, 'tcx>(tcx: TyCtxt<'cx, '_, 'tcx>, ty: Ty<'tcx>)
         | ty::TyInfer(_)
         | ty::TyGenerator(..) => false,
 
-        ty::TyUnusedParam => bug!("Unexpected TyUnusedParam in trivial_dropck_outlives"),
+        ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => {
+            bug!("Unexpected {:?} in trivial_dropck_outlives", ty)
+        }
     }
 }
diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs
@@ -2037,7 +2037,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
                 ))
             }
 
-            ty::TyProjection(_) | ty::TyParam(_) | ty::TyUnusedParam | ty::TyAnon(..) => None,
+            ty::TyProjection(_) | ty::TyParam(_) | ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) | ty::TyAnon(..) => None,
             ty::TyInfer(ty::TyVar(_)) => Ambiguous,
 
             ty::TyInfer(ty::CanonicalTy(_)) |
@@ -2114,7 +2114,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
                 bug!("asked to assemble builtin bounds of unexpected type: {:?}",
                      self_ty);
             }
-            ty::TyUnusedParam => bug!("Unexpected TyUnusedParam in copy_clone_conditions"),
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in copy_clone_conditions"),
         }
     }
 
@@ -2152,6 +2152,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
             ty::TyProjection(..) |
             ty::TyInfer(ty::CanonicalTy(_)) |
             ty::TyUnusedParam |
+            ty::TyLayoutOnlyParam(_, _) |
             ty::TyInfer(ty::TyVar(_)) |
             ty::TyInfer(ty::FreshTy(_)) |
             ty::TyInfer(ty::FreshIntTy(_)) |
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
@@ -1829,7 +1829,7 @@ impl<'a, 'tcx> TyCtxt<'a, 'tcx, 'tcx> {
             self,
             TyAdt, TyArray, TySlice, TyRawPtr, TyRef, TyFnDef, TyFnPtr,
             TyGenerator, TyGeneratorWitness, TyDynamic, TyClosure, TyTuple,
-            TyParam, TyInfer, TyProjection, TyAnon, TyForeign);
+            TyParam, TyLayoutOnlyParam, TyInfer, TyProjection, TyAnon, TyForeign);
 
         println!("Substs interner: #{}", self.interners.substs.borrow().len());
         println!("Region interner: #{}", self.interners.region.borrow().len());
diff --git a/src/librustc/ty/error.rs b/src/librustc/ty/error.rs
@@ -232,7 +232,7 @@ impl<'a, 'gcx, 'lcx, 'tcx> ty::TyS<'tcx> {
                     "type parameter".to_string()
                 }
             }
-            ty::TyUnusedParam => "unused type parameter".to_string(),
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => "unused type parameter".to_string(),
             ty::TyAnon(..) => "anonymized type".to_string(),
             ty::TyError => "type error".to_string(),
         }
diff --git a/src/librustc/ty/fast_reject.rs b/src/librustc/ty/fast_reject.rs
@@ -121,7 +121,7 @@ pub fn simplify_type<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>,
         ty::TyForeign(def_id) => {
             Some(ForeignSimplifiedType(def_id))
         }
-        ty::TyInfer(_) | ty::TyError | ty::TyUnusedParam => None,
+        ty::TyInfer(_) | ty::TyError | ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => None,
     }
 }
 
diff --git a/src/librustc/ty/flags.rs b/src/librustc/ty/flags.rs
@@ -190,7 +190,7 @@ impl FlagComputation {
             &ty::TyFnPtr(f) => {
                 self.add_fn_sig(f);
             }
-            &ty::TyUnusedParam => bug!("Unexpected TyUnusedParam in FlagComputation::for_sty"),
+            &ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in FlagComputation::for_sty"),
         }
     }
 
diff --git a/src/librustc/ty/item_path.rs b/src/librustc/ty/item_path.rs
@@ -373,7 +373,7 @@ pub fn characteristic_def_id_of_type(ty: Ty) -> Option<DefId> {
         ty::TyProjection(_) |
         ty::TyParam(_) |
         ty::TyAnon(..) |
-        ty::TyUnusedParam |
+        ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) |
         ty::TyInfer(_) |
         ty::TyError |
         ty::TyGeneratorWitness(..) |
diff --git a/src/librustc/ty/layout.rs b/src/librustc/ty/layout.rs
@@ -234,7 +234,7 @@ pub enum Endian {
 }
 
 /// Size of a type in bytes.
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, RustcEncodable, RustcDecodable)]
 pub struct Size {
     raw: u64
 }
@@ -1712,7 +1712,7 @@ impl<'a, 'tcx> LayoutCx<'tcx, TyCtxt<'a, 'tcx, 'tcx>> {
             ty::TyParam(_) => {
                 return Err(LayoutError::Unknown(ty));
             }
-            ty::TyUnusedParam | ty::TyGeneratorWitness(..) | ty::TyInfer(_) | ty::TyError => {
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) | ty::TyGeneratorWitness(..) | ty::TyInfer(_) | ty::TyError => {
                 bug!("LayoutDetails::compute: unexpected type `{}`", ty)
             }
         })
@@ -2287,7 +2287,7 @@ impl<'a, 'tcx> TyLayout<'tcx> {
                 }
             }
 
-            ty::TyProjection(_) | ty::TyAnon(..) | ty::TyParam(_) | ty::TyUnusedParam |
+            ty::TyProjection(_) | ty::TyAnon(..) | ty::TyParam(_) | ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) |
             ty::TyInfer(_) | ty::TyError => {
                 bug!("TyLayout::field_type: unexpected type `{}`", self.ty)
             }
diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs
@@ -2069,7 +2069,7 @@ impl<'a, 'gcx, 'tcx> AdtDef {
                 }
             }
 
-            TyUnusedParam | TyInfer(..) => {
+            TyUnusedParam | ty::TyLayoutOnlyParam(_, _) | TyInfer(..) => {
                 bug!("unexpected type `{:?}` in sized_constraint_for_ty",
                      ty)
             }
diff --git a/src/librustc/ty/outlives.rs b/src/librustc/ty/outlives.rs
@@ -167,7 +167,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
                     self.compute_components(subty, out);
                 }
             }
-            ty::TyUnusedParam => bug!("Unexpected TyUnusedParam in compute_components"),
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in compute_components"),
         }
     }
 
diff --git a/src/librustc/ty/structural_impls.rs b/src/librustc/ty/structural_impls.rs
@@ -865,7 +865,7 @@ impl<'tcx> TypeFoldable<'tcx> for Ty<'tcx> {
             ty::TyAnon(did, substs) => ty::TyAnon(did, substs.fold_with(folder)),
             ty::TyBool | ty::TyChar | ty::TyStr | ty::TyInt(_) |
             ty::TyUint(_) | ty::TyFloat(_) | ty::TyError | ty::TyInfer(_) |
-            ty::TyParam(..) | ty::TyUnusedParam | ty::TyNever | ty::TyForeign(..) => return self
+            ty::TyParam(..) | ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) | ty::TyNever | ty::TyForeign(..) => return self
         };
 
         if self.sty == sty {
@@ -900,7 +900,7 @@ impl<'tcx> TypeFoldable<'tcx> for Ty<'tcx> {
             ty::TyAnon(_, ref substs) => substs.visit_with(visitor),
             ty::TyBool | ty::TyChar | ty::TyStr | ty::TyInt(_) |
             ty::TyUint(_) | ty::TyFloat(_) | ty::TyError | ty::TyInfer(_) |
-            ty::TyParam(..) | ty::TyUnusedParam | ty::TyNever | ty::TyForeign(..) => false,
+            ty::TyParam(..) | ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) | ty::TyNever | ty::TyForeign(..) => false,
         }
     }
 
diff --git a/src/librustc/ty/sty.rs b/src/librustc/ty/sty.rs
@@ -18,6 +18,7 @@ use rustc_data_structures::indexed_vec::Idx;
 use ty::subst::{Substs, Subst, Kind, UnpackedKind};
 use ty::{self, AdtDef, TypeFlags, Ty, TyCtxt, TypeFoldable};
 use ty::{Slice, TyS};
+use ty::layout::{Size, Align};
 use util::captures::Captures;
 
 use std::iter;
@@ -167,6 +168,9 @@ pub enum TypeVariants<'tcx> {
     /// Substitution for a unused type parameter; see rustc_mir::monomorphize::deduplicate_instances
     TyUnusedParam,
 
+    /// Substitution for a type parameter whose size and layout is the onlything that matters
+    TyLayoutOnlyParam(Size, Align),
+
     /// A type variable used during type-checking.
     TyInfer(InferTy),
 
@@ -1636,7 +1640,7 @@ impl<'a, 'gcx, 'tcx> TyS<'tcx> {
             TyTuple(..) |
             TyForeign(..) |
             TyParam(_) |
-            TyUnusedParam |
+            TyUnusedParam | ty::TyLayoutOnlyParam(_, _) |
             TyInfer(_) |
             TyError => {
                 vec![]
diff --git a/src/librustc/ty/util.rs b/src/librustc/ty/util.rs
@@ -734,7 +734,7 @@ impl<'a, 'gcx, 'tcx, W> TypeVisitor<'tcx> for TypeIdHasher<'a, 'gcx, 'tcx, W>
             TySlice(_) => {}
 
             // This can be generated by collapse_interchangable_instances
-            TyUnusedParam => self.hash("<unused param>"),
+            TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => self.hash("<unused param>"),
 
             TyError |
             TyInfer(_) => bug!("TypeIdHasher: unexpected type {}", ty)
@@ -1126,7 +1126,7 @@ fn needs_drop_raw<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
                 |variant| variant.fields.iter().any(
                     |field| needs_drop(field.ty(tcx, substs)))),
 
-        ty::TyUnusedParam => bug!("Unexpected TyUnusedParam in needs_drop_raw"),
+        ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in needs_drop_raw"),
     }
 }
 
diff --git a/src/librustc/ty/walk.rs b/src/librustc/ty/walk.rs
@@ -82,7 +82,7 @@ pub fn walk_shallow<'tcx>(ty: Ty<'tcx>) -> AccIntoIter<TypeWalkerArray<'tcx>> {
 fn push_subtypes<'tcx>(stack: &mut TypeWalkerStack<'tcx>, parent_ty: Ty<'tcx>) {
     match parent_ty.sty {
         ty::TyBool | ty::TyChar | ty::TyInt(_) | ty::TyUint(_) | ty::TyFloat(_) |
-        ty::TyStr | ty::TyInfer(_) | ty::TyParam(_) | ty::TyUnusedParam | ty::TyNever |
+        ty::TyStr | ty::TyInfer(_) | ty::TyParam(_) | ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) | ty::TyNever |
         ty::TyError | ty::TyForeign(..) => {
         }
         ty::TyArray(ty, len) => {
diff --git a/src/librustc/ty/wf.rs b/src/librustc/ty/wf.rs
@@ -261,7 +261,7 @@ impl<'a, 'gcx, 'tcx> WfPredicates<'a, 'gcx, 'tcx> {
                 ty::TyGeneratorWitness(..) |
                 ty::TyNever |
                 ty::TyParam(_) |
-                ty::TyUnusedParam |
+                ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) |
                 ty::TyForeign(..) => {
                     // WfScalar, WfParameter, etc
                 }
diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs
@@ -1044,7 +1044,7 @@ define_print! {
                 TyInfer(infer_ty) => write!(f, "{}", infer_ty),
                 TyError => write!(f, "[type error]"),
                 TyParam(ref param_ty) => write!(f, "{}", param_ty),
-                TyUnusedParam => write!(f, "[unused type param]"),
+                TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => write!(f, "[unused type param]"),
                 TyAdt(def, substs) => cx.parameterized(f, substs, def.did, &[]),
                 TyDynamic(data, r) => {
                     data.print(f, cx)?;
diff --git a/src/librustc_lint/types.rs b/src/librustc_lint/types.rs
@@ -705,7 +705,7 @@ impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> {
             ty::TyForeign(..) => FfiSafe,
 
             ty::TyParam(..) |
-            ty::TyUnusedParam |
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) |
             ty::TyInfer(..) |
             ty::TyError |
             ty::TyClosure(..) |
diff --git a/src/librustc_mir/monomorphize/deduplicate_instances.rs b/src/librustc_mir/monomorphize/deduplicate_instances.rs
@@ -9,9 +9,10 @@
 // except according to those terms.
 
 use rustc_data_structures::indexed_vec::IndexVec;
-use rustc::ty::{self, TyCtxt, Ty, ParamTy, TypeFoldable, Instance};
+use rustc::ty::{self, TyCtxt, Ty, TypeVariants, ParamTy, TypeFoldable, Instance, ParamEnv};
 use rustc::ty::fold::TypeFolder;
 use rustc::ty::subst::{Kind, UnpackedKind};
+use rustc::ty::layout::{LayoutCx, LayoutOf};
 use rustc::middle::const_val::ConstVal;
 use rustc::mir::{Mir, Rvalue, Location};
 use rustc::mir::visit::{Visitor, TyContext};
@@ -42,7 +43,6 @@ pub(crate) fn collapse_interchangable_instances<'a, 'tcx>(
     }
     match instance.ty(tcx).sty {
         ty::TyFnDef(def_id, _) => {
-            //let attrs = tcx.item_attrs(def_id);
             if tcx.lang_items().items().iter().find(|l|**l == Some(def_id)).is_some() {
                 return instance; // Lang items dont work otherwise
             }
@@ -51,7 +51,7 @@ pub(crate) fn collapse_interchangable_instances<'a, 'tcx>(
     }
 
     let used_substs = used_substs_for_instance(tcx, instance);
-    instance.substs = tcx._intern_substs(&instance.substs.into_iter().enumerate().map(|(i, subst)| {
+    instance.substs = tcx.intern_substs(&instance.substs.into_iter().enumerate().map(|(i, subst)| {
         if let UnpackedKind::Type(ty) = subst.unpack() {
             let ty = match used_substs.parameters[ParamIdx(i as u32)] {
                 ParamUsage::Unused => {
@@ -89,7 +89,16 @@ pub(crate) fn collapse_interchangable_instances<'a, 'tcx>(
                         tcx.mk_ty(ty::TyNever)
                     }
                 }
-                ParamUsage::LayoutUsed | ParamUsage::Used => ty.into(),
+                ParamUsage::LayoutUsed => {
+                    let layout_cx = LayoutCx {
+                        tcx,
+                        param_env: ParamEnv::reveal_all(),
+                    };
+                    let layout = layout_cx.layout_of(ty).unwrap();
+                    let (size, align) = layout.size_and_align();
+                    tcx.mk_ty(TypeVariants::TyLayoutOnlyParam(size, align))
+                }
+                ParamUsage::Used => ty.into(),
             };
             Kind::from(ty)
         } else {
diff --git a/src/librustc_mir/monomorphize/item.rs b/src/librustc_mir/monomorphize/item.rs
@@ -387,7 +387,7 @@ impl<'a, 'tcx> DefPathBasedNames<'a, 'tcx> {
             ty::TyInfer(_) |
             ty::TyProjection(..) |
             ty::TyParam(_) |
-            ty::TyUnusedParam |
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) |
             ty::TyGeneratorWitness(_) |
             ty::TyAnon(..) => {
                 bug!("DefPathBasedNames: Trying to create type name for \
diff --git a/src/librustc_traits/dropck_outlives.rs b/src/librustc_traits/dropck_outlives.rs
@@ -239,7 +239,9 @@ fn dtorck_constraint_for_ty<'a, 'gcx, 'tcx>(
             Err(NoSolution)
         }
 
-        ty::TyUnusedParam => bug!("Unexpected TyUnusedParam in dtorck_constraint_for_ty"),
+        ty::TyUnusedParam | ty::TyLayoutOnlyParam(..) => {
+            bug!("Unexpected {:?} in dtorck_constraint_for_ty", ty);
+        }
     };
 
     debug!("dtorck_constraint_for_ty({:?}) = {:?}", ty, result);
diff --git a/src/librustc_trans/debuginfo/type_names.rs b/src/librustc_trans/debuginfo/type_names.rs
@@ -171,7 +171,7 @@ pub fn push_debuginfo_type_name<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>,
         ty::TyGenerator(..) => {
             output.push_str("generator");
         }
-        ty::TyUnusedParam => {
+        ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => {
             output.push_str("[unused type param]");
         }
         ty::TyError |
diff --git a/src/librustc_typeck/check/cast.rs b/src/librustc_typeck/check/cast.rs
@@ -137,7 +137,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
                     span, &format!("`{:?}` should be sized but is not?", t));
                 return Err(ErrorReported);
             }
-            ty::TyUnusedParam => bug!("Unexpected TyUnusedParam in FnCtxt::pointer_kind"),
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in FnCtxt::pointer_kind"),
         })
     }
 }
diff --git a/src/librustc_typeck/variance/constraints.rs b/src/librustc_typeck/variance/constraints.rs
@@ -334,7 +334,7 @@ impl<'a, 'tcx> ConstraintContext<'a, 'tcx> {
                 // types, where we use TyError as the Self type
             }
 
-            ty::TyUnusedParam |
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) |
             ty::TyGeneratorWitness(..) |
             ty::TyInfer(..) => {
                 bug!("unexpected type encountered in \
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
@@ -2836,7 +2836,7 @@ impl<'tcx> Clean<Type> for Ty<'tcx> {
 
             ty::TyClosure(..) | ty::TyGenerator(..) => Tuple(vec![]), // FIXME(pcwalton)
 
-            ty::TyUnusedParam => panic!("TyUnusedParam"),
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => panic!("TyUnusedParam"),
             ty::TyGeneratorWitness(..) => panic!("TyGeneratorWitness"),
             ty::TyInfer(..) => panic!("TyInfer"),
             ty::TyError => panic!("TyError"),

Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ for ty::TypeVariants<'gcx>`
`834`	`834`	`TyStr \|`
`835`	`835`	`TyError \|`
`836`	`836`	`TyNever \|`
`837`		`- TyUnusedParam => {`
	`837`	`+ TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => {`
`838`	`838`	`// Nothing more to hash.`
`839`	`839`	`}`
`840`	`840`	`TyInt(int_ty) => {`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ impl<'a, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for TypeFreshener<'a, 'gcx, 'tcx> {`
`200`	`200`	`ty::TyAnon(..) => {`
`201`	`201`	`t.super_fold_with(self)`
`202`	`202`	`}`
`203`		`- ty::TyUnusedParam => bug!("Unexpected TyUnusedParam in TypeFreshener"),`
	`203`	`+ ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in TypeFreshener"),`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`	`}`
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ fn ty_is_local_constructor(ty: Ty, in_crate: InCrate) -> bool {`
`481`	`481`	`ty::TyGenerator(..) \|`
`482`	`482`	`ty::TyGeneratorWitness(..) \|`
`483`	`483`	`ty::TyAnon(..) \|`
`484`		`- ty::TyUnusedParam => {`
	`484`	`+ ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => {`
`485`	`485`	`bug!("ty_is_local invoked on unexpected type: {:?}", ty)`
`486`	`486`	`}`
`487`	`487`	`}`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {`
`264`	`264`	`ty::TyForeign(..) => Some(19),`
`265`	`265`	`ty::TyGeneratorWitness(..) => Some(20),`
`266`	`266`	`ty::TyInfer(..) \| ty::TyError => None,`
`267`		`- ty::TyUnusedParam => bug!("unexpected TyUnusedParam in fuzzy_match_tys"),`
	`267`	`+ ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => bug!("unexpected TyUnusedParam in fuzzy_match_tys"),`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`
Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,8 @@ fn trivial_dropck_outlives<'cx, 'tcx>(tcx: TyCtxt<'cx, '_, 'tcx>, ty: Ty<'tcx>)`
`262`	`262`	`\| ty::TyInfer(_)`
`263`	`263`	`\| ty::TyGenerator(..) => false,`
`264`	`264`
`265`		`- ty::TyUnusedParam => bug!("Unexpected TyUnusedParam in trivial_dropck_outlives"),`
	`265`	`+ ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => {`
	`266`	`+ bug!("Unexpected {:?} in trivial_dropck_outlives", ty)`
	`267`	`+ }`
`266`	`268`	`}`
`267`	`269`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2037,7 +2037,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {`
`2037`	`2037`	`))`
`2038`	`2038`	`}`
`2039`	`2039`
`2040`		`- ty::TyProjection(_) \| ty::TyParam(_) \| ty::TyUnusedParam \| ty::TyAnon(..) => None,`
	`2040`	`+ ty::TyProjection(_) \| ty::TyParam(_) \| ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) \| ty::TyAnon(..) => None,`
`2041`	`2041`	`ty::TyInfer(ty::TyVar(_)) => Ambiguous,`
`2042`	`2042`
`2043`	`2043`	`ty::TyInfer(ty::CanonicalTy(_)) \|`
`@@ -2114,7 +2114,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {`
`2114`	`2114`	`bug!("asked to assemble builtin bounds of unexpected type: {:?}",`
`2115`	`2115`	`self_ty);`
`2116`	`2116`	`}`
`2117`		`- ty::TyUnusedParam => bug!("Unexpected TyUnusedParam in copy_clone_conditions"),`
	`2117`	`+ ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in copy_clone_conditions"),`
`2118`	`2118`	`}`
`2119`	`2119`	`}`
`2120`	`2120`
`@@ -2152,6 +2152,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {`
`2152`	`2152`	`ty::TyProjection(..) \|`
`2153`	`2153`	`ty::TyInfer(ty::CanonicalTy(_)) \|`
`2154`	`2154`	`ty::TyUnusedParam \|`
	`2155`	`+ ty::TyLayoutOnlyParam(_, _) \|`
`2155`	`2156`	`ty::TyInfer(ty::TyVar(_)) \|`
`2156`	`2157`	`ty::TyInfer(ty::FreshTy(_)) \|`
`2157`	`2158`	`ty::TyInfer(ty::FreshIntTy(_)) \|`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ impl<'a, 'gcx, 'lcx, 'tcx> ty::TyS<'tcx> {`
`232`	`232`	`"type parameter".to_string()`
`233`	`233`	`}`
`234`	`234`	`}`
`235`		`- ty::TyUnusedParam => "unused type parameter".to_string(),`
	`235`	`+ ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => "unused type parameter".to_string(),`
`236`	`236`	`ty::TyAnon(..) => "anonymized type".to_string(),`
`237`	`237`	`ty::TyError => "type error".to_string(),`
`238`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ pub fn simplify_type<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>,`
`121`	`121`	`ty::TyForeign(def_id) => {`
`122`	`122`	`Some(ForeignSimplifiedType(def_id))`
`123`	`123`	`}`
`124`		`- ty::TyInfer(_) \| ty::TyError \| ty::TyUnusedParam => None,`
	`124`	`+ ty::TyInfer(_) \| ty::TyError \| ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => None,`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`