From 59682d3e2ae1b173a29aff25d30afe49349379de Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Sat, 24 Nov 2018 17:11:59 +0100 Subject: [PATCH] Remove static_bitcast from cg_ssa --- src/librustc_codegen_llvm/consts.rs | 15 ++++++++------- src/librustc_codegen_ssa/traits/statics.rs | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/librustc_codegen_llvm/consts.rs b/src/librustc_codegen_llvm/consts.rs index 47899d426f7c0..d9afded6834b0 100644 --- a/src/librustc_codegen_llvm/consts.rs +++ b/src/librustc_codegen_llvm/consts.rs @@ -171,17 +171,18 @@ pub fn ptrcast(val: &'ll Value, ty: &'ll Type) -> &'ll Value { } } -impl StaticMethods for CodegenCx<'ll, 'tcx> { - - fn static_ptrcast(&self, val: &'ll Value, ty: &'ll Type) -> &'ll Value { - ptrcast(val, ty) - } - - fn static_bitcast(&self, val: &'ll Value, ty: &'ll Type) -> &'ll Value { +impl CodegenCx<'ll, 'tcx> { + crate fn static_bitcast(&self, val: &'ll Value, ty: &'ll Type) -> &'ll Value { unsafe { llvm::LLVMConstBitCast(val, ty) } } +} + +impl StaticMethods for CodegenCx<'ll, 'tcx> { + fn static_ptrcast(&self, val: &'ll Value, ty: &'ll Type) -> &'ll Value { + ptrcast(val, ty) + } fn static_addr_of_mut( &self, diff --git a/src/librustc_codegen_ssa/traits/statics.rs b/src/librustc_codegen_ssa/traits/statics.rs index aa4d69f078ff1..7ea90dfcce097 100644 --- a/src/librustc_codegen_ssa/traits/statics.rs +++ b/src/librustc_codegen_ssa/traits/statics.rs @@ -14,7 +14,6 @@ use rustc::ty::layout::Align; pub trait StaticMethods: BackendTypes { fn static_ptrcast(&self, val: Self::Value, ty: Self::Type) -> Self::Value; - fn static_bitcast(&self, val: Self::Value, ty: Self::Type) -> Self::Value; fn static_addr_of_mut(&self, cv: Self::Value, align: Align, kind: Option<&str>) -> Self::Value; fn static_addr_of(&self, cv: Self::Value, align: Align, kind: Option<&str>) -> Self::Value; fn get_static(&self, def_id: DefId) -> Self::Value;