Merge pull request #2299 from WalterBright/opt-oror

optimize sequence of ||