Sync from rust f99f9e4

bjorn3 · bjorn3 · commit b344691522c5 · 2022-07-03T14:51:45.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,7 @@ ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "do_not_remove_cg
 indexmap = "1.8.0"
 libloading = { version = "0.6.0", optional = true }
 once_cell = "1.10.0"
-smallvec = "1.6.1"
+smallvec = "1.8.1"
 
 [patch.crates-io]
 # Uncomment to use local checkout of cranelift
diff --git a/src/base.rs b/src/base.rs
@@ -713,6 +713,7 @@ fn codegen_stmt<'tcx>(
                                 substs,
                                 ty::ClosureKind::FnOnce,
                             )
+                            .expect("failed to normalize and resolve closure during codegen")
                             .polymorphize(fx.tcx);
                             let func_ref = fx.get_function_ref(instance);
                             let func_addr = fx.bcx.ins().func_addr(fx.pointer_type, func_ref);

Original file line number	Diff line number	Diff line change
`@@ -713,6 +713,7 @@ fn codegen_stmt<'tcx>(`
`713`	`713`	`substs,`
`714`	`714`	`ty::ClosureKind::FnOnce,`
`715`	`715`	`)`
	`716`	`+ .expect("failed to normalize and resolve closure during codegen")`
`716`	`717`	`.polymorphize(fx.tcx);`
`717`	`718`	`let func_ref = fx.get_function_ref(instance);`
`718`	`719`	`let func_addr = fx.bcx.ins().func_addr(fx.pointer_type, func_ref);`