Mercurial > hg > truffle
changeset 4249:1aaf3592e516
Fix some warnings from findbugs
line wrap: on
line diff
--- a/graal/com.oracle.max.asm/src/com/oracle/max/asm/target/amd64/AMD64Assembler.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.asm/src/com/oracle/max/asm/target/amd64/AMD64Assembler.java Mon Jan 09 14:05:12 2012 +0100 @@ -79,7 +79,7 @@ /** * Constants for X86 prefix bytes. */ - private class Prefix { + private static class Prefix { private static final int REX = 0x40; private static final int REXB = 0x41; private static final int REXX = 0x42;
--- a/graal/com.oracle.max.asm/src/com/oracle/max/asm/target/amd64/X86InstructionDecoder.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.asm/src/com/oracle/max/asm/target/amd64/X86InstructionDecoder.java Mon Jan 09 14:05:12 2012 +0100 @@ -30,7 +30,7 @@ private int currentEndOfInstruction; private int currentDisplacementPosition; - private class Prefix { + private static class Prefix { // segment overrides public static final int CSSegment = 0x2e;
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirSnippet.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirSnippet.java Mon Jan 09 14:05:12 2012 +0100 @@ -67,7 +67,7 @@ return false; } if (arg.constant != null) { - if (arg.constant != null && arg.constant.kind != param.kind) { + if (arg.constant.kind != param.kind) { return false; } }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/graph/PostOrderNodeIterator.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/graph/PostOrderNodeIterator.java Mon Jan 09 14:05:12 2012 +0100 @@ -102,8 +102,8 @@ nodeStates.put(x, state); if (successors != null) { for (Node node : successors) { - nodeStates.put((FixedNode) node.predecessor(), state); if (node != null) { + nodeStates.put((FixedNode) node.predecessor(), state); nodeQueue.addFirst((FixedNode) node); } }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/EscapeAnalysisPhase.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/EscapeAnalysisPhase.java Mon Jan 09 14:05:12 2012 +0100 @@ -207,7 +207,7 @@ } - public class EscapementFixup { + public static class EscapementFixup { private final Map<Object, Integer> fields = new HashMap<>(); private final EscapeOp op;
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/FloatingReadPhase.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/FloatingReadPhase.java Mon Jan 09 14:05:12 2012 +0100 @@ -124,7 +124,6 @@ } assert phi.valueCount() <= phi.merge().endCount() : phi.merge(); } else { - assert m != null; PhiNode phi = m.graph().unique(new PhiNode(CiKind.Illegal, m, PhiType.Memory)); for (int i = 0; i < mergeOperationCount + 1; ++i) { phi.addInput((ValueNode) original);
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/Phase.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/Phase.java Mon Jan 09 14:05:12 2012 +0100 @@ -68,7 +68,7 @@ this.currentContext = context; try { - assert graph != null && !shouldVerify || graph.verify(); + assert graph != null && (!shouldVerify || graph.verify()); } catch (GraalInternalError e) { throw e.addContext("start of phase", getDetailedName()); }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/schedule/IdentifyBlocksPhase.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/schedule/IdentifyBlocksPhase.java Mon Jan 09 14:05:12 2012 +0100 @@ -93,7 +93,6 @@ ok = false; break; } - assert unmarkedDominated == null : "b=" + b + ", unmarkedDominated=" + unmarkedDominated + ", dominated=" + dominated; unmarkedDominated = dominated; } }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/util/InliningUtil.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/util/InliningUtil.java Mon Jan 09 14:05:12 2012 +0100 @@ -244,11 +244,11 @@ RiResolvedType holder = callTarget.targetMethod().holder(); if (callTarget.receiver().declaredType() != null) { - RiType declared = callTarget.receiver().declaredType(); + RiResolvedType declared = callTarget.receiver().declaredType(); // the invoke target might be more specific than the holder (happens after inlining: locals lose their declared type...) // TODO (ls) fix this - if (declared instanceof RiResolvedType && ((RiResolvedType) declared).isSubtypeOf(holder)) { - holder = (RiResolvedType) declared; + if (declared != null && declared.isSubtypeOf(holder)) { + holder = declared; } } // TODO (tw) fix this
--- a/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/FrameStateBuilder.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/FrameStateBuilder.java Mon Jan 09 14:05:12 2012 +0100 @@ -349,7 +349,7 @@ * @param x the instruction which produces the value for the local */ public void storeLocal(int i, ValueNode x) { - assert x == null || (x.kind() != CiKind.Void && x.kind() != CiKind.Illegal) : "unexpected value: " + x; + assert x.kind() != CiKind.Void && x.kind() != CiKind.Illegal : "unexpected value: " + x; locals[i] = x; if (isTwoSlot(x.kind())) { // (tw) if this was a double word then kill i+1
--- a/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/GraphBuilderPhase.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/GraphBuilderPhase.java Mon Jan 09 14:05:12 2012 +0100 @@ -130,7 +130,6 @@ returnBlock = null; methodSynchronizedObject = null; exceptionHandlers = null; - assert graph != null; this.currentGraph = graph; this.frameState = new FrameStateBuilder(method, method.maxLocals(), method.maxStackSize(), graph); build(); @@ -1067,9 +1066,9 @@ exact = runtime.getTypeOf(receiver.asConstant()); } if (exact == null) { - RiType declared = receiver.declaredType(); - if (declared instanceof RiResolvedType) { - exact = ((RiResolvedType) declared).exactType(); + RiResolvedType declared = receiver.declaredType(); + if (declared != null) { + exact = declared.exactType(); } } }
--- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/InvokeNode.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/InvokeNode.java Mon Jan 09 14:05:12 2012 +0100 @@ -49,7 +49,6 @@ */ public InvokeNode(MethodCallTargetNode callTarget, int bci) { super(callTarget.returnStamp()); - assert callTarget != null; this.callTarget = callTarget; this.bci = bci; }
--- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/InvokeWithExceptionNode.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/InvokeWithExceptionNode.java Mon Jan 09 14:05:12 2012 +0100 @@ -47,7 +47,6 @@ */ public InvokeWithExceptionNode(MethodCallTargetNode callTarget, BeginNode exceptionEdge, int bci) { super(callTarget.returnStamp(), new BeginNode[]{null, exceptionEdge}, new double[]{1.0, 0.0}); - assert callTarget != null; this.bci = bci; this.callTarget = callTarget; }
--- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/java/RegisterFinalizerNode.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/java/RegisterFinalizerNode.java Mon Jan 09 14:05:12 2012 +0100 @@ -52,10 +52,10 @@ @Override public Node canonical(CanonicalizerTool tool) { - RiType declaredType = object.declaredType(); + RiResolvedType declaredType = object.declaredType(); RiResolvedType exactType = object.exactType(); - if (exactType == null && declaredType instanceof RiResolvedType) { - exactType = ((RiResolvedType) declaredType).exactType(); + if (exactType == null && declaredType != null) { + exactType = declaredType.exactType(); } boolean needsCheck = true; @@ -64,8 +64,8 @@ needsCheck = exactType.hasFinalizer(); } else { // if either the declared type of receiver or the holder can be assumed to have no finalizers - if (declaredType instanceof RiResolvedType && !((RiResolvedType) declaredType).hasFinalizableSubclass()) { - if (tool.assumptions() != null && tool.assumptions().recordNoFinalizableSubclassAssumption((RiResolvedType) declaredType)) { + if (declaredType != null && !declaredType.hasFinalizableSubclass()) { + if (tool.assumptions() != null && tool.assumptions().recordNoFinalizableSubclassAssumption(declaredType)) { needsCheck = false; } }
--- a/graal/com.oracle.max.graal.snippets/src/com/oracle/max/graal/snippets/ArrayCopySnippets.java Sat Jan 07 16:05:07 2012 -0800 +++ b/graal/com.oracle.max.graal.snippets/src/com/oracle/max/graal/snippets/ArrayCopySnippets.java Mon Jan 09 14:05:12 2012 +0100 @@ -79,22 +79,22 @@ if (src == dest && srcPos < destPos) { // bad aliased case if ((length & 0x01) == 0) { if ((length & 0x02) == 0) { - copyLongsDown(src, srcPos * 2, dest, destPos * 2, length >> 2); + copyLongsDown(src, srcPos * 2L, dest, destPos * 2L, length >> 2); } else { - copyIntsDown(src, srcPos * 2, dest, destPos * 2, length >> 1); + copyIntsDown(src, srcPos * 2L, dest, destPos * 2L, length >> 1); } } else { - copyShortsDown(src, srcPos * 2, dest, destPos * 2, length); + copyShortsDown(src, srcPos * 2L, dest, destPos * 2L, length); } } else { if ((length & 0x01) == 0) { if ((length & 0x02) == 0) { - copyLongsUp(src, srcPos * 2, dest, destPos * 2, length >> 2); + copyLongsUp(src, srcPos * 2L, dest, destPos * 2L, length >> 2); } else { - copyIntsUp(src, srcPos * 2, dest, destPos * 2, length >> 1); + copyIntsUp(src, srcPos * 2L, dest, destPos * 2L, length >> 1); } } else { - copyShortsUp(src, srcPos * 2, dest, destPos * 2, length); + copyShortsUp(src, srcPos * 2L, dest, destPos * 2L, length); } } } @@ -110,22 +110,22 @@ if (src == dest && srcPos < destPos) { // bad aliased case if ((length & 0x01) == 0) { if ((length & 0x02) == 0) { - copyLongsDown(src, srcPos * 2, dest, destPos * 2, length >> 2); + copyLongsDown(src, srcPos * 2L, dest, destPos * 2L, length >> 2); } else { - copyIntsDown(src, srcPos * 2, dest, destPos * 2, length >> 1); + copyIntsDown(src, srcPos * 2L, dest, destPos * 2L, length >> 1); } } else { - copyShortsDown(src, srcPos * 2, dest, destPos * 2, length); + copyShortsDown(src, srcPos * 2L, dest, destPos * 2L, length); } } else { if ((length & 0x01) == 0) { if ((length & 0x02) == 0) { - copyLongsUp(src, srcPos * 2, dest, destPos * 2, length >> 2); + copyLongsUp(src, srcPos * 2L, dest, destPos * 2L, length >> 2); } else { - copyIntsUp(src, srcPos * 2, dest, destPos * 2, length >> 1); + copyIntsUp(src, srcPos * 2L, dest, destPos * 2L, length >> 1); } } else { - copyShortsUp(src, srcPos * 2, dest, destPos * 2, length); + copyShortsUp(src, srcPos * 2L, dest, destPos * 2L, length); } } } @@ -140,15 +140,15 @@ } if (src == dest && srcPos < destPos) { // bad aliased case if ((length & 0x01) == 0) { - copyLongsDown(src, srcPos * 4, dest, destPos * 4, length >> 1); + copyLongsDown(src, srcPos * 4L, dest, destPos * 4L, length >> 1); } else { - copyIntsDown(src, srcPos * 4, dest, destPos * 4, length); + copyIntsDown(src, srcPos * 4L, dest, destPos * 4L, length); } } else { if ((length & 0x01) == 0) { - copyLongsUp(src, srcPos * 4, dest, destPos * 4, length >> 1); + copyLongsUp(src, srcPos * 4L, dest, destPos * 4L, length >> 1); } else { - copyIntsUp(src, srcPos * 4, dest, destPos * 4, length); + copyIntsUp(src, srcPos * 4L, dest, destPos * 4L, length); } } } @@ -162,9 +162,9 @@ throw new IndexOutOfBoundsException(); } if (src == dest && srcPos < destPos) { // bad aliased case - copyLongsDown(src, srcPos * 8, dest, destPos * 8, length); + copyLongsDown(src, srcPos * 8L, dest, destPos * 8L, length); } else { - copyLongsUp(src, srcPos * 8, dest, destPos * 8, length); + copyLongsUp(src, srcPos * 8L, dest, destPos * 8L, length); } } @@ -232,7 +232,7 @@ @Snippet public static void copyShortsUp(Object src, long srcOffset, Object dest, long destOffset, int length) { long header = ArrayHeaderSizeNode.sizeFor(CiKind.Short); - for (long i = 0; i < length * 2; i += 2) { + for (long i = 0; i < length * 2L; i += 2) { Character a = UnsafeLoadNode.load(src, i + (srcOffset + header), CiKind.Short); UnsafeStoreNode.store(dest, i + (destOffset + header), a.charValue(), CiKind.Short); } @@ -241,7 +241,7 @@ @Snippet public static void copyIntsUp(Object src, long srcOffset, Object dest, long destOffset, int length) { long header = ArrayHeaderSizeNode.sizeFor(CiKind.Int); - for (long i = 0; i < length * 4; i += 4) { + for (long i = 0; i < length * 4L; i += 4) { Integer a = UnsafeLoadNode.load(src, i + (srcOffset + header), CiKind.Int); UnsafeStoreNode.store(dest, i + (destOffset + header), a.intValue(), CiKind.Int); } @@ -250,7 +250,7 @@ @Snippet public static void copyLongsUp(Object src, long srcOffset, Object dest, long destOffset, int length) { long header = ArrayHeaderSizeNode.sizeFor(CiKind.Long); - for (long i = 0; i < length * 8; i += 8) { + for (long i = 0; i < length * 8L; i += 8) { Long a = UnsafeLoadNode.load(src, i + (srcOffset + header), CiKind.Long); UnsafeStoreNode.store(dest, i + (destOffset + header), a.longValue(), CiKind.Long); }