Beginning of moving all backend-agnostic code to rustc_codegen_ssa

Author: denismerigoux

src/librustc_codegen_llvm/back/lto.rs

@@ -25,7 +25,7 @@ use rustc_data_structures::fx::FxHashMap;
 use rustc_codegen_utils::symbol_export;
 use time_graph::Timeline;
 use ModuleLlvm;
-use rustc_codegen_utils::{ModuleCodegen, ModuleKind};
+use rustc_codegen_ssa::{ModuleCodegen, ModuleKind};
 
 use libc;
 

src/librustc_codegen_llvm/back/write.rs

@@ -27,7 +27,7 @@ use time_graph::{self, TimeGraph, Timeline};
 use llvm::{self, DiagnosticInfo, PassManager, SMDiagnostic};
 use llvm_util;
 use {CodegenResults, ModuleLlvm};
-use rustc_codegen_utils::{ModuleCodegen, ModuleKind, CachedModuleCodegen, CompiledModule};
+use rustc_codegen_ssa::{ModuleCodegen, ModuleKind, CachedModuleCodegen, CompiledModule};
 use CrateInfo;
 use rustc::hir::def_id::{CrateNum, LOCAL_CRATE};
 use rustc::ty::TyCtxt;

src/librustc_codegen_llvm/base.rs

@@ -24,7 +24,7 @@
 //!     int) and rec(x=int, y=int, z=int) will have the same llvm::Type.
 
 use super::ModuleLlvm;
-use rustc_codegen_utils::{ModuleCodegen, ModuleKind, CachedModuleCodegen};
+use rustc_codegen_ssa::{ModuleCodegen, ModuleKind, CachedModuleCodegen};
 use super::LlvmCodegenBackend;
 
 use abi;
@@ -53,7 +53,7 @@ use callee;
 use rustc_mir::monomorphize::collector::{self, MonoItemCollectionMode};
 use rustc_mir::monomorphize::item::DefPathBasedNames;
 use common;
-use rustc_codegen_utils::common::{RealPredicate, TypeKind, IntPredicate};
+use rustc_codegen_ssa::common::{RealPredicate, TypeKind, IntPredicate};
 use meth;
 use mir;
 use context::CodegenCx;

src/librustc_codegen_llvm/builder.rs

@@ -10,8 +10,8 @@
 
 use llvm::{AtomicRmwBinOp, AtomicOrdering, SynchronizationScope, AsmDialect};
 use llvm::{self, False, OperandBundleDef, BasicBlock};
-use rustc_codegen_utils::common::{IntPredicate, TypeKind, RealPredicate};
-use rustc_codegen_utils;
+use rustc_codegen_ssa::common::{IntPredicate, TypeKind, RealPredicate};
+use rustc_codegen_ssa;
 use context::CodegenCx;
 use type_::Type;
 use type_of::LayoutLlvmExt;
@@ -198,7 +198,7 @@ impl BuilderMethods<'a, 'll, 'tcx>
         args: &[&'ll Value],
         then: &'ll BasicBlock,
         catch: &'ll BasicBlock,
-        bundle: Option<&rustc_codegen_utils::common::OperandBundleDef<'ll, &'ll Value>>
+        bundle: Option<&rustc_codegen_ssa::common::OperandBundleDef<'ll, &'ll Value>>
     ) -> &'ll Value {
         self.count_insn("invoke");
 
@@ -516,7 +516,7 @@ impl BuilderMethods<'a, 'll, 'tcx>
     fn atomic_load(
         &self,
         ptr: &'ll Value,
-        order: rustc_codegen_utils::common::AtomicOrdering,
+        order: rustc_codegen_ssa::common::AtomicOrdering,
         align: Align
     ) -> &'ll Value {
         self.count_insn("load.atomic");
@@ -636,7 +636,7 @@ impl BuilderMethods<'a, 'll, 'tcx>
     }
 
     fn atomic_store(&self, val: &'ll Value, ptr: &'ll Value,
-                        order: rustc_codegen_utils::common::AtomicOrdering, align: Align) {
+                        order: rustc_codegen_ssa::common::AtomicOrdering, align: Align) {
         debug!("Store {:?} -> {:?}", val, ptr);
         self.count_insn("store.atomic");
         let ptr = self.check_store(val, ptr);
@@ -1167,8 +1167,8 @@ impl BuilderMethods<'a, 'll, 'tcx>
         dst: &'ll Value,
         cmp: &'ll Value,
         src: &'ll Value,
-        order: rustc_codegen_utils::common::AtomicOrdering,
-        failure_order: rustc_codegen_utils::common::AtomicOrdering,
+        order: rustc_codegen_ssa::common::AtomicOrdering,
+        failure_order: rustc_codegen_ssa::common::AtomicOrdering,
         weak: bool,
     ) -> &'ll Value {
         let weak = if weak { llvm::True } else { llvm::False };
@@ -1186,10 +1186,10 @@ impl BuilderMethods<'a, 'll, 'tcx>
     }
     fn atomic_rmw(
         &self,
-        op: rustc_codegen_utils::common::AtomicRmwBinOp,
+        op: rustc_codegen_ssa::common::AtomicRmwBinOp,
         dst: &'ll Value,
         src: &'ll Value,
-        order: rustc_codegen_utils::common::AtomicOrdering,
+        order: rustc_codegen_ssa::common::AtomicOrdering,
     ) -> &'ll Value {
         unsafe {
             llvm::LLVMBuildAtomicRMW(
@@ -1204,8 +1204,8 @@ impl BuilderMethods<'a, 'll, 'tcx>
 
     fn atomic_fence(
         &self,
-        order: rustc_codegen_utils::common::AtomicOrdering,
-        scope: rustc_codegen_utils::common::SynchronizationScope
+        order: rustc_codegen_ssa::common::AtomicOrdering,
+        scope: rustc_codegen_ssa::common::SynchronizationScope
     ) {
         unsafe {
             llvm::LLVMRustBuildAtomicFence(
@@ -1325,7 +1325,7 @@ impl BuilderMethods<'a, 'll, 'tcx>
         &self,
         llfn: &'ll Value,
         args: &[&'ll Value],
-        bundle: Option<&rustc_codegen_utils::common::OperandBundleDef<'ll, &'ll Value>>
+        bundle: Option<&rustc_codegen_ssa::common::OperandBundleDef<'ll, &'ll Value>>
     ) -> &'ll Value {
         self.count_insn("call");
 

src/librustc_codegen_llvm/common.rs

@@ -30,7 +30,7 @@ use rustc::hir;
 use interfaces::BuilderMethods;
 use mir::constant::const_alloc_to_llvm;
 use mir::place::PlaceRef;
-use rustc_codegen_utils::common::TypeKind;
+use rustc_codegen_ssa::common::TypeKind;
 
 use libc::{c_uint, c_char};
 

src/librustc_codegen_llvm/declare.rs

@@ -128,7 +128,7 @@ impl DeclareMethods<'ll, 'tcx> for CodegenCx<'ll, 'tcx, &'ll Value> {
         let fty = FnType::new(self, sig, &[]);
         let llfn = declare_raw_fn(self, name, fty.llvm_cconv(), fty.llvm_type(self));
 
-        if self.layout_of(sig.output()).abi == layout::Abi::Uninhabited {
+        if self.layout_of(sig.output()).abi.is_uninhabited() {
             llvm::Attribute::NoReturn.apply_llfn(Function, llfn);
         }
 

src/librustc_codegen_llvm/glue.rs

@@ -14,7 +14,7 @@
 
 use std;
 
-use rustc_codegen_utils::common::IntPredicate;
+use rustc_codegen_ssa::common::IntPredicate;
 use meth;
 use rustc::ty::layout::{LayoutOf, TyLayout, HasTyCtxt};
 use rustc::ty::{self, Ty};

src/librustc_codegen_llvm/interfaces/builder.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use rustc_codegen_utils::common::{IntPredicate, RealPredicate, AtomicOrdering,
+use rustc_codegen_ssa::common::{IntPredicate, RealPredicate, AtomicOrdering,
     SynchronizationScope, AtomicRmwBinOp, OperandBundleDef};
 use libc::c_char;
 use rustc::ty::TyCtxt;

src/librustc_codegen_llvm/interfaces/mod.rs

@@ -20,7 +20,7 @@ mod declare;
 mod asm;
 
 pub use self::builder::{BuilderMethods, HasCodegen};
-pub use rustc_codegen_utils::interfaces::{Backend, BackendMethods};
+pub use rustc_codegen_ssa::interfaces::{Backend, BackendMethods, CodegenObject};
 pub use self::consts::ConstMethods;
 pub use self::type_::{TypeMethods, BaseTypeMethods, DerivedTypeMethods,
     LayoutTypeMethods, ArgTypeMethods};
@@ -31,7 +31,6 @@ pub use self::debuginfo::{DebugInfoMethods, DebugInfoBuilderMethods};
 pub use self::abi::{AbiMethods, AbiBuilderMethods};
 pub use self::declare::{DeclareMethods, PreDefineMethods};
 pub use self::asm::{AsmMethods, AsmBuilderMethods};
-pub use rustc_codegen_utils::interfaces::CodegenObject;
 
 pub trait CodegenMethods<'ll, 'tcx: 'll> :
     Backend<'ll> + TypeMethods<'ll, 'tcx> + MiscMethods<'ll, 'tcx> + ConstMethods<'ll, 'tcx> +

src/librustc_codegen_llvm/interfaces/type_.rs

@@ -10,7 +10,7 @@
 
 use super::Backend;
 use super::builder::HasCodegen;
-use rustc_codegen_utils::common::TypeKind;
+use rustc_codegen_ssa::common::TypeKind;
 use syntax::ast;
 use rustc::ty::layout::{self, Align, Size};
 use std::cell::RefCell;