Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some cleanups around AllocId management #56461

Merged
merged 11 commits into from
Dec 13, 2018
Merged

Some cleanups around AllocId management #56461

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a5e57c8
Monomorphize `AllocMap` struct
oli-obk Dec 3, 2018
3074fcb
Monomorphize `AllocType`
oli-obk Dec 3, 2018
f6b3eb0
Function pointers are only equal to themselves, not to other function…
oli-obk Dec 3, 2018
3d278e9
Document `AllocMap`
oli-obk Dec 3, 2018
a1e83a9
s/AllocKind/AllocDiscriminant/
oli-obk Dec 3, 2018
2e00d64
s/AllocType/AllocKind/
oli-obk Dec 3, 2018
d625019
s/alloc_type/alloc_kind/
oli-obk Dec 4, 2018
66b2353
Clear up comment
oli-obk Dec 4, 2018
760df2c
s/id_to_type/id_to_kind/
oli-obk Dec 4, 2018
982a966
Mention `alloc` in the name of the interning methods
oli-obk Dec 4, 2018
7181aa1
No need to export functions only used in the same module
oli-obk Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/librustc/mir/interpret/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ pub fn specialized_encode_alloc_id<
tcx: TyCtxt<'a, 'tcx, 'tcx>,
alloc_id: AllocId,
) -> Result<(), E::Error> {
let alloc_type: AllocKind<'tcx> =
let alloc_kind: AllocKind<'tcx> =
tcx.alloc_map.lock().get(alloc_id).expect("no value for AllocId");
match alloc_type {
match alloc_kind {
AllocKind::Memory(alloc) => {
trace!("encoding {:?} with {:#?}", alloc_id, alloc);
AllocDiscriminant::Alloc.encode(encoder)?;
Expand Down Expand Up @@ -339,14 +339,14 @@ impl<'tcx> AllocMap<'tcx> {
next
}

fn intern(&mut self, alloc_type: AllocKind<'tcx>) -> AllocId {
if let Some(&alloc_id) = self.type_interner.get(&alloc_type) {
fn intern(&mut self, alloc_kind: AllocKind<'tcx>) -> AllocId {
if let Some(&alloc_id) = self.type_interner.get(&alloc_kind) {
return alloc_id;
}
let id = self.reserve();
debug!("creating alloc_type {:?} with id {}", alloc_type, id);
self.id_to_type.insert(id, alloc_type.clone());
self.type_interner.insert(alloc_type, id);
debug!("creating alloc_kind {:?} with id {}", alloc_kind, id);
self.id_to_type.insert(id, alloc_kind.clone());
oli-obk marked this conversation as resolved.
Show resolved Hide resolved
self.type_interner.insert(alloc_kind, id);
id
}

Expand Down
4 changes: 2 additions & 2 deletions src/librustc_codegen_llvm/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,8 @@ 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 {
let alloc_kind = self.tcx.alloc_map.lock().get(ptr.alloc_id);
let base_addr = match alloc_kind {
Some(AllocKind::Memory(alloc)) => {
let init = const_alloc_to_llvm(self, alloc);
if alloc.mutability == Mutability::Mutable {
Expand Down
4 changes: 2 additions & 2 deletions src/librustc_mir/monomorphize/collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,8 +1161,8 @@ fn collect_miri<'a, 'tcx>(
alloc_id: AllocId,
output: &mut Vec<MonoItem<'tcx>>,
) {
let alloc_type = tcx.alloc_map.lock().get(alloc_id);
match alloc_type {
let alloc_kind = tcx.alloc_map.lock().get(alloc_id);
match alloc_kind {
Some(AllocKind::Static(did)) => {
let instance = Instance::mono(tcx, did);
if should_monomorphize_locally(tcx, &instance) {
Expand Down