Finished moving backend-agnostic code to rustc_codegen_ssa

Author: denismerigoux

src/librustc_codegen_llvm/abi.rs

@@ -9,17 +9,18 @@
 // except according to those terms.
 
 use llvm::{self, AttributePlace};
-use builder::{Builder, MemFlags};
-use common::ty_fn_sig;
+use rustc_codegen_ssa::MemFlags;
+use builder::Builder;
+use rustc_codegen_ssa::common::ty_fn_sig;
 use context::CodegenCx;
-use mir::place::PlaceRef;
-use mir::operand::OperandValue;
+use rustc_codegen_ssa::mir::place::PlaceRef;
+use rustc_codegen_ssa::mir::operand::OperandValue;
 use type_::Type;
 use type_of::{LayoutLlvmExt, PointerKind};
 use value::Value;
 use rustc_target::abi::call::ArgType;
 
-use interfaces::*;
+use rustc_codegen_ssa::interfaces::*;
 
 use rustc_target::abi::{LayoutOf, Size, TyLayout};
 use rustc::ty::{self, Ty, Instance};

src/librustc_codegen_llvm/asm.rs

@@ -15,10 +15,10 @@ use builder::Builder;
 use value::Value;
 
 use rustc::hir;
-use interfaces::*;
+use rustc_codegen_ssa::interfaces::*;
 
-use mir::place::PlaceRef;
-use mir::operand::OperandValue;
+use rustc_codegen_ssa::mir::place::PlaceRef;
+use rustc_codegen_ssa::mir::operand::OperandValue;
 
 use std::ffi::CString;
 use libc::{c_uint, c_char};

src/librustc_codegen_llvm/attributes.rs

@@ -20,7 +20,7 @@ use rustc::ty::query::Providers;
 use rustc_data_structures::sync::Lrc;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_target::spec::PanicStrategy;
-use interfaces::*;
+use rustc_codegen_ssa::interfaces::*;
 
 use attributes;
 use llvm::{self, Attribute};

src/librustc_codegen_llvm/back/link.rs

@@ -24,7 +24,8 @@ use rustc::session::search_paths::PathKind;
 use rustc::session::Session;
 use rustc::middle::cstore::{NativeLibrary, LibSource, NativeLibraryKind};
 use rustc::middle::dependency_format::Linkage;
-use {CodegenResults, CrateInfo};
+use rustc_codegen_ssa::CrateInfo;
+use CodegenResults;
 use rustc::util::common::time;
 use rustc_fs_util::fix_windows_verbatim_for_gcc;
 use rustc::hir::def_id::CrateNum;

src/librustc_codegen_llvm/back/write.rs

@@ -30,8 +30,7 @@ use time_graph::{self, TimeGraph, Timeline};
 use llvm::{self, DiagnosticInfo, PassManager, SMDiagnostic};
 use llvm_util;
 use {CodegenResults, ModuleLlvm};
-use rustc_codegen_ssa::{ModuleCodegen, ModuleKind, CachedModuleCodegen, CompiledModule};
-use CrateInfo;
+use rustc_codegen_ssa::{ModuleCodegen, ModuleKind, CachedModuleCodegen, CompiledModule, CrateInfo};
 use rustc::hir::def_id::{CrateNum, LOCAL_CRATE};
 use rustc::ty::TyCtxt;
 use rustc::util::common::{time_ext, time_depth, set_time_depth, print_time_passes_entry};

src/librustc_codegen_llvm/base.rs

@@ -24,69 +24,34 @@
 //!     int) and rec(x=int, y=int, z=int) will have the same llvm::Type.
 
 use super::ModuleLlvm;
-use rustc_codegen_ssa::{ModuleCodegen, ModuleKind, CachedModuleCodegen};
+use rustc_codegen_ssa::{ModuleCodegen, ModuleKind};
+use rustc_codegen_ssa::base::maybe_create_entry_wrapper;
 use super::LlvmCodegenBackend;
 
-use abi;
 use back::write;
 use llvm;
 use metadata;
-use rustc::dep_graph::cgu_reuse_tracker::CguReuse;
-use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
-use rustc::middle::lang_items::StartFnLangItem;
-use rustc::middle::weak_lang_items;
-use rustc::mir::mono::{Linkage, Visibility, Stats, CodegenUnitNameBuilder};
+use rustc::mir::mono::{Linkage, Visibility, Stats};
 use rustc::middle::cstore::{EncodedMetadata};
-use rustc::ty::{self, Ty, TyCtxt};
-use rustc::ty::layout::{self, Align, TyLayout, LayoutOf, HasTyCtxt};
-use rustc::ty::query::Providers;
-use rustc::middle::cstore::{self, LinkagePreference};
+use rustc::ty::TyCtxt;
 use rustc::middle::exported_symbols;
-use rustc::util::common::{time, print_time_passes_entry};
-use rustc::util::profiling::ProfileCategory;
-use rustc::session::config::{self, DebugInfo, EntryFnType, Lto};
-use rustc::session::Session;
-use rustc_incremental;
-use mir::place::PlaceRef;
-use builder::{Builder, MemFlags};
-use callee;
-use rustc_mir::monomorphize::collector::{self, MonoItemCollectionMode};
-use rustc_mir::monomorphize::item::DefPathBasedNames;
+use rustc::session::config::{self, DebugInfo};
+use builder::Builder;
 use common;
-use rustc_codegen_ssa::common::{RealPredicate, TypeKind, IntPredicate};
-use meth;
-use mir;
 use context::CodegenCx;
-use monomorphize::Instance;
-use monomorphize::partitioning::{self, PartitioningStrategy, CodegenUnit, CodegenUnitExt};
-use rustc_codegen_utils::symbol_names_test;
-use time_graph;
-use mono_item::{MonoItem, BaseMonoItemExt, MonoItemExt};
-
-use rustc::util::nodemap::{FxHashMap, DefIdSet};
-use CrateInfo;
+use monomorphize::partitioning::CodegenUnitExt;
+use rustc_codegen_ssa::mono_item::MonoItemExt;
 use rustc_data_structures::small_c_str::SmallCStr;
-use rustc_data_structures::sync::Lrc;
 
-use interfaces::*;
+use rustc_codegen_ssa::interfaces::*;
 
-use std::any::Any;
 use std::ffi::CString;
-use std::sync::Arc;
-use std::time::{Instant, Duration};
-use std::cmp;
-use std::sync::mpsc;
-use syntax_pos::Span;
+use std::time::Instant;
 use syntax_pos::symbol::InternedString;
-use syntax::attr;
-use rustc::hir::{self, CodegenFnAttrs};
+use rustc::hir::CodegenFnAttrs;
 
 use value::Value;
 
-use mir::operand::OperandValue;
-
-use rustc_codegen_utils::check_for_rustc_errors_attr;
-use std::marker::PhantomData;
 
 
 pub(crate) fn write_metadata<'a, 'gcx>(

src/librustc_codegen_llvm/builder.rs

@@ -11,7 +11,7 @@
 use llvm::{AtomicRmwBinOp, AtomicOrdering, SynchronizationScope, AsmDialect};
 use llvm::{self, False, OperandBundleDef, BasicBlock};
 use rustc_codegen_ssa::common::{IntPredicate, TypeKind, RealPredicate};
-use rustc_codegen_ssa;
+use rustc_codegen_ssa::{self, MemFlags};
 use context::CodegenCx;
 use type_::Type;
 use type_of::LayoutLlvmExt;
@@ -21,11 +21,11 @@ use rustc::ty::TyCtxt;
 use rustc::ty::layout::{self, Align, Size};
 use rustc::session::config;
 use rustc_data_structures::small_c_str::SmallCStr;
-use interfaces::*;
+use rustc_codegen_ssa::interfaces::*;
 use syntax;
-use base;
-use mir::operand::{OperandValue, OperandRef};
-use mir::place::PlaceRef;
+use rustc_codegen_ssa::base::to_immediate;
+use rustc_codegen_ssa::mir::operand::{OperandValue, OperandRef};
+use rustc_codegen_ssa::mir::place::PlaceRef;
 use std::borrow::Cow;
 use std::ops::Range;
 use std::ptr;
@@ -573,7 +573,7 @@ impl BuilderMethods<'a, 'll, 'tcx>
                 }
                 load
             });
-            OperandValue::Immediate(base::to_immediate(self, llval, ptr.layout))
+            OperandValue::Immediate(to_immediate(self, llval, ptr.layout))
         } else if let layout::Abi::ScalarPair(ref a, ref b) = ptr.layout.abi {
             let load = |i, scalar: &layout::Scalar| {
                 let llptr = self.struct_gep(ptr.llval, i as u64);

src/librustc_codegen_llvm/callee.rs

@@ -15,17 +15,15 @@
 //! closure.
 
 use attributes;
-use common;
+use rustc_codegen_ssa::common;
 use llvm;
 use monomorphize::Instance;
 use context::CodegenCx;
 use value::Value;
-use interfaces::*;
+use rustc_codegen_ssa::interfaces::*;
 
-use rustc::hir::def_id::DefId;
-use rustc::ty::{self, TypeFoldable};
+use rustc::ty::TypeFoldable;
 use rustc::ty::layout::LayoutOf;
-use rustc::ty::subst::Substs;
 
 /// Codegens a reference to a fn/method item, monomorphizing and
 /// inlining as it goes.

src/librustc_codegen_llvm/common.rs

@@ -13,32 +13,22 @@
 //! Code that is useful in various codegen modules.
 
 use llvm::{self, True, False, Bool, BasicBlock};
-use rustc::hir::def_id::DefId;
-use rustc::middle::lang_items::LangItem;
 use abi;
-use base;
 use consts;
 use type_::Type;
 use type_of::LayoutLlvmExt;
 use value::Value;
-use interfaces::*;
+use rustc_codegen_ssa::interfaces::*;
 
-use rustc::ty::{self, Ty, TyCtxt};
 use rustc::ty::layout::{HasDataLayout, LayoutOf, self, TyLayout, Size};
 use rustc::mir::interpret::{Scalar, AllocType, Allocation};
-use rustc::hir;
-use interfaces::BuilderMethods;
-use mir::constant::const_alloc_to_llvm;
-use mir::place::PlaceRef;
-use rustc_codegen_ssa::common::TypeKind;
+use consts::const_alloc_to_llvm;
+use rustc_codegen_ssa::mir::place::PlaceRef;
 
 use libc::{c_uint, c_char};
-use std::iter;
 
-use rustc_target::spec::abi::Abi;
 use syntax::symbol::LocalInternedString;
 use syntax::ast::Mutability;
-use syntax_pos::Span;
 
 pub use context::CodegenCx;
 

src/librustc_codegen_llvm/consts.rs

@@ -11,21 +11,24 @@
 use libc::c_uint;
 use llvm::{self, SetUnnamedAddr, True};
 use rustc::hir::def_id::DefId;
+use rustc::mir::interpret::{ConstValue, Allocation, read_target_uint, Pointer, ConstEvalErr, GlobalId};
 use rustc::hir::Node;
 use debuginfo;
-use base;
 use monomorphize::MonoItem;
 use common::CodegenCx;
 use monomorphize::Instance;
 use syntax_pos::Span;
+use rustc_target::abi::HasDataLayout;
 use syntax_pos::symbol::LocalInternedString;
+use base;
 use type_::Type;
 use type_of::LayoutLlvmExt;
+use rustc_data_structures::sync::Lrc;
 use value::Value;
 use rustc::ty::{self, Ty};
-use interfaces::*;
+use rustc_codegen_ssa::interfaces::*;
 
-use rustc::ty::layout::{Align, LayoutOf};
+use rustc::ty::layout::{self, Size, Align, LayoutOf};
 
 use rustc::hir::{self, CodegenFnAttrs, CodegenFnAttrFlags};
 
@@ -363,7 +366,7 @@ impl StaticMethods<'ll> for CodegenCx<'ll, 'tcx, &'ll Value> {
         unsafe {
             let attrs = &self.tcx.codegen_fn_attrs(def_id);
 
-            let (v, alloc) = match ::mir::codegen_static_initializer(&self, def_id) {
+            let (v, alloc) = match codegen_static_initializer(&self, def_id) {
                 Ok(v) => v,
                 // Error has already been reported
                 Err(_) => return,