Try to fix ICE from re-interning an AllocId with different allocation contents#127442

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

saethlin:alloc-decoding-locksaethlin/rust:alloc-decoding-lockCopy head branch name to clipboard