Mercurial > hg > graal-compiler
changeset 8964:e98c48fca45b
Fix checkstyle errors
author | Christos Kotselidis <christos.kotselidis@oracle.com> |
---|---|
date | Tue, 09 Apr 2013 14:50:40 +0200 |
parents | 63eae4723b18 |
children | 1939fe0e6148 |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierAdditionPhase.java |
diffstat | 2 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Tue Apr 09 11:13:35 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Tue Apr 09 14:50:40 2013 +0200 @@ -585,7 +585,6 @@ // Separate out GC barrier semantics CompareAndSwapNode cas = (CompareAndSwapNode) n; ValueNode expected = cas.expected(); - LocationNode location = IndexedLocationNode.create(LocationNode.ANY_LOCATION, cas.expected().kind(), cas.displacement(), cas.offset(), graph, 1); if (expected.kind() == Kind.Object && !cas.newValue().objectStamp().alwaysNull()) { ResolvedJavaType type = cas.object().objectStamp().type(); final boolean precise = (type != null && type.isArray() && !MetaUtil.isJavaLangObject(type));
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierAdditionPhase.java Tue Apr 09 11:13:35 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierAdditionPhase.java Tue Apr 09 14:50:40 2013 +0200 @@ -22,7 +22,6 @@ */ package com.oracle.graal.hotspot.phases; -import com.oracle.graal.hotspot.replacements.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.java.*; @@ -46,21 +45,21 @@ } } - private void addWriteNodeBarriers(WriteNode node, StructuredGraph graph) { + private static void addWriteNodeBarriers(WriteNode node, StructuredGraph graph) { if (node.needsWriteBarrier()) { graph.addAfterFixed(node, graph.add(new SerialWriteBarrier(node.object(), node.location(), node.usePreciseWriteBarriers()))); } } - private void addCASBarriers(CompareAndSwapNode node, StructuredGraph graph) { + private static void addCASBarriers(CompareAndSwapNode node, StructuredGraph graph) { if (node.needsWriteBarrier()) { LocationNode location = IndexedLocationNode.create(LocationNode.ANY_LOCATION, node.expected().kind(), node.displacement(), node.offset(), graph, 1); graph.addAfterFixed(node, graph.add(new SerialWriteBarrier(node.object(), location, node.usePreciseWriteBarriers()))); } } - private void addArrayRangeBarriers(GenericArrayRangeWriteBarrier node, StructuredGraph graph) { + private static void addArrayRangeBarriers(GenericArrayRangeWriteBarrier node, StructuredGraph graph) { SerialArrayRangeWriteBarrier serialArrayRangeWriteBarrier = graph.add(new SerialArrayRangeWriteBarrier(node.getDstObject(), node.getDstPos(), node.getLength())); graph.replaceFixedWithFixed(node, serialArrayRangeWriteBarrier); }