From 706d7ff108947704566dbdc361abcb2ecddcef01 Mon Sep 17 00:00:00 2001
From: Bryan Garza <1396101+bryangarza@users.noreply.github.com>
Date: Thu, 29 Dec 2022 23:44:16 +0000
Subject: [PATCH 1/4] Update codegen cranelift for ConstEvalCounter

---
 src/base.rs     | 1 +
 src/constant.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/base.rs b/src/base.rs
index 89d955e8bf2e..6e584c308c10 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -789,6 +789,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 51450897bfc1..49c4f1aaaefc 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 => {}
                     }
                 }

From a88ec47d4879fcee7ee71fd41b924bdb0f707d26 Mon Sep 17 00:00:00 2001
From: Kyle Matsuda <kyle.yoshio.matsuda@gmail.com>
Date: Wed, 18 Jan 2023 15:43:20 -0700
Subject: [PATCH 2/4] replace usages of fn_sig query with bound_fn_sig

---
 src/main_shim.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main_shim.rs b/src/main_shim.rs
index c10054e7f0d2..f46e6b6528c8 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.bound_fn_sig(rust_main_def_id).subst_identity().output();
         // Given that `main()` has no arguments,
         // then its return type cannot have
         // late-bound regions, since late-bound

From 7bb0bfea0417c0e165bb3084b9c471245e8c8ebf Mon Sep 17 00:00:00 2001
From: Kyle Matsuda <kyle.yoshio.matsuda@gmail.com>
Date: Wed, 18 Jan 2023 16:52:47 -0700
Subject: [PATCH 3/4] change fn_sig query to use EarlyBinder; remove
 bound_fn_sig query; add EarlyBinder to fn_sig in metadata

---
 src/main_shim.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main_shim.rs b/src/main_shim.rs
index f46e6b6528c8..bc1b1ec7cd59 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.bound_fn_sig(rust_main_def_id).subst_identity().output();
+        let main_ret_ty = tcx.fn_sig(rust_main_def_id).subst_identity().output();
         // Given that `main()` has no arguments,
         // then its return type cannot have
         // late-bound regions, since late-bound

From 21575908c62f563fbc6d161c4fa44b2000a04e2f Mon Sep 17 00:00:00 2001
From: Kyle Matsuda <kyle.yoshio.matsuda@gmail.com>
Date: Thu, 19 Jan 2023 12:09:01 -0700
Subject: [PATCH 4/4] add EarlyBinder::no_bound_vars

---
 src/main_shim.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main_shim.rs b/src/main_shim.rs
index bc1b1ec7cd59..70cf28267d70 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).subst_identity().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