diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-02-06 18:03:15 +0100 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-02-06 18:03:15 +0100 |
| commit | 6dfa3c9513b718d30c014423ab91b040a073dcd2 (patch) | |
| tree | 09b2b75e9bc9b01014455e148c0c8d89876211cc | |
| parent | 5ab690d9e75d3d80ddc96bbfe131709227862d56 (diff) | |
| parent | ba7bb62e25637d9087a434ae1883d218c0c2da22 (diff) | |
| download | rust-6dfa3c9513b718d30c014423ab91b040a073dcd2.tar.gz rust-6dfa3c9513b718d30c014423ab91b040a073dcd2.zip | |
Sync from rust 044a28a4091f2e1a5883f7fa990223f8b200a2cd
| -rw-r--r-- | src/base.rs | 1 | ||||
| -rw-r--r-- | src/constant.rs | 1 | ||||
| -rw-r--r-- | src/main_shim.rs | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/base.rs b/src/base.rs index 3f5cc38b04c..50baa70ab0f 100644 --- a/src/base.rs +++ b/src/base.rs @@ -806,6 +806,7 @@ fn codegen_stmt<'tcx>( StatementKind::StorageLive(_) | StatementKind::StorageDead(_) | StatementKind::Deinit(_) + | StatementKind::ConstEvalCounter | StatementKind::Nop | StatementKind::FakeRead(..) | StatementKind::Retag { .. } diff --git a/src/constant.rs b/src/constant.rs index 51450897bfc..49c4f1aaaef 100644 --- a/src/constant.rs +++ b/src/constant.rs @@ -530,6 +530,7 @@ pub(crate) fn mir_operand_get_const_val<'tcx>( | StatementKind::Retag(_, _) | StatementKind::AscribeUserType(_, _) | StatementKind::Coverage(_) + | StatementKind::ConstEvalCounter | StatementKind::Nop => {} } } diff --git a/src/main_shim.rs b/src/main_shim.rs index fd45362548c..3e3b6857134 100644 --- a/src/main_shim.rs +++ b/src/main_shim.rs @@ -46,7 +46,7 @@ pub(crate) fn maybe_create_entry_wrapper( is_main_fn: bool, sigpipe: u8, ) { - let main_ret_ty = tcx.fn_sig(rust_main_def_id).output(); + let main_ret_ty = tcx.fn_sig(rust_main_def_id).no_bound_vars().unwrap().output(); // Given that `main()` has no arguments, // then its return type cannot have // late-bound regions, since late-bound |