Fix debugger stepping behavior with `match` expressions#87832

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

wesleywiser:fix_match_stepwesleywiser/rust:fix_match_stepCopy head branch name to clipboard