Updated barrier divergence test to account for CFG simplification.