use stores of the correct size to set discriminants#131698

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

the8472:remove-set-discriminant-hackthe8472/rust:remove-set-discriminant-hackCopy head branch name to clipboard