Skip to content

Commit 70e6165

Browse files
committed
Upgrade toolchain to 2024-02-17
1 parent 72fd9f4 commit 70e6165

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

kani-compiler/src/kani_middle/intrinsics.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ fn resolve_rust_intrinsic<'tcx>(
101101
func_ty: Ty<'tcx>,
102102
) -> Option<(Symbol, GenericArgsRef<'tcx>)> {
103103
if let ty::FnDef(def_id, args) = *func_ty.kind() {
104-
if tcx.is_intrinsic(def_id) {
105-
return Some((tcx.item_name(def_id), args));
104+
if let Some(symbol) = tcx.intrinsic(def_id) {
105+
return Some((symbol, args));
106106
}
107107
}
108108
None

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# SPDX-License-Identifier: Apache-2.0 OR MIT
33

44
[toolchain]
5-
channel = "nightly-2024-02-14"
5+
channel = "nightly-2024-02-17"
66
components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]

tests/kani/SizeAndAlignOfDst/main_assert_fixme.rs renamed to tests/kani/SizeAndAlignOfDst/main_assert.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
// Copyright Kani Contributors
22
// SPDX-License-Identifier: Apache-2.0 OR MIT
3-
// The original harness takes too long so we introduced a simplified version to run in CI.
4-
// kani-flags: --harness simplified
53

64
//! This is a regression test for size_and_align_of_dst computing the
75
//! size and alignment of a dynamically-sized type like
86
//! Arc<Mutex<dyn Subscriber>>.
97
//! We added a simplified version of the original harness from:
108
//! <https://github.com/model-checking/kani/issues/426>
11-
//! This currently fails due to
12-
//! <https://github.com/model-checking/kani/issues/1781>
139
1410
use std::sync::Arc;
1511
use std::sync::Mutex;

0 commit comments

Comments
 (0)