From 2e00d648c059b56f0b2dc7a362a098aa627292fc Mon Sep 17 00:00:00 2001 From: Oliver Scherer Date: Mon, 3 Dec 2018 16:31:20 +0100 Subject: [PATCH] s/AllocType/AllocKind/ --- src/librustc/ich/impls_ty.rs | 2 +- src/librustc/mir/interpret/mod.rs | 28 +++++++++++----------- src/librustc/mir/interpret/value.rs | 2 +- src/librustc/mir/mod.rs | 2 +- src/librustc_codegen_llvm/common.rs | 8 +++---- src/librustc_mir/interpret/memory.rs | 26 ++++++++++---------- src/librustc_mir/interpret/validity.rs | 4 ++-- src/librustc_mir/monomorphize/collector.rs | 8 +++---- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs index 00ef3dd414bc..56da6b719f4a 100644 --- a/src/librustc/ich/impls_ty.rs +++ b/src/librustc/ich/impls_ty.rs @@ -338,7 +338,7 @@ impl_stable_hash_for!( ); impl_stable_hash_for!( - impl<'tcx> for enum mir::interpret::AllocType<'tcx> [ mir::interpret::AllocType ] { + impl<'tcx> for enum mir::interpret::AllocKind<'tcx> [ mir::interpret::AllocKind ] { Function(instance), Static(def_id), Memory(mem), diff --git a/src/librustc/mir/interpret/mod.rs b/src/librustc/mir/interpret/mod.rs index 8d8128f7a19b..fbfe0cdae6be 100644 --- a/src/librustc/mir/interpret/mod.rs +++ b/src/librustc/mir/interpret/mod.rs @@ -103,20 +103,20 @@ pub fn specialized_encode_alloc_id< tcx: TyCtxt<'a, 'tcx, 'tcx>, alloc_id: AllocId, ) -> Result<(), E::Error> { - let alloc_type: AllocType<'tcx> = + let alloc_type: AllocKind<'tcx> = tcx.alloc_map.lock().get(alloc_id).expect("no value for AllocId"); match alloc_type { - AllocType::Memory(alloc) => { + AllocKind::Memory(alloc) => { trace!("encoding {:?} with {:#?}", alloc_id, alloc); AllocDiscriminant::Alloc.encode(encoder)?; alloc.encode(encoder)?; } - AllocType::Function(fn_instance) => { + AllocKind::Function(fn_instance) => { trace!("encoding {:?} with {:#?}", alloc_id, fn_instance); AllocDiscriminant::Fn.encode(encoder)?; fn_instance.encode(encoder)?; } - AllocType::Static(did) => { + AllocKind::Static(did) => { // referring to statics doesn't need to know about their allocations, // just about its DefId AllocDiscriminant::Static.encode(encoder)?; @@ -291,7 +291,7 @@ impl fmt::Display for AllocId { } #[derive(Debug, Clone, Eq, PartialEq, Hash, RustcDecodable, RustcEncodable)] -pub enum AllocType<'tcx> { +pub enum AllocKind<'tcx> { /// The alloc id is used as a function pointer Function(Instance<'tcx>), /// The alloc id points to a "lazy" static variable that did not get computed (yet). @@ -303,10 +303,10 @@ pub enum AllocType<'tcx> { pub struct AllocMap<'tcx> { /// Lets you know what an AllocId refers to - id_to_type: FxHashMap>, + id_to_type: FxHashMap>, /// Used to ensure that statics only get one associated AllocId - type_interner: FxHashMap, AllocId>, + type_interner: FxHashMap, AllocId>, /// The AllocId to assign to the next requested id. /// Always incremented, never gets smaller. @@ -339,7 +339,7 @@ impl<'tcx> AllocMap<'tcx> { next } - fn intern(&mut self, alloc_type: AllocType<'tcx>) -> AllocId { + fn intern(&mut self, alloc_type: AllocKind<'tcx>) -> AllocId { if let Some(&alloc_id) = self.type_interner.get(&alloc_type) { return alloc_id; } @@ -356,21 +356,21 @@ impl<'tcx> AllocMap<'tcx> { /// `main as fn() == main as fn()` is false, while `let x = main as fn(); x == x` is true. pub fn create_fn_alloc(&mut self, instance: Instance<'tcx>) -> AllocId { let id = self.reserve(); - self.id_to_type.insert(id, AllocType::Function(instance)); + self.id_to_type.insert(id, AllocKind::Function(instance)); id } /// Returns `None` in case the `AllocId` is dangling. /// This function exists to allow const eval to detect the difference between evaluation- /// local dangling pointers and allocations in constants/statics. - pub fn get(&self, id: AllocId) -> Option> { + pub fn get(&self, id: AllocId) -> Option> { self.id_to_type.get(&id).cloned() } /// Panics if the `AllocId` does not refer to an `Allocation` pub fn unwrap_memory(&self, id: AllocId) -> &'tcx Allocation { match self.get(id) { - Some(AllocType::Memory(mem)) => mem, + Some(AllocKind::Memory(mem)) => mem, _ => bug!("expected allocation id {} to point to memory", id), } } @@ -378,7 +378,7 @@ impl<'tcx> AllocMap<'tcx> { /// Generate an `AllocId` for a static or return a cached one in case this function has been /// called on the same static before. pub fn intern_static(&mut self, static_id: DefId) -> AllocId { - self.intern(AllocType::Static(static_id)) + self.intern(AllocKind::Static(static_id)) } /// Intern the `Allocation` and return a new `AllocId`, even if there's already an identical @@ -395,7 +395,7 @@ impl<'tcx> AllocMap<'tcx> { /// Freeze an `AllocId` created with `reserve` by pointing it at an `Allocation`. Trying to /// call this function twice, even with the same `Allocation` will ICE the compiler. pub fn set_id_memory(&mut self, id: AllocId, mem: &'tcx Allocation) { - if let Some(old) = self.id_to_type.insert(id, AllocType::Memory(mem)) { + if let Some(old) = self.id_to_type.insert(id, AllocKind::Memory(mem)) { bug!("tried to set allocation id {}, but it was already existing as {:#?}", id, old); } } @@ -403,7 +403,7 @@ impl<'tcx> AllocMap<'tcx> { /// Freeze an `AllocId` created with `reserve` by pointing it at an `Allocation`. May be called /// twice for the same `(AllocId, Allocation)` pair. pub fn set_id_same_memory(&mut self, id: AllocId, mem: &'tcx Allocation) { - self.id_to_type.insert_same(id, AllocType::Memory(mem)); + self.id_to_type.insert_same(id, AllocKind::Memory(mem)); } } diff --git a/src/librustc/mir/interpret/value.rs b/src/librustc/mir/interpret/value.rs index 4bcba9d54674..16374c92606e 100644 --- a/src/librustc/mir/interpret/value.rs +++ b/src/librustc/mir/interpret/value.rs @@ -18,7 +18,7 @@ use super::{EvalResult, Pointer, PointerArithmetic, Allocation, AllocId, sign_ex /// Represents the result of a raw const operation, pre-validation. #[derive(Copy, Clone, Debug, Eq, PartialEq, RustcEncodable, RustcDecodable, Hash)] pub struct RawConst<'tcx> { - // the value lives here, at offset 0, and that allocation definitely is a `AllocType::Memory` + // the value lives here, at offset 0, and that allocation definitely is a `AllocKind::Memory` // (so you can use `AllocMap::unwrap_memory`). pub alloc_id: AllocId, pub ty: Ty<'tcx>, diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs index 368f83eb6112..47058f91525a 100644 --- a/src/librustc/mir/mod.rs +++ b/src/librustc/mir/mod.rs @@ -2629,7 +2629,7 @@ pub fn fmt_const_val(f: &mut impl Write, const_val: &ty::Const<'_>) -> fmt::Resu if let Ref(_, &ty::TyS { sty: Str, .. }, _) = ty.sty { return ty::tls::with(|tcx| { let alloc = tcx.alloc_map.lock().get(ptr.alloc_id); - if let Some(interpret::AllocType::Memory(alloc)) = alloc { + if let Some(interpret::AllocKind::Memory(alloc)) = alloc { assert_eq!(len as usize as u128, len); let slice = &alloc.bytes[(ptr.offset.bytes() as usize)..][..(len as usize)]; diff --git a/src/librustc_codegen_llvm/common.rs b/src/librustc_codegen_llvm/common.rs index fd13421835c1..0d9c417f5229 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) } diff --git a/src/librustc_mir/interpret/memory.rs b/src/librustc_mir/interpret/memory.rs index 97d7e1586b81..cc96976e74a3 100644 --- a/src/librustc_mir/interpret/memory.rs +++ b/src/librustc_mir/interpret/memory.rs @@ -29,7 +29,7 @@ use syntax::ast::Mutability; use super::{ Pointer, AllocId, Allocation, GlobalId, AllocationExtra, - EvalResult, Scalar, EvalErrorKind, AllocType, PointerArithmetic, + EvalResult, Scalar, EvalErrorKind, AllocKind, PointerArithmetic, Machine, AllocMap, MayLeak, ErrorHandled, InboundsCheck, }; @@ -204,12 +204,12 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> { None => { // Deallocating static memory -- always an error return match self.tcx.alloc_map.lock().get(ptr.alloc_id) { - Some(AllocType::Function(..)) => err!(DeallocatedWrongMemoryKind( + Some(AllocKind::Function(..)) => err!(DeallocatedWrongMemoryKind( "function".to_string(), format!("{:?}", kind), )), - Some(AllocType::Static(..)) | - Some(AllocType::Memory(..)) => err!(DeallocatedWrongMemoryKind( + Some(AllocKind::Static(..)) | + Some(AllocKind::Memory(..)) => err!(DeallocatedWrongMemoryKind( "static".to_string(), format!("{:?}", kind), )), @@ -326,15 +326,15 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> { ) -> EvalResult<'tcx, Cow<'tcx, Allocation>> { let alloc = tcx.alloc_map.lock().get(id); let def_id = match alloc { - Some(AllocType::Memory(mem)) => { + Some(AllocKind::Memory(mem)) => { // We got tcx memory. Let the machine figure out whether and how to // turn that into memory with the right pointer tag. return Ok(M::adjust_static_allocation(mem, memory_extra)) } - Some(AllocType::Function(..)) => { + Some(AllocKind::Function(..)) => { return err!(DerefFunctionPointer) } - Some(AllocType::Static(did)) => { + Some(AllocKind::Static(did)) => { did } None => @@ -435,8 +435,8 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> { } // Could also be a fn ptr or extern static match self.tcx.alloc_map.lock().get(id) { - Some(AllocType::Function(..)) => (Size::ZERO, Align::from_bytes(1).unwrap()), - Some(AllocType::Static(did)) => { + Some(AllocKind::Function(..)) => (Size::ZERO, Align::from_bytes(1).unwrap()), + Some(AllocKind::Static(did)) => { // The only way `get` couldn't have worked here is if this is an extern static assert!(self.tcx.is_foreign_item(did)); // Use size and align of the type @@ -459,7 +459,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> { } trace!("reading fn ptr: {}", ptr.alloc_id); match self.tcx.alloc_map.lock().get(ptr.alloc_id) { - Some(AllocType::Function(instance)) => Ok(instance), + Some(AllocKind::Function(instance)) => Ok(instance), _ => Err(EvalErrorKind::ExecuteMemory.into()), } } @@ -557,16 +557,16 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> { Err(()) => { // static alloc? match self.tcx.alloc_map.lock().get(id) { - Some(AllocType::Memory(alloc)) => { + Some(AllocKind::Memory(alloc)) => { self.dump_alloc_helper( &mut allocs_seen, &mut allocs_to_print, msg, alloc, " (immutable)".to_owned() ); } - Some(AllocType::Function(func)) => { + Some(AllocKind::Function(func)) => { trace!("{} {}", msg, func); } - Some(AllocType::Static(did)) => { + Some(AllocKind::Static(did)) => { trace!("{} {:?}", msg, did); } None => { diff --git a/src/librustc_mir/interpret/validity.rs b/src/librustc_mir/interpret/validity.rs index d98d05bc01b8..bf771789c8de 100644 --- a/src/librustc_mir/interpret/validity.rs +++ b/src/librustc_mir/interpret/validity.rs @@ -17,7 +17,7 @@ use rustc::ty::layout::{self, Size, Align, TyLayout, LayoutOf, VariantIdx}; use rustc::ty; use rustc_data_structures::fx::FxHashSet; use rustc::mir::interpret::{ - Scalar, AllocType, EvalResult, EvalErrorKind, + Scalar, AllocKind, EvalResult, EvalErrorKind, }; use super::{ @@ -388,7 +388,7 @@ impl<'rt, 'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> "integer pointer in non-ZST reference", self.path); // Skip validation entirely for some external statics let alloc_kind = self.ecx.tcx.alloc_map.lock().get(ptr.alloc_id); - if let Some(AllocType::Static(did)) = alloc_kind { + if let Some(AllocKind::Static(did)) = alloc_kind { // `extern static` cannot be validated as they have no body. // FIXME: Statics from other crates are also skipped. // They might be checked at a different type, but for now we diff --git a/src/librustc_mir/monomorphize/collector.rs b/src/librustc_mir/monomorphize/collector.rs index 7531f62fdab7..ec5c57ee0ba6 100644 --- a/src/librustc_mir/monomorphize/collector.rs +++ b/src/librustc_mir/monomorphize/collector.rs @@ -197,7 +197,7 @@ use rustc::session::config; use rustc::mir::{self, Location, Promoted}; use rustc::mir::visit::Visitor as MirVisitor; use rustc::mir::mono::MonoItem; -use rustc::mir::interpret::{Scalar, GlobalId, AllocType, ErrorHandled}; +use rustc::mir::interpret::{Scalar, GlobalId, AllocKind, ErrorHandled}; use monomorphize::{self, Instance}; use rustc::util::nodemap::{FxHashSet, FxHashMap, DefIdMap}; @@ -1163,20 +1163,20 @@ fn collect_miri<'a, 'tcx>( ) { let alloc_type = tcx.alloc_map.lock().get(alloc_id); match alloc_type { - Some(AllocType::Static(did)) => { + Some(AllocKind::Static(did)) => { let instance = Instance::mono(tcx, did); if should_monomorphize_locally(tcx, &instance) { trace!("collecting static {:?}", did); output.push(MonoItem::Static(did)); } } - Some(AllocType::Memory(alloc)) => { + Some(AllocKind::Memory(alloc)) => { trace!("collecting {:?} with {:#?}", alloc_id, alloc); for &((), inner) in alloc.relocations.values() { collect_miri(tcx, inner, output); } }, - Some(AllocType::Function(fn_instance)) => { + Some(AllocKind::Function(fn_instance)) => { if should_monomorphize_locally(tcx, &fn_instance) { trace!("collecting {:?} with {:#?}", alloc_id, fn_instance); output.push(create_fn_mono_item(fn_instance));