Upgrade rust toolchain to 2022-11-20 (rust-lang#1927)

Co-authored-by: Ted Kaminski <[email protected]>

Author: zhassan-aws

kani-compiler/src/codegen_cprover_gotoc/codegen/operand.rs

@@ -556,7 +556,7 @@ impl<'tcx> GotocCtx<'tcx> {
         mut_name: F,
         imm_name: Option<String>,
     ) -> Expr {
-        debug!("codegen_allocation imm_name {:?} alloc {:?}", imm_name, alloc);
+        debug!("codegen_allocation imm_name {:?}", imm_name);
         let mem_var = match alloc.mutability {
             Mutability::Mut => {
                 let name = mut_name(self);
@@ -670,12 +670,12 @@ impl<'tcx> GotocCtx<'tcx> {
     /// representation of what those fields should be initialized with.
     /// (A field is either bytes, or initialized with an expression.)
     fn codegen_allocation_data(&mut self, alloc: &'tcx Allocation) -> Vec<AllocData<'tcx>> {
-        let mut alloc_vals = Vec::with_capacity(alloc.provenance().len() + 1);
+        let mut alloc_vals = Vec::with_capacity(alloc.provenance().ptrs().len() + 1);
         let pointer_size =
             Size::from_bytes(self.symbol_table.machine_model().pointer_width_in_bytes());
 
         let mut next_offset = Size::ZERO;
-        for &(offset, alloc_id) in alloc.provenance().iter() {
+        for &(offset, alloc_id) in alloc.provenance().ptrs().iter() {
             if offset > next_offset {
                 let bytes = alloc.inspect_with_uninit_and_ptr_outside_interpreter(
                     next_offset.bytes_usize()..offset.bytes_usize(),

kani-compiler/src/codegen_cprover_gotoc/codegen/place.rs

@@ -176,7 +176,13 @@ impl<'tcx> ProjectedPlace<'tcx> {
                 goto_expr, expr_ty, ty_from_mir
             );
             warn!("{}", msg);
-            debug_assert!(false, "{}", msg);
+            // TODO: there's an expr type mismatch with the rust 2022-11-20 toolchain
+            // for simd:
+            // https://github.com/model-checking/kani/issues/1926
+            // Disabling it for this specific case.
+            if !(expr_ty.is_integer() && ty_from_mir.is_struct_tag()) {
+                debug_assert!(false, "{}", msg);
+            }
             return Err(UnimplementedData::new(
                 "Projection mismatch",
                 "https://github.com/model-checking/kani/issues/277",

kani-compiler/src/codegen_cprover_gotoc/codegen/span.rs

@@ -53,6 +53,18 @@ 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
+            }
         })
     }
 }

kani-compiler/src/kani_middle/reachability.rs

@@ -154,7 +154,7 @@ impl<'tcx> MonoItemsCollector<'tcx> {
 
         // Collect initialization.
         let alloc = self.tcx.eval_static_initializer(def_id).unwrap();
-        for &id in alloc.inner().provenance().values() {
+        for id in alloc.inner().provenance().provenances() {
             self.queue.extend(collect_alloc_items(self.tcx, id).iter());
         }
     }
@@ -260,7 +260,7 @@ impl<'a, 'tcx> MonoItemsFnCollector<'a, 'tcx> {
             }
             ConstValue::Slice { data: alloc, start: _, end: _ }
             | ConstValue::ByRef { alloc, .. } => {
-                for &id in alloc.inner().provenance().values() {
+                for id in alloc.inner().provenance().provenances() {
                     self.collected.extend(collect_alloc_items(self.tcx, id).iter())
                 }
             }
@@ -491,7 +491,11 @@ fn collect_alloc_items<'tcx>(tcx: TyCtxt<'tcx>, alloc_id: AllocId) -> Vec<MonoIt
         }
         GlobalAlloc::Memory(alloc) => {
             items.extend(
-                alloc.inner().provenance().values().flat_map(|id| collect_alloc_items(tcx, *id)),
+                alloc
+                    .inner()
+                    .provenance()
+                    .provenances()
+                    .flat_map(|id| collect_alloc_items(tcx, id)),
             );
         }
         GlobalAlloc::VTable(ty, trait_ref) => {

rust-toolchain.toml

@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
 [toolchain]
-channel = "nightly-2022-11-06"
+channel = "nightly-2022-11-20"
 components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]