Now for small blocks consisting of 2 special case instructions
PHI & Terminator (BR or RET for example) we return not
firstnonPHI but the last PHI.

(cherry picked from commit 0b9518e0194b68f8f7172caa12dfe03736930bd9)