Don't reset cast kind without also updating the operand in `simplify_cast` in GVN#136450

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

compiler-errors:simplify-castcompiler-errors/rust:simplify-castCopy head branch name to clipboard