From 70e61650e34edc63e96dfd8dfb20f81ad98ec2a6 Mon Sep 17 00:00:00 2001
From: Zyad Hassan <zyadh@amazon.com>
Date: Tue, 20 Feb 2024 11:08:18 -0800
Subject: [PATCH] Upgrade toolchain to 2024-02-17

---
 kani-compiler/src/kani_middle/intrinsics.rs                   | 4 ++--
 rust-toolchain.toml                                           | 2 +-
 .../{main_assert_fixme.rs => main_assert.rs}                  | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)
 rename tests/kani/SizeAndAlignOfDst/{main_assert_fixme.rs => main_assert.rs} (85%)

diff --git a/kani-compiler/src/kani_middle/intrinsics.rs b/kani-compiler/src/kani_middle/intrinsics.rs
index 8a7fc16d8e9f..404cb0f277c3 100644
--- a/kani-compiler/src/kani_middle/intrinsics.rs
+++ b/kani-compiler/src/kani_middle/intrinsics.rs
@@ -101,8 +101,8 @@ fn resolve_rust_intrinsic<'tcx>(
     func_ty: Ty<'tcx>,
 ) -> Option<(Symbol, GenericArgsRef<'tcx>)> {
     if let ty::FnDef(def_id, args) = *func_ty.kind() {
-        if tcx.is_intrinsic(def_id) {
-            return Some((tcx.item_name(def_id), args));
+        if let Some(symbol) = tcx.intrinsic(def_id) {
+            return Some((symbol, args));
         }
     }
     None
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 42bd4779102f..42f6af899b43 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
 [toolchain]
-channel = "nightly-2024-02-14"
+channel = "nightly-2024-02-17"
 components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]
diff --git a/tests/kani/SizeAndAlignOfDst/main_assert_fixme.rs b/tests/kani/SizeAndAlignOfDst/main_assert.rs
similarity index 85%
rename from tests/kani/SizeAndAlignOfDst/main_assert_fixme.rs
rename to tests/kani/SizeAndAlignOfDst/main_assert.rs
index 9173eca7db3c..cdd746bc0b31 100644
--- a/tests/kani/SizeAndAlignOfDst/main_assert_fixme.rs
+++ b/tests/kani/SizeAndAlignOfDst/main_assert.rs
@@ -1,15 +1,11 @@
 // Copyright Kani Contributors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
-// The original harness takes too long so we introduced a simplified version to run in CI.
-// kani-flags: --harness simplified
 
 //! This is a regression test for size_and_align_of_dst computing the
 //! size and alignment of a dynamically-sized type like
 //! Arc<Mutex<dyn Subscriber>>.
 //! We added a simplified version of the original harness from:
 //! <https://github.com/model-checking/kani/issues/426>
-//! This currently fails due to
-//! <https://github.com/model-checking/kani/issues/1781>
 
 use std::sync::Arc;
 use std::sync::Mutex;