Decouple RMC from llvm crate (rust-lang#510)

Author: danielsn

Cargo.lock

@@ -3734,6 +3734,36 @@ dependencies = [
 [[package]]
 name = "rustc_codegen_llvm"
 version = "0.0.0"
+dependencies = [
+ "bitflags",
+ "cstr",
+ "libc",
+ "measureme",
+ "rustc-demangle",
+ "rustc_arena",
+ "rustc_ast",
+ "rustc_attr",
+ "rustc_codegen_ssa",
+ "rustc_data_structures",
+ "rustc_errors",
+ "rustc_fs_util",
+ "rustc_hir",
+ "rustc_index",
+ "rustc_llvm",
+ "rustc_metadata",
+ "rustc_middle",
+ "rustc_serialize",
+ "rustc_session",
+ "rustc_span",
+ "rustc_target",
+ "smallvec",
+ "snap",
+ "tracing",
+]
+
+[[package]]
+name = "rustc_codegen_rmc"
+version = "0.0.0"
 dependencies = [
  "bitflags",
  "cstr",
@@ -4030,6 +4060,7 @@ dependencies = [
  "rustc_borrowck",
  "rustc_builtin_macros",
  "rustc_codegen_llvm",
+ "rustc_codegen_rmc",
  "rustc_codegen_ssa",
  "rustc_const_eval",
  "rustc_data_structures",

compiler/rustc_codegen_llvm/Cargo.toml

@@ -4,15 +4,14 @@ version = "0.0.0"
 edition = "2018"
 
 [lib]
-test = true
+test = false
 doctest = false
 
 [dependencies]
 bitflags = "1.0"
 cstr = "0.2"
 libc = "0.2"
 measureme = "9.1.0"
-num = "0.4.0"
 snap = "1"
 tracing = "0.1"
 rustc_middle = { path = "../rustc_middle" }

compiler/rustc_codegen_llvm/src/gotoc/mod.rs

@@ -13,9 +13,6 @@
 #![feature(iter_zip)]
 #![feature(nll)]
 #![recursion_limit = "256"]
-#![feature(destructuring_assignment)]
-#![feature(box_patterns)]
-#![feature(once_cell)]
 
 use back::write::{create_informational_target_machine, create_target_machine};
 
@@ -76,8 +73,6 @@ mod type_of;
 mod va_arg;
 mod value;
 
-pub mod gotoc;
-
 #[derive(Clone)]
 pub struct LlvmCodegenBackend(());
 

compiler/rustc_codegen_llvm/src/lib.rs

@@ -0,0 +1,38 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+
+[package]
+name = "rustc_codegen_rmc"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+test = true
+doctest = false
+
+[dependencies]
+bitflags = "1.0"
+cstr = "0.2"
+libc = "0.2"
+measureme = "9.1.0"
+num = "0.4.0"
+snap = "1"
+tracing = "0.1"
+rustc_middle = { path = "../rustc_middle" }
+rustc-demangle = "0.1.21"
+rustc_arena = { path = "../rustc_arena" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_fs_util = { path = "../rustc_fs_util" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_index = { path = "../rustc_index" }
+rustc_llvm = { path = "../rustc_llvm" }
+rustc_metadata = { path = "../rustc_metadata" }
+rustc_session = { path = "../rustc_session" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_target = { path = "../rustc_target" }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
+rustc_ast = { path = "../rustc_ast" }
+rustc_span = { path = "../rustc_span" }

compiler/rustc_codegen_rmc/Cargo.toml

@@ -4,7 +4,7 @@
 use std::ops::{BitAnd, Shl, Shr};
 
 use super::super::Transformer;
-use crate::gotoc::cbmc::goto_program::{
+use crate::cbmc::goto_program::{
     BinaryOperand, CIntType, Expr, Location, Parameter, Stmt, Symbol, SymbolTable, SymbolValues,
     Type,
 };

compiler/rustc_codegen_llvm/src/gotoc/cbmc/env.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/env.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use super::super::Transformer;
-use crate::gotoc::cbmc::goto_program::{
+use crate::cbmc::goto_program::{
     DatatypeComponent, Expr, Location, Parameter, Stmt, Symbol, SymbolTable, Type,
 };
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/builtin.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/builtin.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use super::super::Transformer;
-use crate::gotoc::cbmc::goto_program::{Expr, Location, Stmt, Symbol, SymbolTable, Type};
+use crate::cbmc::goto_program::{Expr, Location, Stmt, Symbol, SymbolTable, Type};
 use rustc_data_structures::fx::FxHashMap;
 
 /// Struct for handling the nondet transformations for --gen-c-runnable.

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/expr.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/expr.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use super::Transformer;
-use crate::gotoc::cbmc::goto_program::SymbolTable;
+use crate::cbmc::goto_program::SymbolTable;
 
 /// Struct for performing the identity transformation on a symbol table.
 /// Mainly used as a demo/for testing.

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/location.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/location.rs

@@ -3,7 +3,7 @@
 
 use super::gen_c_transformer::{ExprTransformer, NameTransformer, NondetTransformer};
 use super::identity_transformer::IdentityTransformer;
-use crate::gotoc::cbmc::goto_program::SymbolTable;
+use crate::cbmc::goto_program::SymbolTable;
 
 /// Performs each pass provided on the given symbol table.
 pub fn do_passes(mut symtab: SymbolTable, pass_names: &[String]) -> SymbolTable {

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/mod.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/mod.rs

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-use crate::gotoc::cbmc::goto_program::{
+use crate::cbmc::goto_program::{
     BinaryOperand, CIntType, DatatypeComponent, Expr, ExprValue, Location, Parameter, SelfOperand,
     Stmt, StmtBody, SwitchCase, Symbol, SymbolTable, SymbolValues, Type, UnaryOperand,
 };

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/stmt.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/stmt.rs

@@ -0,0 +1,18 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+#![feature(bool_to_option)]
+#![feature(const_cstr_unchecked)]
+#![feature(crate_visibility_modifier)]
+#![feature(extern_types)]
+#![feature(in_band_lifetimes)]
+#![feature(iter_zip)]
+#![feature(nll)]
+#![recursion_limit = "256"]
+#![feature(destructuring_assignment)]
+#![feature(box_patterns)]
+#![feature(once_cell)]
+
+pub mod cbmc;
+mod mir_to_goto;
+pub use mir_to_goto::GotocCodegenBackend;

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/symbol.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/symbol.rs

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //! this module defines functions which impose data invariant on generated data types.
 
-use crate::gotoc::cbmc::goto_program::{Expr, Location, Stmt, Symbol, Type};
-use crate::gotoc::mir_to_goto::GotocCtx;
+use crate::cbmc::goto_program::{Expr, Location, Stmt, Symbol, Type};
+use crate::mir_to_goto::GotocCtx;
 use rustc_middle::mir::interpret::{ConstValue, Scalar};
 use rustc_middle::ty;
 use rustc_middle::ty::layout::LayoutOf;

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/symbol_table.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/symbol_table.rs

@@ -3,7 +3,7 @@
 
 //! This file contains functions related to codegenning MIR blocks into gotoc
 
-use crate::gotoc::mir_to_goto::GotocCtx;
+use crate::mir_to_goto::GotocCtx;
 use rustc_middle::mir::{BasicBlock, BasicBlockData};
 
 impl<'tcx> GotocCtx<'tcx> {

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/symtab_transformer/gen_c_transformer/expr_transformer.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/symtab_transformer/gen_c_transformer/expr_transformer.rs

@@ -3,8 +3,8 @@
 
 //! This file contains functions related to codegenning MIR functions into gotoc
 
-use crate::gotoc::cbmc::goto_program::{Expr, Stmt, Symbol};
-use crate::gotoc::mir_to_goto::GotocCtx;
+use crate::cbmc::goto_program::{Expr, Stmt, Symbol};
+use crate::mir_to_goto::GotocCtx;
 use rustc_middle::mir::{HasLocalDecls, Local};
 use rustc_middle::ty::{self, Instance, TyS};
 use tracing::{debug, warn};

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/symtab_transformer/gen_c_transformer/mod.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/symtab_transformer/gen_c_transformer/mod.rs

@@ -3,8 +3,8 @@
 //! this module handles intrinsics
 use tracing::{debug, warn};
 
-use crate::gotoc::cbmc::goto_program::{BuiltinFn, Expr, Location, Stmt, Type};
-use crate::gotoc::mir_to_goto::GotocCtx;
+use crate::cbmc::goto_program::{BuiltinFn, Expr, Location, Stmt, Type};
+use crate::mir_to_goto::GotocCtx;
 use rustc_middle::mir::Place;
 use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::ty::Instance;

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/symtab_transformer/gen_c_transformer/name_transformer.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/symtab_transformer/gen_c_transformer/name_transformer.rs

@@ -1,8 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR MIT
-use crate::gotoc::cbmc::goto_program::{Expr, Location, Stmt, Symbol, Type};
-use crate::gotoc::mir_to_goto::utils::slice_fat_ptr;
-use crate::gotoc::mir_to_goto::GotocCtx;
+use crate::cbmc::goto_program::{Expr, Location, Stmt, Symbol, Type};
+use crate::mir_to_goto::utils::slice_fat_ptr;
+use crate::mir_to_goto::GotocCtx;
 use rustc_ast::ast::Mutability;
 use rustc_middle::mir::interpret::{
     read_target_uint, AllocId, Allocation, ConstValue, GlobalAlloc, Scalar,

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/symtab_transformer/gen_c_transformer/nondet_transformer.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/symtab_transformer/gen_c_transformer/nondet_transformer.rs

@@ -5,9 +5,9 @@
 //! a place is an expression of specifying a location in memory, like a left value. check the cases
 //! in [codegen_place] below.
 
-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 crate::cbmc::goto_program::{Expr, Type};
+use crate::mir_to_goto::utils::slice_fat_ptr;
+use crate::mir_to_goto::GotocCtx;
 use rustc_hir::Mutability;
 use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::{

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/symtab_transformer/identity_transformer.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/symtab_transformer/identity_transformer.rs

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 use super::typ::{is_pointer, pointee_type};
 use crate::btree_string_map;
-use crate::gotoc::cbmc::goto_program::{BuiltinFn, Expr, Location, Stmt, Symbol, Type};
-use crate::gotoc::cbmc::utils::{aggr_name, BUG_REPORT_URL};
-use crate::gotoc::cbmc::MachineModel;
-use crate::gotoc::mir_to_goto::utils::{dynamic_fat_ptr, slice_fat_ptr};
-use crate::gotoc::mir_to_goto::GotocCtx;
+use crate::cbmc::goto_program::{BuiltinFn, Expr, Location, Stmt, Symbol, Type};
+use crate::cbmc::utils::{aggr_name, BUG_REPORT_URL};
+use crate::cbmc::MachineModel;
+use crate::mir_to_goto::utils::{dynamic_fat_ptr, slice_fat_ptr};
+use crate::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;

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/symtab_transformer/mod.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/symtab_transformer/mod.rs

@@ -3,8 +3,8 @@
 
 //! MIR Span related functions
 
-use crate::gotoc::cbmc::goto_program::Location;
-use crate::gotoc::mir_to_goto::GotocCtx;
+use crate::cbmc::goto_program::Location;
+use crate::mir_to_goto::GotocCtx;
 use rustc_middle::mir::{Local, VarDebugInfo, VarDebugInfoContents};
 use rustc_span::Span;
 

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/symtab_transformer/passes.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/symtab_transformer/passes.rs

@@ -1,8 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 use super::typ::FN_RETURN_VOID_VAR_NAME;
-use crate::gotoc::cbmc::goto_program::{BuiltinFn, Expr, Location, Stmt, Type};
-use crate::gotoc::mir_to_goto::GotocCtx;
+use crate::cbmc::goto_program::{BuiltinFn, Expr, Location, Stmt, Type};
+use crate::mir_to_goto::GotocCtx;
 use rustc_hir::def_id::DefId;
 use rustc_middle::mir;
 use rustc_middle::mir::{

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/symtab_transformer/transformer.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/symtab_transformer/transformer.rs

@@ -3,8 +3,8 @@
 
 //! This file contains functions related to codegenning MIR static variables into gotoc
 
-use crate::gotoc::cbmc::goto_program::Symbol;
-use crate::gotoc::mir_to_goto::GotocCtx;
+use crate::cbmc::goto_program::Symbol;
+use crate::mir_to_goto::GotocCtx;
 use rustc_hir::def_id::DefId;
 use rustc_middle::mir::mono::MonoItem;
 use tracing::debug;

compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/typ.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/goto_program/typ.rs

@@ -1,11 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 use crate::btree_map;
-use crate::gotoc::cbmc::goto_program::{
-    DatatypeComponent, Expr, Parameter, Symbol, SymbolTable, Type,
-};
-use crate::gotoc::cbmc::utils::aggr_name;
-use crate::gotoc::mir_to_goto::GotocCtx;
+use crate::cbmc::goto_program::{DatatypeComponent, Expr, Parameter, Symbol, SymbolTable, Type};
+use crate::cbmc::utils::aggr_name;
+use crate::mir_to_goto::GotocCtx;
 use rustc_ast::ast::Mutability;
 use rustc_index::vec::IndexVec;
 use rustc_middle::mir::{HasLocalDecls, Local, Operand, Place, Rvalue};

compiler/rustc_codegen_llvm/src/gotoc/cbmc/irep/from_irep.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/irep/from_irep.rs

@@ -3,10 +3,10 @@
 
 //! This file contains the code necessary to interface with the compiler backend
 
-use crate::gotoc::cbmc::goto_program::symtab_transformer;
-use crate::gotoc::cbmc::goto_program::SymbolTable;
-use crate::gotoc::mir_to_goto::overrides::skip_monomorphize;
-use crate::gotoc::mir_to_goto::GotocCtx;
+use crate::cbmc::goto_program::symtab_transformer;
+use crate::cbmc::goto_program::SymbolTable;
+use crate::mir_to_goto::overrides::skip_monomorphize;
+use crate::mir_to_goto::GotocCtx;
 use bitflags::_core::any::Any;
 use rustc_codegen_ssa::traits::CodegenBackend;
 use rustc_data_structures::fx::FxHashMap;

compiler/rustc_codegen_llvm/src/gotoc/cbmc/irep/irep.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/irep/irep.rs

@@ -1,8 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-use crate::gotoc::cbmc::goto_program::Stmt;
-use crate::gotoc::mir_to_goto::GotocCtx;
+use crate::cbmc::goto_program::Stmt;
+use crate::mir_to_goto::GotocCtx;
 use rustc_middle::mir::BasicBlock;
 use rustc_middle::mir::Body;
 use rustc_middle::ty::Instance;

compiler/rustc_codegen_llvm/src/gotoc/cbmc/irep/irep_id.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/irep/irep_id.rs

@@ -15,13 +15,13 @@
 //! this structure as input.
 
 use super::current_fn::CurrentFnCtx;
-use crate::gotoc::cbmc::goto_program::{
+use crate::cbmc::goto_program::{
     DatatypeComponent, Expr, Location, Stmt, Symbol, SymbolTable, Type,
 };
-use crate::gotoc::cbmc::utils::aggr_name;
-use crate::gotoc::cbmc::{MachineModel, RoundingMode};
-use crate::gotoc::mir_to_goto::overrides::{type_and_fn_hooks, GotocHooks, GotocTypeHooks};
-use crate::gotoc::mir_to_goto::utils::full_crate_name;
+use crate::cbmc::utils::aggr_name;
+use crate::cbmc::{MachineModel, RoundingMode};
+use crate::mir_to_goto::overrides::{type_and_fn_hooks, GotocHooks, GotocTypeHooks};
+use crate::mir_to_goto::utils::full_crate_name;
 use rustc_data_structures::owning_ref::OwningRef;
 use rustc_data_structures::rustc_erase_owner;
 use rustc_data_structures::stable_map::FxHashMap;

compiler/rustc_codegen_llvm/src/gotoc/cbmc/irep/mod.rs renamed to compiler/rustc_codegen_rmc/src/cbmc/irep/mod.rs

@@ -9,9 +9,9 @@
 //! this module addresses this issue.
 
 use super::stubs::{HashMapStub, VecStub};
-use crate::gotoc::cbmc::goto_program::{BuiltinFn, Expr, Location, Stmt, Symbol, Type};
-use crate::gotoc::mir_to_goto::utils::{instance_name_is, instance_name_starts_with};
-use crate::gotoc::mir_to_goto::GotocCtx;
+use crate::cbmc::goto_program::{BuiltinFn, Expr, Location, Stmt, Symbol, Type};
+use crate::mir_to_goto::utils::{instance_name_is, instance_name_starts_with};
+use crate::mir_to_goto::GotocCtx;
 use rustc_hir::definitions::DefPathDataName;
 use rustc_middle::mir::{BasicBlock, Place};
 use rustc_middle::ty::layout::LayoutOf;