mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #8514

Browse Source 
8514: Add more profiling spans into type inference r=matklad a=SomeoneToIgnore

Fixes https://github.com/rust-analyzer/rust-analyzer/issues/8503

I've added a minimal set of spans to remove `???` and showcase the underlying issue:

<img width="1552" alt="image" src="https://user-images.githubusercontent.com/2690773/114722983-f2181900-9d42-11eb-821d-9e93ded5f81f.png">

`db.trait_solve` reliably produces the same timings for the same input in the same place for me, despite supposedly being cached by Salsa.
In my perception, this is a bit odd, so I've decided to stop at this point and discuss it with people with better knowledge on the topic.

Co-authored-by: Kirill Bulatov <mail4score@gmail.com>
This commit is contained in:
bors[bot] 2021-04-14 14:20:13 +00:00 committed by GitHub
commit 678af41065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/hir_ty/src/autoderef.rs
View File

@ -36,6 +36,7 @@ pub(crate) fn deref(
krate: CrateId, krate: CrateId,
ty: InEnvironment<&Canonical<Ty>>, ty: InEnvironment<&Canonical<Ty>>,
) -> Option<Canonical<Ty>> { ) -> Option<Canonical<Ty>> {
let _p = profile::span("deref");
if let Some(derefed) = builtin_deref(&ty.goal.value) { if let Some(derefed) = builtin_deref(&ty.goal.value) {
Some(Canonical { value: derefed, binders: ty.goal.binders.clone() }) Some(Canonical { value: derefed, binders: ty.goal.binders.clone() })
} else { } else {
@ -56,6 +57,7 @@ fn deref_by_trait(
krate: CrateId, krate: CrateId,
ty: InEnvironment<&Canonical<Ty>>, ty: InEnvironment<&Canonical<Ty>>,
) -> Option<Canonical<Ty>> { ) -> Option<Canonical<Ty>> {
let _p = profile::span("deref_by_trait");
let deref_trait = match db.lang_item(krate, "deref".into())? { let deref_trait = match db.lang_item(krate, "deref".into())? {
LangItemTarget::TraitId(it) => it, LangItemTarget::TraitId(it) => it,
_ => return None, _ => return None,
@ -83,7 +85,10 @@ fn deref_by_trait(
environment: ty.environment.clone(), environment: ty.environment.clone(),
}, },
}; };
if db.trait_solve(krate, implements_goal).is_none() { if {
let _p = profile::span("db.trait_solve");
db.trait_solve(krate, implements_goal).is_none()
} {
return None; return None;
} }