# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1418135987 -3600
# Node ID a1584e21457c0ca70e36d377786b90d76d013396
# Parent  beb33138029c5bf7d12af64290e0aa7dacd75340
Use ReadNode to read Klass pointer.

diff -r beb33138029c -r a1584e21457c graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/HotSpotWordTypeRewriterPhase.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/HotSpotWordTypeRewriterPhase.java	Mon Dec 08 17:45:19 2014 -0800
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/HotSpotWordTypeRewriterPhase.java	Tue Dec 09 15:39:47 2014 +0100
@@ -150,9 +150,8 @@
     protected ValueNode readKlassOp(StructuredGraph graph, ValueNode base, Invoke invoke, LocationNode location, Stamp readStamp, HotspotOpcode op) {
         assert op == READ_KLASS_POINTER;
         final BarrierType barrier = BarrierType.NONE;
-        final boolean compressible = false;
 
-        JavaReadNode read = graph.add(JavaReadNode.create(base, location, readStamp, barrier, compressible));
+        ReadNode read = graph.add(ReadNode.create(base, location, readStamp, barrier));
         graph.addBeforeFixed(invoke.asNode(), read);
         /*
          * The read must not float outside its block otherwise it may float above an explicit zero
diff -r beb33138029c -r a1584e21457c graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaReadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaReadNode.java	Mon Dec 08 17:45:19 2014 -0800
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaReadNode.java	Tue Dec 09 15:39:47 2014 +0100
@@ -42,20 +42,11 @@
         return new JavaReadNode(object, location, barrierType, compressible);
     }
 
-    public static JavaReadNode create(ValueNode object, LocationNode location, Stamp readStamp, BarrierType barrierType, boolean compressible) {
-        return new JavaReadNode(object, location, readStamp, barrierType, compressible);
-    }
-
     protected JavaReadNode(ValueNode object, LocationNode location, BarrierType barrierType, boolean compressible) {
         super(object, location, StampFactory.forKind(location.getValueKind()), barrierType);
         this.compressible = compressible;
     }
 
-    protected JavaReadNode(ValueNode object, LocationNode location, Stamp readStamp, BarrierType barrierType, boolean compressible) {
-        super(object, location, readStamp, barrierType);
-        this.compressible = compressible;
-    }
-
     public void lower(LoweringTool tool) {
         tool.getLowerer().lower(this, tool);
     }