Relax some trait constraints

Author: bjorn3

src/librustc_codegen_llvm/builder.rs

@@ -1246,11 +1246,6 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
         }
     }
 
-
-    fn cx(&self) -> &CodegenCx<'ll, 'tcx> {
-        self.cx
-    }
-
     unsafe fn delete_basic_block(&mut self, bb: &'ll BasicBlock) {
         llvm::LLVMDeleteBasicBlock(bb);
     }
@@ -1261,7 +1256,7 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
 }
 
 impl StaticBuilderMethods<'tcx> for Builder<'a, 'll, 'tcx> {
-fn get_static(&mut self, def_id: DefId) -> &'ll Value {
+    fn get_static(&mut self, def_id: DefId) -> &'ll Value {
         // Forward to the `get_static` method of `CodegenCx`
         self.cx().get_static(def_id)
     }

src/librustc_codegen_ssa/base.rs

@@ -356,7 +356,7 @@ pub fn wants_msvc_seh(sess: &Session) -> bool {
     sess.target.target.options.is_like_msvc
 }
 
-pub fn from_immediate<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
+pub fn from_immediate<'a, 'tcx: 'a, Bx: NumBuilderMethods<'tcx>>(
     bx: &mut Bx,
     val: Bx::Value
 ) -> Bx::Value {
@@ -367,7 +367,7 @@ pub fn from_immediate<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
     }
 }
 
-pub fn to_immediate<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
+pub fn to_immediate<'a, 'tcx: 'a, Bx: NumBuilderMethods<'tcx>>(
     bx: &mut Bx,
     val: Bx::Value,
     layout: layout::TyLayout<'_>,
@@ -378,7 +378,7 @@ pub fn to_immediate<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
     val
 }
 
-pub fn to_immediate_scalar<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
+pub fn to_immediate_scalar<'a, 'tcx: 'a, Bx: NumBuilderMethods<'tcx>>(
     bx: &mut Bx,
     val: Bx::Value,
     scalar: &layout::Scalar,
@@ -389,15 +389,17 @@ pub fn to_immediate_scalar<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
     val
 }
 
-pub fn memcpy_ty<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
+pub fn memcpy_ty<'a, 'tcx: 'a, Bx: MemoryBuilderMethods<'tcx>>(
     bx: &mut Bx,
     dst: Bx::Value,
     dst_align: Align,
     src: Bx::Value,
     src_align: Align,
     layout: TyLayout<'tcx>,
     flags: MemFlags,
-) {
+)
+    where Bx::CodegenCx: ConstMethods<'tcx>
+{
     let size = layout.size.bytes();
     if size == 0 {
         return;

src/librustc_codegen_ssa/traits/builder.rs

@@ -190,7 +190,6 @@ pub trait BuilderMethods<'a, 'tcx: 'a>:
     fn new_block<'b>(cx: &'a Self::CodegenCx, llfn: Self::Value, name: &'b str) -> Self;
     fn with_cx(cx: &'a Self::CodegenCx) -> Self;
     fn build_sibling_block<'b>(&self, name: &'b str) -> Self;
-    fn cx(&self) -> &Self::CodegenCx;
     fn llbb(&self) -> Self::BasicBlock;
 
     fn position_at_end(&mut self, llbb: Self::BasicBlock);

src/librustc_codegen_ssa/traits/mod.rs

@@ -85,5 +85,10 @@ pub trait HasCodegen<'tcx>:
             Type = Self::Type,
             Funclet = Self::Funclet,
             DIScope = Self::DIScope,
-        >;
+        >
+        + BaseTypeMethods<'tcx>;
+
+    fn cx(&self) -> &Self::CodegenCx {
+        &**self
+    }
 }