Add missing padding needded for alignment (#3401)

This PR adds extra padding for enums when needed for alignment. The
missing alignment was exposed in #2857 where the layout size from MIR
for `der::error::ErrorKind` was 48 bytes, and from `codegen_enum` was
only 41 bytes. The difference turned out to be caused by an 8-byte
alignment that the compiler uses for this enum.

Resolves #2857 
Resolves #3318

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

@@ -1140,7 +1140,7 @@ impl<'tcx> GotocCtx<'tcx> {
 
  /// Mapping enums to CBMC types is rather complicated. There are a few cases to consider:
  /// 1. When there is only 0 or 1 variant, this is straightforward as the code shows
- /// 2. When there are more variants, rust might decides to apply the typical encoding which
+ /// 2. When there are more variants, rust might decide to apply the typical encoding which
  /// regard enums as tagged union, or an optimized form, called niche encoding.
  ///
  /// The direct encoding is straightforward. Enums are just mapped to C as a struct of union of structs.
@@ -1242,6 +1242,23 @@ impl<'tcx> GotocCtx<'tcx> {
  )
  }),
  ));
+ // Check if any padding is needed for alignment. This is needed for
+ // https://github.com/model-checking/kani/issues/2857 for example.
+ // The logic for determining the maximum variant size is taken from:
+ // https://github.com/rust-lang/rust/blob/e60ebb2f2c1facba87e7971798f3cbdfd309cd23/compiler/rustc_session/src/code_stats.rs#L166
+ let max_variant_size = variants
+ .iter()
+ .map(|l: &LayoutS<FieldIdx, VariantIdx>| l.size)
+ .max()
+ .unwrap();
+ let max_variant_size = std::cmp::max(max_variant_size, discr_offset);
+ if let Some(padding) = gcx.codegen_alignment_padding(
+ max_variant_size,
+ &layout,
+ fields.len(),
+ ) {
+ fields.push(padding);
+ }
  fields
  })
  }

tests/cargo-kani/iss2857/Cargo.toml

@@ -0,0 +1,9 @@
+# Copyright Kani Contributors
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+[package]
+name = "iss2857"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+sec1 = "0.7.3"

tests/cargo-kani/iss2857/expected

@@ -0,0 +1 @@
+VERIFICATION:- SUCCESSFUL

tests/cargo-kani/iss2857/src/main.rs

@@ -0,0 +1,13 @@
+// Copyright Kani Contributors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+// This test checks that https://github.com/model-checking/kani/issues/2857 is
+// fixed
+
+#[kani::proof]
+fn check_der_error() {
+ let e = sec1::der::Error::incomplete(sec1::der::Length::ZERO);
+ let _ = format!("{e:?}");
+}
+
+fn main() {}