Recover most of the perf loss of #120393#121625

Urgau wants to merge 2 commits intorust-lang:masterrust-lang/rust:masterfrom

Urgau:non-local-defs_recover_perfUrgau/rust:non-local-defs_recover_perfCopy head branch name to clipboard