Make rustc_abi compile on stable again#131997

bors merged 2 commits into

rust-lang:masterrust-lang/rust:masterfrom

Veykril:veykril/push-upvqkyxmvkzwVeykril/rust:veykril/push-upvqkyxmvkzwCopy head branch name to clipboard