about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <17426603+bjorn3@users.noreply.github.com>2022-07-03 14:51:45 +0200
committerbjorn3 <17426603+bjorn3@users.noreply.github.com>2022-07-03 14:51:45 +0200
commitb344691522c5c53bf0a4b8c00bd7984dd54dc4d2 (patch)
tree33e0157b68c9c33e281f7171191ca9d3d2859ca5
parent14b2f8f98d2df5287662d1d43b38bf7efc839f4f (diff)
parenta71e691e74e06d0f3d50daee7510ce240f2b1783 (diff)
Sync from rust f99f9e48ed77a99747c6d07b42fdfe500f1a7de0
-rw-r--r--Cargo.lock4
-rw-r--r--Cargo.toml2
-rw-r--r--src/base.rs1
3 files changed, 4 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 728847686c6..51e088b618b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -334,9 +334,9 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
 
 [[package]]
 name = "smallvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
+checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2"
 
 [[package]]
 name = "target-lexicon"
diff --git a/Cargo.toml b/Cargo.toml
index 0f3aaa27539..04f2125950c 100644
--- 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
index bdcf2f806eb..848208963b1 100644
--- 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);