From 27d5b846eed9f92990f4fc47f0e35f514cfc66f0 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 12 Mar 2022 09:46:10 -0500
Subject: [PATCH] rustup

---
 rust-version           | 2 +-
 src/helpers.rs         | 2 +-
 src/shims/backtrace.rs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rust-version b/rust-version
index a4c6cd44182..9885aba1029 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-2c6a29af35a81e20f8af4c32bf1b55c59b89eccd
+258256697b8550860be0f6194dec532ac616c2c1
diff --git a/src/helpers.rs b/src/helpers.rs
index cae8f5ddb44..e733ea8062d 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -298,7 +298,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 trace!("UnsafeCellVisitor: {:?} {:?}", *v, v.layout.ty);
                 let is_unsafe_cell = match v.layout.ty.kind() {
                     ty::Adt(adt, _) =>
-                        Some(adt.did) == self.ecx.tcx.lang_items().unsafe_cell_type(),
+                        Some(adt.did()) == self.ecx.tcx.lang_items().unsafe_cell_type(),
                     _ => false,
                 };
                 if is_unsafe_cell {
diff --git a/src/shims/backtrace.rs b/src/shims/backtrace.rs
index a73c78b6272..7d069611e26 100644
--- a/src/shims/backtrace.rs
+++ b/src/shims/backtrace.rs
@@ -134,7 +134,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
 
         let dest = this.force_allocation(dest)?;
         if let ty::Adt(adt, _) = dest.layout.ty.kind() {
-            if !adt.repr.c() {
+            if !adt.repr().c() {
                 throw_ub_format!(
                     "miri_resolve_frame must be declared with a `#[repr(C)]` return type"
                 );