# HG changeset patch # User Christos Kotselidis # Date 1374437601 -7200 # Node ID 000ee2d0c518fe1cc3369155ea177f1b3031a590 # Parent 4c6df71db9e7549d87e459c42726d5e942c1a704 Method renaming diff -r 4c6df71db9e7 -r 000ee2d0c518 graal/com.oracle.graal.compiler.hsail/src/com/oracle/graal/compiler/hsail/HSAILLIRGenerator.java --- a/graal/com.oracle.graal.compiler.hsail/src/com/oracle/graal/compiler/hsail/HSAILLIRGenerator.java Sun Jul 21 20:11:55 2013 +0200 +++ b/graal/com.oracle.graal.compiler.hsail/src/com/oracle/graal/compiler/hsail/HSAILLIRGenerator.java Sun Jul 21 22:13:21 2013 +0200 @@ -181,7 +181,7 @@ } private static boolean isCompressCandidate(DeoptimizingNode access) { - return access != null && ((HeapAccess) access).compressible(); + return access != null && ((HeapAccess) access).isCompressible(); } @Override diff -r 4c6df71db9e7 -r 000ee2d0c518 graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java --- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Sun Jul 21 20:11:55 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Sun Jul 21 22:13:21 2013 +0200 @@ -405,7 +405,7 @@ } private static boolean isCompressCandidate(DeoptimizingNode access) { - return access != null && ((HeapAccess) access).compressible(); + return access != null && ((HeapAccess) access).isCompressible(); } @Override @@ -488,7 +488,7 @@ RegisterValue raxRes = AMD64.rax.asValue(kind); emitMove(raxRes, expected); - if (runtime().config.useCompressedOops && node.compressible()) { + if (runtime().config.useCompressedOops && node.isCompressible()) { Variable scratch = newVariable(Kind.Long); append(new CompareAndSwapCompressedOp(raxRes, address, raxRes, newValue, scratch, runtime().config.narrowOopBase, runtime().config.narrowOopShift, runtime().config.logMinObjAlignment)); } else { diff -r 4c6df71db9e7 -r 000ee2d0c518 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/HeapAccess.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/HeapAccess.java Sun Jul 21 20:11:55 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/HeapAccess.java Sun Jul 21 22:13:21 2013 +0200 @@ -53,5 +53,5 @@ /** * Returns whether or not the heap access is a compressed pointer candidate. */ - boolean compressible(); + boolean isCompressible(); } diff -r 4c6df71db9e7 -r 000ee2d0c518 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java Sun Jul 21 20:11:55 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java Sun Jul 21 22:13:21 2013 +0200 @@ -109,7 +109,7 @@ } @Override - public boolean compressible() { + public boolean isCompressible() { return compressible; } } diff -r 4c6df71db9e7 -r 000ee2d0c518 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java Sun Jul 21 20:11:55 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java Sun Jul 21 22:13:21 2013 +0200 @@ -101,7 +101,7 @@ } @Override - public boolean compressible() { + public boolean isCompressible() { return compressible; } diff -r 4c6df71db9e7 -r 000ee2d0c518 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Sun Jul 21 20:11:55 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Sun Jul 21 22:13:21 2013 +0200 @@ -57,11 +57,11 @@ @Override public ValueNode canonical(CanonicalizerTool tool) { - return ReadNode.canonicalizeRead(this, location(), object(), tool, compressible()); + return ReadNode.canonicalizeRead(this, location(), object(), tool, isCompressible()); } @Override public Access asFixedNode() { - return graph().add(new ReadNode(object(), nullCheckLocation(), stamp(), getGuard(), getBarrierType(), compressible())); + return graph().add(new ReadNode(object(), nullCheckLocation(), stamp(), getGuard(), getBarrierType(), isCompressible())); } } diff -r 4c6df71db9e7 -r 000ee2d0c518 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Sun Jul 21 20:11:55 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Sun Jul 21 22:13:21 2013 +0200 @@ -62,12 +62,12 @@ @Override public ValueNode canonical(CanonicalizerTool tool) { - return canonicalizeRead(this, location(), object(), tool, compressible()); + return canonicalizeRead(this, location(), object(), tool, isCompressible()); } @Override public FloatingAccessNode asFloatingNode(ValueNode lastLocationAccess) { - return graph().unique(new FloatingReadNode(object(), location(), lastLocationAccess, stamp(), getGuard(), getBarrierType(), compressible())); + return graph().unique(new FloatingReadNode(object(), location(), lastLocationAccess, stamp(), getGuard(), getBarrierType(), isCompressible())); } public static ValueNode canonicalizeRead(ValueNode read, LocationNode location, ValueNode object, CanonicalizerTool tool, boolean compressedPointer) { diff -r 4c6df71db9e7 -r 000ee2d0c518 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Sun Jul 21 20:11:55 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Sun Jul 21 22:13:21 2013 +0200 @@ -85,7 +85,7 @@ } @Override - public boolean compressible() { + public boolean isCompressible() { return compressible; }