Moved OperandBundleDef

Author: denismerigoux

src/librustc_codegen_llvm/builder.rs

@@ -10,7 +10,6 @@
 
 use llvm::{AtomicRmwBinOp, AtomicOrdering, SynchronizationScope, AsmDialect};
 use llvm::{self, False, OperandBundleDef, BasicBlock};
-use common;
 use rustc_codegen_utils::common::{IntPredicate, TypeKind, RealPredicate};
 use rustc_codegen_utils;
 use context::CodegenCx;
@@ -193,12 +192,14 @@ impl BuilderMethods<'a, 'll, 'tcx>
         }
     }
 
-    fn invoke(&self,
-                  llfn: &'ll Value,
-                  args: &[&'ll Value],
-                  then: &'ll BasicBlock,
-                  catch: &'ll BasicBlock,
-                  bundle: Option<&common::OperandBundleDef<'ll, &'ll Value>>) -> &'ll Value {
+    fn invoke(
+        &self,
+        llfn: &'ll Value,
+        args: &[&'ll Value],
+        then: &'ll BasicBlock,
+        catch: &'ll BasicBlock,
+        bundle: Option<&rustc_codegen_utils::common::OperandBundleDef<'ll, &'ll Value>>
+    ) -> &'ll Value {
         self.count_insn("invoke");
 
         debug!("Invoke {:?} with args ({:?})",
@@ -1320,8 +1321,12 @@ impl BuilderMethods<'a, 'll, 'tcx>
         self.call(lifetime_intrinsic, &[self.cx.const_u64(size), ptr], None);
     }
 
-    fn call(&self, llfn: &'ll Value, args: &[&'ll Value],
-                bundle: Option<&common::OperandBundleDef<'ll, &'ll Value>>) -> &'ll Value {
+    fn call(
+        &self,
+        llfn: &'ll Value,
+        args: &[&'ll Value],
+        bundle: Option<&rustc_codegen_utils::common::OperandBundleDef<'ll, &'ll Value>>
+    ) -> &'ll Value {
         self.count_insn("call");
 
         debug!("Call {:?} with args ({:?})",

src/librustc_codegen_llvm/common.rs

@@ -30,42 +30,16 @@ 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_utils::common::{OperandBundleDef, TypeKind};
 
 use libc::{c_uint, c_char};
 
 use syntax::symbol::LocalInternedString;
 use syntax::ast::Mutability;
-use syntax_pos::{Span, DUMMY_SP};
+use syntax_pos::Span;
 
 pub use context::CodegenCx;
 
-pub fn type_needs_drop<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, ty: Ty<'tcx>) -> bool {
-    ty.needs_drop(tcx, ty::ParamEnv::reveal_all())
-}
-
-pub fn type_is_sized<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, ty: Ty<'tcx>) -> bool {
-    ty.is_sized(tcx.at(DUMMY_SP), ty::ParamEnv::reveal_all())
-}
-
-pub fn type_is_freeze<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, ty: Ty<'tcx>) -> bool {
-    ty.is_freeze(tcx, ty::ParamEnv::reveal_all(), DUMMY_SP)
-}
-
-pub struct OperandBundleDef<'a, V> {
-    pub name: &'a str,
-    pub val: V
-}
-
-impl<V> OperandBundleDef<'ll, V> {
-    pub fn new(name: &'ll str, val: V) -> Self {
-        OperandBundleDef {
-            name,
-            val
-        }
-    }
-}
-
 /*
 * A note on nomenclature of linking: "extern", "foreign", and "upcall".
 *

src/librustc_codegen_llvm/interfaces/builder.rs

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

src/librustc_codegen_llvm/llvm/mod.rs

@@ -28,7 +28,7 @@ use std::ffi::CStr;
 use std::cell::RefCell;
 use libc::{self, c_uint, c_char, size_t};
 use rustc_data_structures::small_c_str::SmallCStr;
-use common;
+use rustc_codegen_utils;
 
 pub mod archive_ro;
 pub mod diagnostic;
@@ -273,7 +273,9 @@ impl OperandBundleDef<'a> {
         OperandBundleDef { raw: def }
     }
 
-    pub fn from_generic(bundle : &common::OperandBundleDef<'a, &'a Value>) -> Self {
+    pub fn from_generic(
+        bundle : &rustc_codegen_utils::common::OperandBundleDef<'a, &'a Value>
+    ) -> Self {
         Self::new(bundle.name, &[bundle.val])
     }
 }

src/librustc_codegen_llvm/type_.rs

@@ -27,6 +27,7 @@ use rustc::ty::layout::TyLayout;
 use rustc_target::abi::call::{CastTarget, FnType, Reg};
 use rustc_data_structures::small_c_str::SmallCStr;
 use common;
+use rustc_codegen_utils;
 use rustc_codegen_utils::common::TypeKind;
 use type_of::LayoutLlvmExt;
 use abi::{LlvmType, FnTypeExt};
@@ -373,15 +374,15 @@ impl DerivedTypeMethods<'ll, 'tcx> for CodegenCx<'ll, 'tcx, &'ll Value> {
     }
 
     fn type_needs_drop(&self, ty: Ty<'tcx>) -> bool {
-        common::type_needs_drop(*self.tcx(), ty)
+        rustc_codegen_utils::common::type_needs_drop(*self.tcx(), ty)
     }
 
     fn type_is_sized(&self, ty: Ty<'tcx>) -> bool {
-        common::type_is_sized(*self.tcx(), ty)
+        rustc_codegen_utils::common::type_is_sized(*self.tcx(), ty)
     }
 
     fn type_is_freeze(&self, ty: Ty<'tcx>) -> bool {
-        common::type_is_freeze(*self.tcx(), ty)
+        rustc_codegen_utils::common::type_is_freeze(*self.tcx(), ty)
     }
 
     fn type_has_metadata(&self, ty: Ty<'tcx>) -> bool {

src/librustc_codegen_utils/common.rs

@@ -7,9 +7,38 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-
 #![allow(non_camel_case_types, non_snake_case)]
 
+use rustc::ty::{self, Ty, TyCtxt};
+use syntax_pos::DUMMY_SP;
+
+
+pub fn type_needs_drop<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, ty: Ty<'tcx>) -> bool {
+    ty.needs_drop(tcx, ty::ParamEnv::reveal_all())
+}
+
+pub fn type_is_sized<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, ty: Ty<'tcx>) -> bool {
+    ty.is_sized(tcx.at(DUMMY_SP), ty::ParamEnv::reveal_all())
+}
+
+pub fn type_is_freeze<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, ty: Ty<'tcx>) -> bool {
+    ty.is_freeze(tcx, ty::ParamEnv::reveal_all(), DUMMY_SP)
+}
+
+pub struct OperandBundleDef<'a, V> {
+    pub name: &'a str,
+    pub val: V
+}
+
+impl<'a, V> OperandBundleDef<'a, V> {
+    pub fn new(name: &'a str, val: V) -> Self {
+        OperandBundleDef {
+            name,
+            val
+        }
+    }
+}
+
 pub enum IntPredicate {
     IntEQ,
     IntNE,