Sync from rust ed620cf9690fdafed65845bf35c455db992fbba1

diff --cc src/abi/mod.rs
index d62966b162fa2fb743713a40870abae4ac07bc68,98b5fb1cce28531eb856e758cde8061b8ae15426..42371d2af5016a0ce357e3706b1314f93b6093b3
--- 1/src/abi/mod.rs
--- 2/src/abi/mod.rs
+++ b/src/abi/mod.rs
@@@ -347,11 -348,10 +347,10 @@@ pub(crate) fn codegen_terminator_call<'
      let ret_place = codegen_place(fx, destination);
  
      // Handle special calls like intrinsics and empty drop glue.
 -    let instance = if let ty::FnDef(def_id, substs) = *fn_ty.kind() {
 +    let instance = if let ty::FnDef(def_id, substs) = *func.layout().ty.kind() {
-         let instance = ty::Instance::resolve(fx.tcx, ty::ParamEnv::reveal_all(), def_id, substs)
-             .unwrap()
-             .unwrap()
-             .polymorphize(fx.tcx);
+         let instance =
+             ty::Instance::expect_resolve(fx.tcx, ty::ParamEnv::reveal_all(), def_id, substs)
+                 .polymorphize(fx.tcx);
  
          if fx.tcx.symbol_name(instance).name.starts_with("llvm.") {
              crate::intrinsics::codegen_llvm_intrinsic_call(