[InstCombine] re-commit r218721 icmp-select-icmp optimization

Takes care of the assert that caused build fails.
Rather than asserting the code checks now that the definition
and use are in the same block, and does not attempt
to optimize when that is not the case.