# HG changeset patch # User Miguel Garcia # Date 1400087476 -7200 # Node ID 034a5acbae1461f2ac369d1e93c99d586f60d9f5 # Parent bfbbf69fc5077d11e36d8f6371ba7008950437f9 [single-pass-iter] same check formulated differently so as to appease findbugs diff -r bfbbf69fc507 -r 034a5acbae14 graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/SinglePassNodeIterator.java --- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/SinglePassNodeIterator.java Wed May 14 18:55:01 2014 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/SinglePassNodeIterator.java Wed May 14 19:11:16 2014 +0200 @@ -123,7 +123,13 @@ * @return true iff this instance is internally consistent (ie, its "representation is OK") */ private boolean repOK() { - return (node instanceof MergeNode && stateOnEntry == null) || (stateOnEntry != null); + if (node == null) { + return false; + } + if (node instanceof MergeNode) { + return stateOnEntry == null; + } + return (stateOnEntry != null); } }