Fix delegation def path hash collision#153955

aerooneqq wants to merge 2 commits intorust-lang:mainrust-lang/rust:mainfrom

aerooneqq:def-path-hash-collisionaerooneqq/rust:def-path-hash-collisionCopy head branch name to clipboard