Generalized memset and memcpy

src/librustc_codegen_llvm/abi.rs

@@ -18,7 +18,7 @@
 use type_of::{LayoutLlvmExt, PointerKind};
 use value::Value;
 
-use interfaces::{BuilderMethods, ConstMethods, TypeMethods};
+use interfaces::{BuilderMethods, ConstMethods, BaseTypeMethods, DerivedTypeMethods};
 
 use rustc_target::abi::{HasDataLayout, LayoutOf, Size, TyLayout, Abi as LayoutAbi};
 use rustc::ty::{self, Ty};

src/librustc_codegen_llvm/asm.rs

@@ -15,7 +15,7 @@
 use value::Value;
 
 use rustc::hir;
-use interfaces::{BuilderMethods, ConstMethods, TypeMethods};
+use interfaces::{BuilderMethods, ConstMethods, BaseTypeMethods};
 
 use mir::place::PlaceRef;
 use mir::operand::OperandValue;

src/librustc_codegen_llvm/base.rs

@@ -73,7 +73,9 @@
 use rustc_data_structures::sync::Lrc;
 use rustc_data_structures::indexed_vec::Idx;
 
-use interfaces::{BuilderMethods, ConstMethods, TypeMethods};
+use interfaces::{
+    BuilderMethods, ConstMethods, BaseTypeMethods, DerivedTypeMethods, DerivedIntrinsicMethods,
+};
 
 use std::any::Any;
 use std::cmp;
@@ -431,13 +433,13 @@ pub fn to_immediate_scalar<'a, 'tcx: 'a, Builder: BuilderMethods<'a, 'tcx>>(
     val
 }
 
-pub fn call_memcpy(
-    bx: &Builder<'_, 'll, '_>,
-    dst: &'ll Value,
+pub fn call_memcpy<'a, 'tcx: 'a, Builder: BuilderMethods<'a, 'tcx>>(
+    bx: &Builder,
+    dst: Builder::Value,
     dst_align: Align,
-    src: &'ll Value,
+    src: Builder::Value,
     src_align: Align,
-    n_bytes: &'ll Value,
+    n_bytes: Builder::Value,
     flags: MemFlags,
 ) {
     if flags.contains(MemFlags::NONTEMPORAL) {
@@ -450,16 +452,16 @@ pub fn call_memcpy(
     let cx = bx.cx();
     let src_ptr = bx.pointercast(src, cx.type_i8p());
     let dst_ptr = bx.pointercast(dst, cx.type_i8p());
-    let size = bx.intcast(n_bytes, cx.isize_ty, false);
+    let size = bx.intcast(n_bytes, cx.type_isize(), false);
     let volatile = flags.contains(MemFlags::VOLATILE);
     bx.memcpy(dst_ptr, dst_align.abi(), src_ptr, src_align.abi(), size, volatile);
 }
 
-pub fn memcpy_ty(
-    bx: &Builder<'_, 'll, '_>,
-    dst: &'ll Value,
+pub fn memcpy_ty<'a, 'tcx: 'a, Builder: BuilderMethods<'a, 'tcx>>(
+    bx: &Builder,
+    dst: Builder::Value,
     dst_align: Align,
-    src: &'ll Value,
+    src: Builder::Value,
     src_align: Align,
     layout: TyLayout<'tcx>,
     flags: MemFlags,
@@ -472,15 +474,15 @@ pub fn memcpy_ty(
     call_memcpy(bx, dst, dst_align, src, src_align, bx.cx().const_usize(size), flags);
 }
 
-pub fn call_memset(
-    bx: &Builder<'_, 'll, '_>,
-    ptr: &'ll Value,
-    fill_byte: &'ll Value,
-    size: &'ll Value,
-    align: &'ll Value,
+pub fn call_memset<'a, 'tcx: 'a, Builder: BuilderMethods<'a, 'tcx>>(
+    bx: &Builder,
+    ptr: Builder::Value,
+    fill_byte: Builder::Value,
+    size: Builder::Value,
+    align: Builder::Value,
     volatile: bool,
-) -> &'ll Value {
-    let ptr_width = &bx.cx().sess().target.target.target_pointer_width;
+) -> Builder::Value {
+    let ptr_width = &bx.sess().target.target.target_pointer_width;
     let intrinsic_key = format!("llvm.memset.p0i8.i{}", ptr_width);
     let llintrinsicfn = bx.cx().get_intrinsic(&intrinsic_key);
     let volatile = bx.cx().const_bool(volatile);

src/librustc_codegen_llvm/builder.rs

@@ -19,7 +19,10 @@
 use rustc::ty::layout::{Align, Size};
 use rustc::session::{config, Session};
 use rustc_data_structures::small_c_str::SmallCStr;
-use interfaces::{BuilderMethods, Backend, ConstMethods, TypeMethods};
+use interfaces::{
+    Backend,
+    BuilderMethods, ConstMethods, BaseTypeMethods, DerivedTypeMethods, DerivedIntrinsicMethods,
+};
 use syntax;
 
 use std::borrow::Cow;

src/librustc_codegen_llvm/callee.rs

@@ -22,7 +22,7 @@
 use monomorphize::Instance;
 use type_of::LayoutLlvmExt;
 use value::Value;
-use interfaces::TypeMethods;
+use interfaces::BaseTypeMethods;
 
 use rustc::hir::def_id::DefId;
 use rustc::ty::{self, TypeFoldable};

src/librustc_codegen_llvm/common.rs

@@ -23,7 +23,7 @@
 use type_::Type;
 use type_of::LayoutLlvmExt;
 use value::Value;
-use interfaces::{Backend, ConstMethods, TypeMethods};
+use interfaces::{Backend, ConstMethods, BaseTypeMethods};
 
 use rustc::ty::{self, Ty, TyCtxt};
 use rustc::ty::layout::{HasDataLayout, LayoutOf};

src/librustc_codegen_llvm/consts.rs

@@ -24,7 +24,7 @@
 use type_of::LayoutLlvmExt;
 use value::Value;
 use rustc::ty::{self, Ty};
-use interfaces::TypeMethods;
+use interfaces::{BaseTypeMethods, DerivedTypeMethods};
 
 use rustc::ty::layout::{Align, LayoutOf};
 

src/librustc_codegen_llvm/debuginfo/gdb.rs

@@ -17,7 +17,7 @@
 use declare;
 use rustc::session::config::DebugInfo;
 use value::Value;
-use interfaces::{BuilderMethods, ConstMethods, TypeMethods};
+use interfaces::{BuilderMethods, ConstMethods, BaseTypeMethods};
 
 use syntax::attr;
 

src/librustc_codegen_llvm/interfaces/builder.rs

@@ -17,6 +17,7 @@
 use super::backend::Backend;
 use super::type_::TypeMethods;
 use super::consts::ConstMethods;
+use super::intrinsic::IntrinsicMethods;
 
 use std::borrow::Cow;
 use std::ops::Range;
@@ -24,7 +25,7 @@
 
 
 pub trait BuilderMethods<'a, 'tcx: 'a>: Backend {
-    type CodegenCx: 'a + TypeMethods + ConstMethods + Backend<
+    type CodegenCx: 'a + TypeMethods + ConstMethods + IntrinsicMethods + Backend<
         Value = Self::Value,
         BasicBlock = Self::BasicBlock,
         Type = Self::Type,

src/librustc_codegen_llvm/interfaces/intrinsic.rs

+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <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.
+
+use super::backend::Backend;
+
+pub trait BaseIntrinsicMethods: Backend {
+
+}
+
+pub trait DerivedIntrinsicMethods: Backend {
+    fn get_intrinsic(&self, key: &str) -> Self::Value;
+    fn declare_intrinsic(
+        &self,
+        key: &str
+    ) -> Option<Self::Value>;
+}
+
+pub trait IntrinsicMethods: BaseIntrinsicMethods + DerivedIntrinsicMethods {}

src/librustc_codegen_llvm/interfaces/mod.rs

@@ -12,8 +12,10 @@
 mod backend;
 mod consts;
 mod type_;
+mod intrinsic;
 
 pub use self::builder::BuilderMethods;
 pub use self::backend::Backend;
 pub use self::consts::ConstMethods;
-pub use self::type_::TypeMethods;
+pub use self::type_::{TypeMethods, BaseTypeMethods, DerivedTypeMethods};
+pub use self::intrinsic::{IntrinsicMethods, BaseIntrinsicMethods, DerivedIntrinsicMethods};

src/librustc_codegen_llvm/interfaces/type_.rs

@@ -10,8 +10,10 @@
 
 use super::backend::Backend;
 use common::TypeKind;
+use syntax::ast;
+use rustc::ty::layout::{self, Align, Size};
 
-pub trait TypeMethods: Backend {
+pub trait BaseTypeMethods: Backend {
     fn type_void(&self) -> Self::Type;
     fn type_metadata(&self) -> Self::Type;
     fn type_i1(&self) -> Self::Type;
@@ -42,3 +44,31 @@ pub trait TypeMethods: Backend {
 
     fn val_ty(&self, v: Self::Value) -> Self::Type;
 }
+
+pub trait DerivedTypeMethods: Backend {
+    fn type_bool(&self) -> Self::Type;
+    fn type_i8p(&self) -> Self::Type;
+    fn type_isize(&self) -> Self::Type;
+    fn type_int(&self) -> Self::Type;
+    fn type_int_from_ty(
+        &self,
+        t: ast::IntTy
+    ) -> Self::Type;
+    fn type_uint_from_ty(
+        &self,
+        t: ast::UintTy
+    ) -> Self::Type;
+    fn type_float_from_ty(
+        &self,
+        t: ast::FloatTy
+    ) -> Self::Type;
+    fn type_from_integer(&self, i: layout::Integer) -> Self::Type;
+    fn type_pointee_for_abi_align(&self, align: Align) -> Self::Type;
+    fn type_padding_filler(
+        &self,
+        size: Size,
+        align: Align
+    ) -> Self::Type;
+}
+
+pub trait TypeMethods: BaseTypeMethods + DerivedTypeMethods {}

src/librustc_codegen_llvm/intrinsic.rs

@@ -32,7 +32,9 @@
 use builder::Builder;
 use value::Value;
 
-use interfaces::{BuilderMethods, ConstMethods, TypeMethods};
+use interfaces::{
+    BuilderMethods, ConstMethods, BaseTypeMethods, DerivedTypeMethods, DerivedIntrinsicMethods,
+};
 
 use rustc::session::Session;
 use syntax_pos::Span;

src/librustc_codegen_llvm/meth.rs

@@ -16,7 +16,7 @@
 use monomorphize;
 use value::Value;
 
-use interfaces::{BuilderMethods, ConstMethods, TypeMethods};
+use interfaces::{BuilderMethods, ConstMethods, BaseTypeMethods, DerivedTypeMethods};
 
 use rustc::ty::{self, Ty};
 use rustc::ty::layout::HasDataLayout;

src/librustc_codegen_llvm/mir/block.rs

@@ -26,7 +26,9 @@
 use type_::Type;
 use value::Value;
 
-use interfaces::{BuilderMethods, ConstMethods, TypeMethods};
+use interfaces::{
+    BuilderMethods, ConstMethods, BaseTypeMethods, DerivedTypeMethods, DerivedIntrinsicMethods,
+};
 
 use syntax::symbol::Symbol;
 use syntax_pos::Pos;

src/librustc_codegen_llvm/mir/constant.rs

@@ -25,7 +25,7 @@
 use syntax::ast::Mutability;
 use syntax::source_map::Span;
 use value::Value;
-use interfaces::{BuilderMethods, ConstMethods, TypeMethods};
+use interfaces::{BuilderMethods, ConstMethods, BaseTypeMethods, DerivedTypeMethods};
 
 use super::super::callee;
 use super::FunctionCx;

src/librustc_codegen_llvm/mir/mod.rs

@@ -24,7 +24,7 @@
 use monomorphize::Instance;
 use abi::{ArgTypeExt, FnType, FnTypeExt, PassMode};
 use value::Value;
-use interfaces::{BuilderMethods, ConstMethods};
+use interfaces::{BuilderMethods, ConstMethods, DerivedTypeMethods};
 
 use syntax_pos::{DUMMY_SP, NO_EXPANSION, BytePos, Span};
 use syntax::symbol::keywords;

src/librustc_codegen_llvm/mir/operand.rs

@@ -20,7 +20,7 @@
 use type_of::LayoutLlvmExt;
 use glue;
 
-use interfaces::{BuilderMethods, ConstMethods, TypeMethods};
+use interfaces::{BuilderMethods, ConstMethods, BaseTypeMethods, DerivedIntrinsicMethods};
 
 use std::fmt;
 

src/librustc_codegen_llvm/mir/place.rs

@@ -22,7 +22,9 @@
 use glue;
 use mir::constant::const_alloc_to_llvm;
 
-use interfaces::{BuilderMethods, ConstMethods, TypeMethods};
+use interfaces::{
+    BuilderMethods, ConstMethods, BaseTypeMethods, DerivedTypeMethods, DerivedIntrinsicMethods,
+};
 
 use super::{FunctionCx, LocalRef};
 use super::operand::{OperandRef, OperandValue};

src/librustc_codegen_llvm/mir/rvalue.rs

@@ -26,7 +26,7 @@
 use type_of::LayoutLlvmExt;
 use value::Value;
 
-use interfaces::{BuilderMethods, ConstMethods, TypeMethods};
+use interfaces::{BuilderMethods, ConstMethods, BaseTypeMethods, DerivedIntrinsicMethods};
 
 use super::{FunctionCx, LocalRef};
 use super::operand::{OperandRef, OperandValue};

src/librustc_codegen_llvm/type_.rs

@@ -15,7 +15,7 @@
 use llvm;
 use llvm::{Bool, False, True};
 use context::CodegenCx;
-use interfaces::TypeMethods;
+use interfaces::{BaseTypeMethods, DerivedTypeMethods, TypeMethods};
 use value::Value;
 
 
@@ -42,8 +42,7 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
     }
 }
 
-impl TypeMethods for CodegenCx<'ll, 'tcx> {
-
+impl BaseTypeMethods for CodegenCx<'ll, 'tcx> {
     fn type_void(&self) -> &'ll Type {
         unsafe {
             llvm::LLVMVoidTypeInContext(self.llcx)
@@ -265,20 +264,20 @@ fn ptr_to(&self) -> &Type {
     }
 }
 
-impl CodegenCx<'ll, 'tcx> {
-    pub fn type_bool(&self) -> &'ll Type {
+impl DerivedTypeMethods for CodegenCx<'ll, 'tcx> {
+    fn type_bool(&self) -> &'ll Type {
         self.type_i8()
     }
 
-    pub fn type_i8p(&self) -> &'ll Type {
+    fn type_i8p(&self) -> &'ll Type {
         self.type_ptr_to(self.type_i8())
     }
 
-    pub fn type_isize(&self) -> &'ll Type {
+    fn type_isize(&self) -> &'ll Type {
         self.isize_ty
     }
 
-    pub fn type_int(&self) -> &'ll Type {
+    fn type_int(&self) -> &'ll Type {
         match &self.sess().target.target.target_c_int_width[..] {
             "16" => self.type_i16(),
             "32" => self.type_i32(),
@@ -287,7 +286,7 @@ pub fn type_int(&self) -> &'ll Type {
         }
     }
 
-    pub fn type_int_from_ty(
+    fn type_int_from_ty(
         &self,
         t: ast::IntTy
     ) -> &'ll Type {
@@ -301,7 +300,7 @@ pub fn type_int_from_ty(
         }
     }
 
-    pub fn type_uint_from_ty(
+    fn type_uint_from_ty(
         &self,
         t: ast::UintTy
     ) -> &'ll Type {
@@ -315,7 +314,7 @@ pub fn type_uint_from_ty(
         }
     }
 
-    pub fn type_float_from_ty(
+    fn type_float_from_ty(
         &self,
         t: ast::FloatTy
     ) -> &'ll Type {
@@ -325,7 +324,7 @@ pub fn type_float_from_ty(
         }
     }
 
-    pub fn type_from_integer(&self, i: layout::Integer) -> &'ll Type {
+    fn type_from_integer(&self, i: layout::Integer) -> &'ll Type {
         use rustc::ty::layout::Integer::*;
         match i {
             I8 => self.type_i8(),
@@ -338,7 +337,7 @@ pub fn type_from_integer(&self, i: layout::Integer) -> &'ll Type {
 
     /// Return a LLVM type that has at most the required alignment,
     /// as a conservative approximation for unknown pointee types.
-    pub fn type_pointee_for_abi_align(&self, align: Align) -> &'ll Type {
+    fn type_pointee_for_abi_align(&self, align: Align) -> &'ll Type {
         // FIXME(eddyb) We could find a better approximation if ity.align < align.
         let ity = layout::Integer::approximate_abi_align(self, align);
         self.type_from_integer(ity)
@@ -346,7 +345,7 @@ pub fn type_pointee_for_abi_align(&self, align: Align) -> &'ll Type {
 
     /// Return a LLVM type that has at most the required alignment,
     /// and exactly the required size, as a best-effort padding array.
-    pub fn type_padding_filler(
+    fn type_padding_filler(
         &self,
         size: Size,
         align: Align
@@ -358,3 +357,5 @@ pub fn type_padding_filler(
         self.type_array(self.type_from_integer(unit), size / unit_size)
     }
 }
+
+impl TypeMethods for CodegenCx<'ll, 'tcx> {}

src/librustc_codegen_llvm/type_of.rs

@@ -16,7 +16,7 @@
 use rustc_target::abi::FloatTy;
 use rustc_mir::monomorphize::item::DefPathBasedNames;
 use type_::Type;
-use interfaces::TypeMethods;
+use interfaces::{BaseTypeMethods, DerivedTypeMethods};
 
 use std::fmt::Write;