user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace FxHashMap with IndexVec for local_map

Browse source 
Fixes #745
This commit is contained in:
bjorn3 2020-09-16 18:45:19 +02:00
parent a18a1948e0
commit 552991e17e
5 changed files with 31 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/debuginfo/mod.rs
View file

@ -4,6 +4,8 @@ mod unwind;
use crate::prelude::*;
use rustc_index::vec::IndexVec;
use cranelift_codegen::entity::EntityRef;
use cranelift_codegen::ir::{StackSlots, ValueLabel, ValueLoc};
use cranelift_codegen::isa::TargetIsa;
@ -269,7 +271,7 @@ impl<'tcx> DebugContext<'tcx> {
isa: &dyn TargetIsa,
context: &Context,
source_info_set: &indexmap::IndexSet<SourceInfo>,
local_map: FxHashMap<mir::Local, CPlace<'tcx>>,
local_map: IndexVec<mir::Local, CPlace<'tcx>>,
) {
let symbol = func_id.as_u32() as usize;
let mir = self.tcx.instance_mir(instance.def);
@ -390,7 +392,7 @@ fn place_location<'tcx>(
isa: &dyn TargetIsa,
symbol: usize,
context: &Context,
local_map: &FxHashMap<mir::Local, CPlace<'tcx>>,
local_map: &IndexVec<mir::Local, CPlace<'tcx>>,
#[allow(rustc::default_hash_types)] value_labels_ranges: &std::collections::HashMap<
ValueLabel,
Vec<ValueLocRange>,
@ -399,7 +401,7 @@ fn place_location<'tcx>(
) -> AttributeValue {
assert!(place.projection.is_empty()); // FIXME implement them
match local_map[&place.local].inner() {
match local_map[place.local].inner() {
CPlaceInner::Var(_local, var) => {
let value_label = cranelift_codegen::ir::ValueLabel::new(var.index());
if let Some(value_loc_ranges) = value_labels_ranges.get(&value_label) {