# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1430266916 25200
# Node ID 4c3cc6a12df28868994ec3cb9a344d75fa10b797
# Parent  b7f05f4ca66e68cd9b7cef3473a32a8b81264cf0
Fix assert in test when running UseG1GC

diff -r b7f05f4ca66e -r 4c3cc6a12df2 graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/LoadJavaMirrorWithKlassTest.java
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/LoadJavaMirrorWithKlassTest.java	Tue Apr 28 17:21:33 2015 -0700
+++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/LoadJavaMirrorWithKlassTest.java	Tue Apr 28 17:21:56 2015 -0700
@@ -64,8 +64,8 @@
     @Override
     protected boolean checkLowTierGraph(StructuredGraph graph) {
         for (ConstantNode constantNode : graph.getNodes().filter(ConstantNode.class)) {
-            assert constantNode.asJavaConstant() == null || constantNode.asJavaConstant().getKind() != Kind.Object : "Found unexpected object constant " + constantNode +
-                            ", this should have been removed by the LoadJavaMirrorWithKlassPhase.";
+            assert constantNode.asJavaConstant() == null || constantNode.asJavaConstant().getKind() != Kind.Object || constantNode.asJavaConstant().isDefaultForKind() : "Found unexpected object constant " +
+                            constantNode + ", this should have been removed by the LoadJavaMirrorWithKlassPhase.";
         }
         return true;
     }