Merge pull request #3622 from WalterBright/fix12855

fix Issue 12855 - Shadow register assignments for spilling can conflict