Reenable the optimization added in 133415, but change the definition of a "simple" bb to

be one with only one unconditional branch and no phis. Duplicating the phis in this case
is possible, but requeres liveness analysis or breaking edges.

llvm-svn: 133607