non-fatal overflow

Author: lcnr

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -1745,19 +1745,23 @@ unsupported {} from `{}` with element `{}` of size `{}` to `{}`"#,
 
         match in_elem.kind() {
             ty::RawPtr(p) => {
-                let (metadata, check_sized) = p.ty.ptr_metadata_ty(bx.tcx, |ty| {
-                    bx.tcx.normalize_erasing_regions(ty::ParamEnv::reveal_all(), ty)
-                });
+                let (metadata, check_sized) =
+                    p.ty.ptr_metadata_ty(bx.tcx, |ty| {
+                        Ok(bx.tcx.normalize_erasing_regions(ty::ParamEnv::reveal_all(), ty))
+                    })
+                    .unwrap();
                 assert!(!check_sized); // we are in codegen, so we shouldn't see these types
                 require!(metadata.is_unit(), "cannot cast fat pointer `{}`", in_elem)
             }
             _ => return_error!("expected pointer, got `{}`", in_elem),
         }
         match out_elem.kind() {
             ty::RawPtr(p) => {
-                let (metadata, check_sized) = p.ty.ptr_metadata_ty(bx.tcx, |ty| {
-                    bx.tcx.normalize_erasing_regions(ty::ParamEnv::reveal_all(), ty)
-                });
+                let (metadata, check_sized) =
+                    p.ty.ptr_metadata_ty(bx.tcx, |ty| {
+                        Ok(bx.tcx.normalize_erasing_regions(ty::ParamEnv::reveal_all(), ty))
+                    })
+                    .unwrap();
                 assert!(!check_sized); // we are in codegen, so we shouldn't see these types
                 require!(metadata.is_unit(), "cannot cast to fat pointer `{}`", out_elem)
             }

compiler/rustc_const_eval/src/const_eval/valtrees.rs

@@ -177,15 +177,17 @@ fn get_info_on_unsized_field<'tcx>(
     tcx: TyCtxt<'tcx>,
 ) -> (Ty<'tcx>, usize) {
     let mut last_valtree = valtree;
-    let tail = tcx.struct_tail_with_normalize(
-        ty,
-        |ty| ty,
-        || {
-            let branches = last_valtree.unwrap_branch();
-            last_valtree = branches[branches.len() - 1];
-            debug!(?branches, ?last_valtree);
-        },
-    );
+    let tail = tcx
+        .struct_tail_with_normalize(
+            ty,
+            |ty| Ok(ty),
+            || {
+                let branches = last_valtree.unwrap_branch();
+                last_valtree = branches[branches.len() - 1];
+                debug!(?branches, ?last_valtree);
+            },
+        )
+        .unwrap();
     let unsized_inner_ty = match tail.kind() {
         ty::Slice(t) => *t,
         ty::Str => tail,