diff options
| author | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2018-12-03 16:31:20 +0100 |
|---|---|---|
| committer | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2018-12-03 16:31:20 +0100 |
| commit | 2e00d648c059b56f0b2dc7a362a098aa627292fc (patch) | |
| tree | 390332dec714faddc4ba7c691f3941d60d119a40 /src/librustc_codegen_llvm | |
| parent | a1e83a905f1ad82f2f35fd72b6b6797d7b60b8d0 (diff) | |
| download | rust-2e00d648c059b56f0b2dc7a362a098aa627292fc.tar.gz rust-2e00d648c059b56f0b2dc7a362a098aa627292fc.zip | |
s/AllocType/AllocKind/
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/common.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_codegen_llvm/common.rs b/src/librustc_codegen_llvm/common.rs index fd13421835c..0d9c417f522 100644 --- a/src/librustc_codegen_llvm/common.rs +++ b/src/librustc_codegen_llvm/common.rs @@ -21,7 +21,7 @@ use value::Value; use rustc_codegen_ssa::traits::*; use rustc::ty::layout::{HasDataLayout, LayoutOf, self, TyLayout, Size}; -use rustc::mir::interpret::{Scalar, AllocType, Allocation}; +use rustc::mir::interpret::{Scalar, AllocKind, Allocation}; use consts::const_alloc_to_llvm; use rustc_codegen_ssa::mir::place::PlaceRef; @@ -318,7 +318,7 @@ impl ConstMethods<'tcx> for CodegenCx<'ll, 'tcx> { Scalar::Ptr(ptr) => { let alloc_type = self.tcx.alloc_map.lock().get(ptr.alloc_id); let base_addr = match alloc_type { - Some(AllocType::Memory(alloc)) => { + Some(AllocKind::Memory(alloc)) => { let init = const_alloc_to_llvm(self, alloc); if alloc.mutability == Mutability::Mutable { self.static_addr_of_mut(init, alloc.align, None) @@ -326,10 +326,10 @@ impl ConstMethods<'tcx> for CodegenCx<'ll, 'tcx> { self.static_addr_of(init, alloc.align, None) } } - Some(AllocType::Function(fn_instance)) => { + Some(AllocKind::Function(fn_instance)) => { self.get_fn(fn_instance) } - Some(AllocType::Static(def_id)) => { + Some(AllocKind::Static(def_id)) => { assert!(self.tcx.is_static(def_id).is_some()); self.get_static(def_id) } |
