hg: graal/graal: convert asserts into if tests and check for phis at merge

[doug.simon at oracle.com]

Changeset: 9ae1d2f3bda6
Author:    Tom Rodriguez <tom.rodriguez at oracle.com>
Date:      2014-05-19 14:14 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/9ae1d2f3bda6

convert asserts into if tests and check for phis at merge

! graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java