From ff5d36c9b041ede27dae29d4912fafe72a4de6df Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Thu, 7 Sep 2023 13:44:58 +0000 Subject: [PATCH] Upgrade rust toolchain to 2023-09-07 `VarDebugInfoContents::Composite` no longer exists, and therefore had to be removed. We hadn't fully implemented this case, so this is an improvement. Fixes: #2742 --- .../src/codegen_cprover_gotoc/codegen/span.rs | 12 ------------ rust-toolchain.toml | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/kani-compiler/src/codegen_cprover_gotoc/codegen/span.rs b/kani-compiler/src/codegen_cprover_gotoc/codegen/span.rs index 72c9e258c14d..27f47ed457c9 100644 --- a/kani-compiler/src/codegen_cprover_gotoc/codegen/span.rs +++ b/kani-compiler/src/codegen_cprover_gotoc/codegen/span.rs @@ -42,18 +42,6 @@ impl<'tcx> GotocCtx<'tcx> { self.current_fn().mir().var_debug_info.iter().find(|info| match info.value { VarDebugInfoContents::Place(p) => p.local == *l && p.projection.len() == 0, VarDebugInfoContents::Const(_) => false, - // This variant was added in - // https://github.com/rust-lang/rust/pull/102570 and is concerned - // with a scalar replacement of aggregates (SROA) MIR optimization - // that is only enabled with `--mir-opt-level=3` or higher. - // TODO: create a test and figure out if we should return debug info - // for this case: - // https://github.com/model-checking/kani/issues/1933 - VarDebugInfoContents::Composite { .. } => { - // Fail in debug mode to determine if we ever hit this case - debug_assert!(false, "Unhandled VarDebugInfoContents::Composite"); - false - } }) } } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 39110a275181..749495d34a41 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,5 +2,5 @@ # SPDX-License-Identifier: Apache-2.0 OR MIT [toolchain] -channel = "nightly-2023-09-06" +channel = "nightly-2023-09-07" components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]