Changes required after merge.

1. The layout_of API has changed. Adapt our codegen to use the new trait.
2. Needed to bump the version of bigint to get rid of compiler errors.

Author: celinval

Cargo.lock

@@ -2338,9 +2338,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512"
+checksum = "74e768dff5fb39a41b3bcd30bb25cf989706c90d028d1ad71971987aa309d535"
 dependencies = [
  "autocfg",
  "num-integer",

compiler/rustc_codegen_llvm/src/gotoc/mir_to_goto/codegen/assumptions.rs

@@ -6,10 +6,11 @@ use crate::gotoc::cbmc::goto_program::{Expr, Location, Stmt, Symbol, Type};
 use crate::gotoc::mir_to_goto::GotocCtx;
 use rustc_middle::mir::interpret::{ConstValue, Scalar};
 use rustc_middle::ty;
+use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::ty::ScalarInt;
 use rustc_middle::ty::Ty;
 use rustc_middle::ty::{IntTy, UintTy};
-use rustc_target::abi::{FieldsShape, LayoutOf, Primitive, TagEncoding, Variants};
+use rustc_target::abi::{FieldsShape, Primitive, TagEncoding, Variants};
 
 fn fold_invariants_gen<F: Fn(Expr, Expr) -> Expr>(mut iv: Vec<Expr>, dfl: Expr, comb: F) -> Expr {
     let mut res: Option<Expr> = None;

compiler/rustc_codegen_llvm/src/gotoc/mir_to_goto/codegen/intrinsic.rs

@@ -6,10 +6,10 @@ use tracing::{debug, warn};
 use crate::gotoc::cbmc::goto_program::{BuiltinFn, Expr, Location, Stmt, Type};
 use crate::gotoc::mir_to_goto::GotocCtx;
 use rustc_middle::mir::Place;
+use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::ty::Instance;
 use rustc_middle::ty::{self, Ty, TyS};
 use rustc_span::Span;
-use rustc_target::abi::LayoutOf;
 
 struct SizeAlign {
     size: Expr,

compiler/rustc_codegen_llvm/src/gotoc/mir_to_goto/codegen/operand.rs

@@ -8,12 +8,13 @@ use rustc_middle::mir::interpret::{
     read_target_uint, AllocId, Allocation, ConstValue, GlobalAlloc, Scalar,
 };
 use rustc_middle::mir::{Constant, ConstantKind, Operand};
+use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::ty::{
     self, Const, ConstKind, FloatTy, Instance, IntTy, ScalarInt, Ty, Uint, UintTy,
 };
 use rustc_span::def_id::DefId;
 use rustc_span::Span;
-use rustc_target::abi::{FieldsShape, LayoutOf, Size, TagEncoding, Variants};
+use rustc_target::abi::{FieldsShape, Size, TagEncoding, Variants};
 use tracing::debug;
 
 enum AllocData<'a> {

compiler/rustc_codegen_llvm/src/gotoc/mir_to_goto/codegen/place.rs

@@ -9,11 +9,12 @@ use crate::gotoc::cbmc::goto_program::{Expr, Type};
 use crate::gotoc::mir_to_goto::utils::slice_fat_ptr;
 use crate::gotoc::mir_to_goto::GotocCtx;
 use rustc_hir::Mutability;
+use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::{
     mir::{Field, Local, Place, ProjectionElem},
     ty::{self, Ty, TyS, TypeAndMut, VariantDef},
 };
-use rustc_target::abi::{LayoutOf, TagEncoding, Variants};
+use rustc_target::abi::{TagEncoding, Variants};
 use tracing::{debug, warn};
 
 /// A projection in RMC can either be to a type (the normal case),

compiler/rustc_codegen_llvm/src/gotoc/mir_to_goto/codegen/rvalue.rs

@@ -10,8 +10,9 @@ use crate::gotoc::mir_to_goto::GotocCtx;
 use num::bigint::BigInt;
 use rustc_middle::mir::{AggregateKind, BinOp, CastKind, NullOp, Operand, Place, Rvalue, UnOp};
 use rustc_middle::ty::adjustment::PointerCast;
+use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::ty::{self, Instance, IntTy, Ty, UintTy, VtblEntry, COMMON_VTABLE_ENTRIES};
-use rustc_target::abi::{FieldsShape, LayoutOf, Primitive, TagEncoding, Variants};
+use rustc_target::abi::{FieldsShape, Primitive, TagEncoding, Variants};
 use tracing::{debug, warn};
 
 impl<'tcx> GotocCtx<'tcx> {

compiler/rustc_codegen_llvm/src/gotoc/mir_to_goto/codegen/statement.rs

@@ -9,9 +9,10 @@ use rustc_middle::mir::{
     BasicBlock, Operand, Place, Statement, StatementKind, SwitchTargets, Terminator, TerminatorKind,
 };
 use rustc_middle::ty;
+use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::ty::{Instance, InstanceDef, Ty};
 use rustc_span::Span;
-use rustc_target::abi::{FieldsShape, LayoutOf, Primitive, TagEncoding, Variants};
+use rustc_target::abi::{FieldsShape, Primitive, TagEncoding, Variants};
 use smallvec::SmallVec;
 use std::convert::TryInto;
 use tracing::debug;

compiler/rustc_codegen_llvm/src/gotoc/mir_to_goto/codegen/typ.rs

@@ -9,6 +9,7 @@ use crate::gotoc::mir_to_goto::GotocCtx;
 use rustc_ast::ast::Mutability;
 use rustc_index::vec::IndexVec;
 use rustc_middle::mir::{HasLocalDecls, Local, Operand, Place, Rvalue};
+use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::ty::print::with_no_trimmed_paths;
 use rustc_middle::ty::print::FmtPrinter;
 use rustc_middle::ty::subst::InternalSubsts;
@@ -19,8 +20,7 @@ use rustc_middle::ty::{
 use rustc_span;
 use rustc_span::def_id::DefId;
 use rustc_target::abi::{
-    Abi::Vector, FieldsShape, Integer, Layout, LayoutOf, Primitive, TagEncoding, VariantIdx,
-    Variants,
+    Abi::Vector, FieldsShape, Integer, Layout, Primitive, TagEncoding, VariantIdx, Variants,
 };
 use rustc_target::spec::abi::Abi;
 use std::collections::BTreeMap;

compiler/rustc_codegen_llvm/src/gotoc/mir_to_goto/context/goto_ctx.rs

@@ -28,11 +28,13 @@ use rustc_data_structures::stable_map::FxHashMap;
 use rustc_data_structures::sync::MetadataRef;
 use rustc_middle::middle::cstore::MetadataLoader;
 use rustc_middle::mir::interpret::Allocation;
-use rustc_middle::ty::layout::{HasParamEnv, HasTyCtxt, TyAndLayout};
+use rustc_middle::span_bug;
+use rustc_middle::ty::layout::{HasParamEnv, HasTyCtxt, LayoutError, LayoutOfHelpers, TyAndLayout};
 use rustc_middle::ty::{self, Instance, Ty, TyCtxt};
 use rustc_session::Session;
+use rustc_span::source_map::Span;
 use rustc_target::abi::Endian;
-use rustc_target::abi::{HasDataLayout, LayoutOf, TargetDataLayout};
+use rustc_target::abi::{HasDataLayout, TargetDataLayout};
 use rustc_target::spec::Target;
 use std::path::Path;
 
@@ -228,12 +230,12 @@ impl<'tcx> GotocCtx<'tcx> {
     }
 }
 
-impl LayoutOf<'tcx> for GotocCtx<'tcx> {
-    type Ty = Ty<'tcx>;
-    type TyAndLayout = TyAndLayout<'tcx>;
+impl LayoutOfHelpers<'tcx> for GotocCtx<'tcx> {
+    type LayoutOfResult = TyAndLayout<'tcx>;
 
-    fn layout_of(&self, ty: Self::Ty) -> Self::TyAndLayout {
-        self.tcx.layout_of(ty::ParamEnv::reveal_all().and(ty)).unwrap()
+    #[inline]
+    fn handle_layout_err(&self, err: LayoutError<'tcx>, span: Span, ty: Ty<'tcx>) -> ! {
+        span_bug!(span, "failed to get layout for `{}`: {}", ty, err)
     }
 }
 

compiler/rustc_codegen_llvm/src/gotoc/mir_to_goto/overrides/hooks.rs

@@ -16,10 +16,10 @@ use crate::gotoc::mir_to_goto::utils::{
 use crate::gotoc::mir_to_goto::GotocCtx;
 use rustc_hir::definitions::DefPathDataName;
 use rustc_middle::mir::{BasicBlock, Place};
+use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::ty::print::with_no_trimmed_paths;
 use rustc_middle::ty::{Instance, InstanceDef, Ty, TyCtxt};
 use rustc_span::Span;
-use rustc_target::abi::LayoutOf;
 use std::rc::Rc;
 
 pub trait GotocTypeHook<'tcx> {