Merge pull request #3889 from WalterBright/fix13321

[reg] Temporary fix Issue 13321 - Wrong goto skips declaration error