bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove semi-nondeterminism of DefPathHash ordering from inliner

Browse source
This commit is contained in:
Michael Goulet 2024-09-16 21:41:15 -04:00
parent c52c23b6f4
commit 8f97231d34
6 changed files with 4 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_mir_transform/src/inline.rs
View file

@ -357,16 +357,6 @@ impl<'tcx> Inliner<'tcx> {
}
if callee_def_id.is_local() {
// Avoid a cycle here by only using `instance_mir` only if we have
// a lower `DefPathHash` than the callee. This ensures that the callee will
// not inline us. This trick even works with incremental compilation,
// since `DefPathHash` is stable.
if self.tcx.def_path_hash(caller_def_id).local_hash()
< self.tcx.def_path_hash(callee_def_id).local_hash()
{
return Ok(());
}
// If we know for sure that the function we're calling will itself try to
// call us, then we avoid inlining that function.
if self.tcx.mir_callgraph_reachable((callee, caller_def_id.expect_local())) {