# HG changeset patch # User Bernhard Urban # Date 1369303565 -7200 # Node ID d1682d1df0a360fe714a6cc3c0939e439869e9c2 # Parent 2eaac2c3670b92bbc51c0df4322946fbcdce3b8f VerifyUsageWithEquals: better error message diff -r 2eaac2c3670b -r d1682d1df0a3 graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyUsageWithEquals.java --- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyUsageWithEquals.java Thu May 23 12:00:40 2013 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyUsageWithEquals.java Thu May 23 12:06:05 2013 +0200 @@ -73,8 +73,8 @@ for (ObjectEqualsNode cn : graph.getNodes().filter(ObjectEqualsNode.class)) { if (!isEqualsMethod(graph)) { // bail out if we compare an object of type klass with == or != (except null checks) - assert !(checkUsage(cn.x(), cn.y()) && checkUsage(cn.y(), cn.x())) : "VerifyUsage of " + klass.getName() + ": " + cn.x() + " or " + cn.y() + " in " + graph.method() + - " uses object identity. Should use equals() instead."; + assert !(checkUsage(cn.x(), cn.y()) && checkUsage(cn.y(), cn.x())) : "Verifcation of " + klass.getName() + " usage failed: Comparison " + cn.x() + " and" + cn.y() + " in " + + graph.method() + " must use .equals() for object equality, not '==' or '!='"; } } return true;