Merge return place with other locals in CopyProp.#111556

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

cjgillot:copy-prop-nrvocjgillot/rust:copy-prop-nrvoCopy head branch name to clipboard