bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix profiling query key creation

Browse source
This commit is contained in:
marmeladema 2020-09-01 19:34:46 +01:00
parent bb8e1764bb
commit 23085b6360
1 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

31
compiler/rustc_middle/src/ty/query/profiling_support.rs
View file

@ -4,9 +4,10 @@ use measureme::{StringComponent, StringId};
use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::profiling::SelfProfiler; use rustc_data_structures::profiling::SelfProfiler;
use rustc_hir::def_id::{CrateNum, DefId, DefIndex, LocalDefId, CRATE_DEF_INDEX, LOCAL_CRATE}; use rustc_hir::def_id::{CrateNum, DefId, DefIndex, LocalDefId, CRATE_DEF_INDEX, LOCAL_CRATE};
use rustc_hir::definitions::{DefPathData, DefPathDataName}; use rustc_hir::definitions::DefPathData;
use rustc_query_system::query::QueryCache; use rustc_query_system::query::QueryCache;
use rustc_query_system::query::QueryState; use rustc_query_system::query::QueryState;
use rustc_span::symbol::Symbol;
use std::fmt::Debug; use std::fmt::Debug;
use std::io::Write; use std::io::Write;
@ -66,25 +67,17 @@ impl<'p, 'c, 'tcx> QueryKeyStringBuilder<'p, 'c, 'tcx> {
end_index = 3; end_index = 3;
} }
other => { other => {
name = match other.name() { name = Symbol::intern(&other.to_string());
DefPathDataName::Named(name) => { if def_key.disambiguated_data.disambiguator == 0 {
dis = ""; dis = "";
end_index = 3; end_index = 3;
name } else {
} write!(&mut dis_buffer[..], "[{}]", def_key.disambiguated_data.disambiguator)
DefPathDataName::Anon { namespace } => {
write!(
&mut dis_buffer[..],
"[{}]",
def_key.disambiguated_data.disambiguator
)
.unwrap(); .unwrap();
let end_of_dis = dis_buffer.iter().position(|&c| c == b']').unwrap(); let end_of_dis = dis_buffer.iter().position(|&c| c == b']').unwrap();
dis = std::str::from_utf8(&dis_buffer[..end_of_dis + 1]).unwrap(); dis = std::str::from_utf8(&dis_buffer[..end_of_dis + 1]).unwrap();
end_index = 4; end_index = 4;
namespace }
}
};
} }
} }