diff --git a/benches/helpers/miri_helper.rs b/benches/helpers/miri_helper.rs
index 589a95b668f3..2e71c7eb8b1d 100644
--- a/benches/helpers/miri_helper.rs
+++ b/benches/helpers/miri_helper.rs
@@ -26,7 +26,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls<'_> {
 
             self.bencher.iter(|| {
                 let config = miri::MiriConfig::default();
-                miri::eval_main(tcx, entry_def_id, config);
+                miri::eval_main(tcx, entry_def_id.to_def_id(), config);
             });
         });
 
diff --git a/rust-version b/rust-version
index 53979b82cf83..173566bdf616 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-e83f7563495dbe2629b0cbc738afb0808c4482e1
+fb5615a4771ea3d54256f969dc84d2dfd38d812c
diff --git a/src/bin/miri-rustc-tests.rs b/src/bin/miri-rustc-tests.rs
index bae7356eb72c..add9cfe897fb 100644
--- a/src/bin/miri-rustc-tests.rs
+++ b/src/bin/miri-rustc-tests.rs
@@ -54,7 +54,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
                 tcx.hir().krate().visit_all_item_likes(&mut Visitor(tcx));
             } else if let Some((entry_def_id, _)) = tcx.entry_fn(LOCAL_CRATE) {
                 let config = miri::MiriConfig::default();
-                miri::eval_main(tcx, entry_def_id, config);
+                miri::eval_main(tcx, entry_def_id.to_def_id(), config);
 
                 compiler.session().abort_if_errors();
             } else {
diff --git a/src/bin/miri.rs b/src/bin/miri.rs
index 4e20e3a12da7..06101fe24e2d 100644
--- a/src/bin/miri.rs
+++ b/src/bin/miri.rs
@@ -39,7 +39,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
             // Add filename to `miri` arguments.
             config.args.insert(0, compiler.input().filestem().to_string());
 
-            if let Some(return_code) = miri::eval_main(tcx, entry_def_id, config) {
+            if let Some(return_code) = miri::eval_main(tcx, entry_def_id.to_def_id(), config) {
                 std::process::exit(
                     i32::try_from(return_code).expect("Return value was too large!"),
                 );