# HG changeset patch # User Lukas Stadler # Date 1400487785 -7200 # Node ID c82a77d94067ddbd53ee875af33e2b4d11405067 # Parent acfcb5ace52f2a5cdc60929f585556cac25a4209 do not assert for MergeNode in UseTrappingNullChecksPhase diff -r acfcb5ace52f -r c82a77d94067 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java --- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java Sun May 18 14:39:27 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java Mon May 19 10:23:05 2014 +0200 @@ -62,7 +62,6 @@ return; } Node predecessor = deopt.predecessor(); - assert predecessor instanceof MergeNode; if (predecessor instanceof MergeNode) { MergeNode merge = (MergeNode) predecessor;