Attempt to fix Cranelift

Author: eholk

compiler/rustc_codegen_cranelift/src/abi/mod.rs

@@ -578,7 +578,7 @@ pub(crate) fn codegen_drop<'tcx>(
         // we don't actually need to drop anything
     } else {
         match ty.kind() {
-            ty::Dynamic(_, _, ty::Dyn) => {
+            ty::Dynamic(_, _) => {
                 // IN THIS ARM, WE HAVE:
                 // ty = *mut (dyn Trait)
                 // which is: exists<T> ( *mut T,    Vtable<T: Trait> )
@@ -608,7 +608,7 @@ pub(crate) fn codegen_drop<'tcx>(
                 let sig = fx.bcx.import_signature(sig);
                 fx.bcx.ins().call_indirect(sig, drop_fn, &[ptr]);
             }
-            ty::Dynamic(_, _, ty::DynStar) => {
+            ty::DynStar(_, _) => {
                 // IN THIS ARM, WE HAVE:
                 // ty = *mut (dyn* Trait)
                 // which is: *mut exists<T: sizeof(T) == sizeof(usize)> (T, Vtable<T: Trait>)

compiler/rustc_codegen_cranelift/src/unsize.rs

@@ -25,12 +25,8 @@ pub(crate) fn unsized_info<'tcx>(
             .bcx
             .ins()
             .iconst(fx.pointer_type, len.eval_usize(fx.tcx, ParamEnv::reveal_all()) as i64),
-        (
-            &ty::Dynamic(ref data_a, _, src_dyn_kind),
-            &ty::Dynamic(ref data_b, _, target_dyn_kind),
-        ) => {
-            assert_eq!(src_dyn_kind, target_dyn_kind);
-
+        (&ty::Dynamic(ref data_a, _), &ty::Dynamic(ref data_b, _))
+        | (&ty::DynStar(ref data_a, _), &ty::DynStar(ref data_b, _)) => {
             let old_info =
                 old_info.expect("unsized_info: missing old info for trait upcasting coercion");
             if data_a.principal_def_id() == data_b.principal_def_id() {
@@ -114,10 +110,7 @@ pub(crate) fn cast_to_dyn_star<'tcx>(
     dst_ty: Ty<'tcx>,
     old_info: Option<Value>,
 ) -> (Value, Value) {
-    assert!(
-        matches!(dst_ty.kind(), ty::Dynamic(_, _, ty::DynStar)),
-        "destination type must be a dyn*"
-    );
+    assert!(matches!(dst_ty.kind(), ty::DynStar(..)), "destination type must be a dyn*");
     (src, unsized_info(fx, src_ty_and_layout.ty, dst_ty, old_info))
 }
 
@@ -172,7 +165,7 @@ pub(crate) fn coerce_dyn_star<'tcx>(
     src: CValue<'tcx>,
     dst: CPlace<'tcx>,
 ) {
-    let (data, extra) = if let ty::Dynamic(_, _, ty::DynStar) = src.layout().ty.kind() {
+    let (data, extra) = if let ty::DynStar(_, _) = src.layout().ty.kind() {
         let (data, vtable) = src.load_scalar_pair(fx);
         (data, Some(vtable))
     } else {

compiler/rustc_codegen_cranelift/src/value_and_place.rs

@@ -875,7 +875,7 @@ pub(crate) fn assert_assignable<'tcx>(
             );
             // fn(&T) -> for<'l> fn(&'l T) is allowed
         }
-        (&ty::Dynamic(from_traits, _, _from_kind), &ty::Dynamic(to_traits, _, _to_kind)) => {
+        (&ty::Dynamic(from_traits, _), &ty::Dynamic(to_traits, _)) => {
             // FIXME(dyn-star): Do the right thing with DynKinds
             for (from, to) in from_traits.iter().zip(to_traits) {
                 let from =
@@ -889,6 +889,8 @@ pub(crate) fn assert_assignable<'tcx>(
             }
             // dyn for<'r> Trait<'r> -> dyn Trait<'_> is allowed
         }
+        // FIXME(dyn-star)
+        (&ty::DynStar(_from_traits, _), &ty::DynStar(_to_traits, _)) => unimplemented!(),
         (&ty::Tuple(types_a), &ty::Tuple(types_b)) => {
             let mut types_a = types_a.iter();
             let mut types_b = types_b.iter();