changeset 22570:479bccee7915

fixed or suppressed all -Xlint warnings
author Doug Simon <doug.simon@oracle.com>
date Wed, 02 Sep 2015 22:38:02 +0200
parents d2fcadb5bc37
children c22117cdd3c9
files graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/Fields.java graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/BoxingEliminationTest.java graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LoopUnswitchTest.java graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryArithmeticTest.java graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMethodSubstitutionTest.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/StubUtil.java graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Finally01.java graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayLength01.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstructionClass.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanWalker.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanWalker.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/RegStackValueSet.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/IndexedValueMap.java graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopEx.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphEncoder.java graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewMultiArrayTest.java graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StandardMethodSubstitutionsTest.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompiler.java
diffstat 25 files changed, 59 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java	Wed Sep 02 22:38:02 2015 +0200
@@ -1521,23 +1521,26 @@
             // Generate first nop for size between 21-12
             switch (i) {
                 case 21:
-                    i -= 1;
+                    i -= 11;
+                    emitByte(0x66); // size prefix
                     emitByte(0x66); // size prefix
-                    // fall through
+                    emitByte(0x66); // size prefix
+                    addrNop8();
+                    break;
                 case 20:
-                    // fall through
                 case 19:
-                    i -= 1;
+                    i -= 10;
                     emitByte(0x66); // size prefix
-                    // fall through
+                    emitByte(0x66); // size prefix
+                    addrNop8();
+                    break;
                 case 18:
-                    // fall through
                 case 17:
-                    i -= 1;
+                    i -= 9;
                     emitByte(0x66); // size prefix
-                    // fall through
+                    addrNop8();
+                    break;
                 case 16:
-                    // fall through
                 case 15:
                     i -= 8;
                     addrNop8();
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/Fields.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/Fields.java	Wed Sep 02 22:38:02 2015 +0200
@@ -61,8 +61,8 @@
         Collections.sort(fields);
         this.offsets = new long[fields.size()];
         this.names = new String[offsets.length];
-        this.types = new Class[offsets.length];
-        this.declaringClasses = new Class[offsets.length];
+        this.types = new Class<?>[offsets.length];
+        this.declaringClasses = new Class<?>[offsets.length];
         int index = 0;
         for (FieldsScanner.FieldInfo f : fields) {
             offsets[index] = f.offset;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/BoxingEliminationTest.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/BoxingEliminationTest.java	Wed Sep 02 22:38:02 2015 +0200
@@ -60,7 +60,7 @@
     }
 
     public static Object boxedObjectInteger() {
-        return (int) 1;
+        return 1;
     }
 
     public static Integer boxedInteger() {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LoopUnswitchTest.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LoopUnswitchTest.java	Wed Sep 02 22:38:02 2015 +0200
@@ -90,6 +90,7 @@
         return sum;
     }
 
+    @SuppressWarnings("fallthrough")
     public static int test2Snippet(int a) {
         int sum = 0;
         for (int i = 0; i < 1000; i++) {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryArithmeticTest.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryArithmeticTest.java	Wed Sep 02 22:38:02 2015 +0200
@@ -3486,6 +3486,7 @@
         return f.byteValue / byteValue;
     }
 
+    @SuppressWarnings("divzero")
     public static int testByteDivConstant1(FieldObject f) {
         return f.byteValue / byteTestValue1;
     }
@@ -3511,6 +3512,7 @@
         return f.shortValue / shortValue;
     }
 
+    @SuppressWarnings("divzero")
     public static int testShortDivConstant1(FieldObject f) {
         return f.shortValue / shortTestValue1;
     }
@@ -3536,6 +3538,7 @@
         return f.charValue / charValue;
     }
 
+    @SuppressWarnings("divzero")
     public static int testCharDivConstant1(FieldObject f) {
         return f.charValue / charTestValue1;
     }
@@ -3561,6 +3564,7 @@
         return f.intValue / intValue;
     }
 
+    @SuppressWarnings("divzero")
     public static int testIntDivConstant1(FieldObject f) {
         return f.intValue / intTestValue1;
     }
@@ -3586,6 +3590,7 @@
         return f.longValue / longValue;
     }
 
+    @SuppressWarnings("divzero")
     public static long testLongDivConstant1(FieldObject f) {
         return f.longValue / longTestValue1;
     }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java	Wed Sep 02 22:38:02 2015 +0200
@@ -52,7 +52,7 @@
         return Boolean.valueOf(value);
     }
 
-    @SuppressWarnings("all")
+    @SuppressWarnings({"all", "static"})
     public static Boolean invokeStaticOnInstanceSnippet(Boolean obj, boolean value) {
         return obj.valueOf(value);
     }
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMethodSubstitutionTest.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMethodSubstitutionTest.java	Wed Sep 02 22:38:02 2015 +0200
@@ -65,7 +65,7 @@
         testGraph("getSuperClass");
         testGraph("getComponentType");
 
-        for (Class<?> c : new Class[]{getClass(), Cloneable.class, int[].class, String[][].class}) {
+        for (Class<?> c : new Class<?>[]{getClass(), Cloneable.class, int[].class, String[][].class}) {
             test("getModifiers", c);
             test("isInterface", c);
             test("isArray", c);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java	Wed Sep 02 22:38:02 2015 +0200
@@ -89,7 +89,7 @@
         return arraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0].get(kind);
     }
 
-    @SuppressWarnings("unchecked") private static final EnumMap<Kind, ForeignCallDescriptor>[][] arraycopyDescriptors = new EnumMap[2][2];
+    @SuppressWarnings({"unchecked", "rawtypes"}) private static final EnumMap<Kind, ForeignCallDescriptor>[][] arraycopyDescriptors = new EnumMap[2][2];
 
     private static final ForeignCallDescriptor[][] uninitObjectArraycopyDescriptors = new ForeignCallDescriptor[2][2];
     private static final ForeignCallDescriptor[] checkcastArraycopyDescriptors = new ForeignCallDescriptor[2];
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java	Wed Sep 02 22:38:02 2015 +0200
@@ -100,7 +100,7 @@
     private Class<?>[] createTargetParameters(ForeignCallDescriptor descriptor) {
         Class<?>[] parameters = descriptor.getArgumentTypes();
         if (prependThread) {
-            Class<?>[] newParameters = new Class[parameters.length + 1];
+            Class<?>[] newParameters = new Class<?>[parameters.length + 1];
             System.arraycopy(parameters, 0, newParameters, 1, parameters.length);
             newParameters[0] = Word.class;
             return newParameters;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/StubUtil.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/StubUtil.java	Wed Sep 02 22:38:02 2015 +0200
@@ -77,7 +77,7 @@
         }
         assert found != null : "could not find foreign call named " + name + " in " + stubClass;
         List<Class<?>> paramList = Arrays.asList(found.getParameterTypes());
-        Class<?>[] cCallTypes = paramList.subList(1, paramList.size()).toArray(new Class[paramList.size() - 1]);
+        Class<?>[] cCallTypes = paramList.subList(1, paramList.size()).toArray(new Class<?>[paramList.size() - 1]);
         return new ForeignCallDescriptor(name, found.getReturnType(), cCallTypes);
     }
 
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Finally01.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Finally01.java	Wed Sep 02 22:38:02 2015 +0200
@@ -30,7 +30,10 @@
  */
 public class Finally01 extends JTTTest {
 
-    @SuppressWarnings("all")
+    /**
+     * @param arg
+     */
+    @SuppressWarnings("finally")
     public static int test(int arg) {
         try {
             return 0;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayLength01.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayLength01.java	Wed Sep 02 22:38:02 2015 +0200
@@ -45,7 +45,7 @@
             return new Object[7].length;
         }
         if (arg == 3) {
-            return new Class[SIZE][].length;
+            return new Class<?>[SIZE][].length;
         }
         if (arg == 4) {
             return new int[arg].length;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java	Wed Sep 02 22:38:02 2015 +0200
@@ -82,21 +82,21 @@
     }
 
     /**
-     * Iterates the frame state and calls the {@link InstructionValueProcedure} for every variable.
+     * Iterates the frame state and calls the {@link InstructionValueConsumer} for every variable.
      *
      * @param proc The procedure called for variables.
      */
-    public void forEachState(LIRInstruction inst, InstructionValueConsumer proc) {
+    public void visitEachState(LIRInstruction inst, InstructionValueConsumer proc) {
         for (BytecodeFrame cur = topFrame; cur != null; cur = cur.caller()) {
-            processValues(inst, cur.values, proc);
+            visitValues(inst, cur.values, proc);
         }
         if (virtualObjects != null) {
             for (VirtualObject obj : virtualObjects) {
-                processValues(inst, obj.getValues(), proc);
+                visitValues(inst, obj.getValues(), proc);
             }
         }
         if (liveBasePointers != null) {
-            liveBasePointers.forEach(inst, OperandMode.ALIVE, STATE_FLAGS, proc);
+            liveBasePointers.visitEach(inst, OperandMode.ALIVE, STATE_FLAGS, proc);
         }
     }
 
@@ -134,7 +134,7 @@
         }
     }
 
-    protected void processValues(LIRInstruction inst, JavaValue[] values, InstructionValueConsumer proc) {
+    protected void visitValues(LIRInstruction inst, JavaValue[] values, InstructionValueConsumer proc) {
         for (int i = 0; i < values.length; i++) {
             JavaValue value = values[i];
             if (isIllegalJavaValue(value)) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstructionClass.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstructionClass.java	Wed Sep 02 22:38:02 2015 +0200
@@ -269,7 +269,7 @@
         for (int i = 0; i < states.getCount(); i++) {
             LIRFrameState state = (LIRFrameState) states.getObject(obj, i);
             if (state != null) {
-                state.forEachState(obj, proc);
+                state.visitEachState(obj, proc);
             }
         }
     }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java	Wed Sep 02 22:38:02 2015 +0200
@@ -57,7 +57,7 @@
             this(mode.directCount, mode.values);
         }
 
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings({"unchecked", "rawtypes"})
         public Values(int directCount, ArrayList<ValueFieldInfo> fields) {
             super(fields);
             this.directCount = directCount;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanWalker.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanWalker.java	Wed Sep 02 22:38:02 2015 +0200
@@ -80,6 +80,7 @@
         return allocator.blockForId(opId);
     }
 
+    @SuppressWarnings("rawtypes")
     LinearScanWalker(LinearScan allocator, Interval unhandledFixedFirst, Interval unhandledAnyFirst) {
         super(allocator, unhandledFixedFirst, unhandledAnyFirst);
 
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanWalker.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanWalker.java	Wed Sep 02 22:38:02 2015 +0200
@@ -81,6 +81,7 @@
         return allocator.blockForId(opId);
     }
 
+    @SuppressWarnings("rawtypes")
     TraceLinearScanWalker(TraceLinearScan allocator, TraceInterval unhandledFixedFirst, TraceInterval unhandledAnyFirst) {
         super(allocator, unhandledFixedFirst, unhandledAnyFirst);
 
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/RegStackValueSet.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/RegStackValueSet.java	Wed Sep 02 22:38:02 2015 +0200
@@ -142,8 +142,8 @@
                 refMap.addLiveValue(value);
             }
         };
-        registers.forEach(null, null, null, addLiveValue);
-        stack.forEach(null, null, null, addLiveValue);
+        registers.visitEach(null, null, null, addLiveValue);
+        stack.visitEach(null, null, null, addLiveValue);
         if (extraStack != null) {
             for (Value v : extraStack) {
                 refMap.addLiveValue(v);
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/IndexedValueMap.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/IndexedValueMap.java	Wed Sep 02 22:38:02 2015 +0200
@@ -126,7 +126,7 @@
         }
     }
 
-    public void forEach(LIRInstruction inst, OperandMode mode, EnumSet<OperandFlag> flags, InstructionValueConsumer consumer) {
+    public void visitEach(LIRInstruction inst, OperandMode mode, EnumSet<OperandFlag> flags, InstructionValueConsumer consumer) {
         for (Value v : values) {
             if (v != null) {
                 consumer.visitValue(inst, v, mode, flags);
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopEx.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopEx.java	Wed Sep 02 22:38:02 2015 +0200
@@ -230,14 +230,22 @@
                     break;
                 }
                 case LE:
-                    oneOff = true; // fall through
+                    oneOff = true;
+                    if (iv.direction() != Direction.Up) {
+                        return false;
+                    }
+                    break;
                 case LT:
                     if (iv.direction() != Direction.Up) {
                         return false;
                     }
                     break;
                 case GE:
-                    oneOff = true; // fall through
+                    oneOff = true;
+                    if (iv.direction() != Direction.Down) {
+                        return false;
+                    }
+                    break;
                 case GT:
                     if (iv.direction() != Direction.Down) {
                         return false;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphEncoder.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphEncoder.java	Wed Sep 02 22:38:02 2015 +0200
@@ -169,7 +169,7 @@
 
     public void finishPrepare() {
         objectsArray = objects.encodeAll(new Object[objects.getLength()]);
-        nodeClassesArray = nodeClasses.encodeAll(new NodeClass[nodeClasses.getLength()]);
+        nodeClassesArray = nodeClasses.encodeAll(new NodeClass<?>[nodeClasses.getLength()]);
     }
 
     public Object[] getObjects() {
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewMultiArrayTest.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewMultiArrayTest.java	Wed Sep 02 22:38:02 2015 +0200
@@ -91,7 +91,7 @@
 
     @Test
     public void test1() {
-        for (Class<?> clazz : new Class[]{byte.class, char.class, short.class, int.class, float.class, long.class, double.class, String.class}) {
+        for (Class<?> clazz : new Class<?>[]{byte.class, char.class, short.class, int.class, float.class, long.class, double.class, String.class}) {
             bottomClass = clazz;
             bottomType = getMetaAccess().lookupJavaType(clazz);
             arrayType = bottomType;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StandardMethodSubstitutionsTest.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StandardMethodSubstitutionsTest.java	Wed Sep 02 22:38:02 2015 +0200
@@ -252,7 +252,7 @@
         testGraph("isInstance");
         testGraph("isInstance2");
         testGraph("isAssignableFrom");
-        for (Class<?> c : new Class[]{getClass(), Cloneable.class, int[].class, String[][].class}) {
+        for (Class<?> c : new Class<?>[]{getClass(), Cloneable.class, int[].class, String[][].class}) {
             for (Object o : new Object[]{this, new int[5], new String[2][], new Object()}) {
                 test("isInstance", c, o);
                 test("isAssignableFrom", c, o.getClass());
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java	Wed Sep 02 22:38:02 2015 +0200
@@ -195,7 +195,7 @@
                 returnType = substituteMethod.getReturnType();
             } else {
                 Signature signature = providers.getMetaAccess().parseMethodDescriptor(methodSubstitution);
-                parameters = new Class[signature.getParameterCount(false)];
+                parameters = new Class<?>[signature.getParameterCount(false)];
                 for (int i = 0; i < parameters.length; i++) {
                     parameters[i] = resolveClass(signature.getParameterType(i, null));
                 }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompiler.java	Wed Sep 02 14:18:39 2015 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompiler.java	Wed Sep 02 22:38:02 2015 +0200
@@ -62,7 +62,7 @@
     protected final GraalTruffleCompilationListener compilationNotify;
 
     // @formatter:off
-    private static final Class<?>[] SKIPPED_EXCEPTION_CLASSES = new Class[]{
+    private static final Class<?>[] SKIPPED_EXCEPTION_CLASSES = new Class<?>[]{
         UnexpectedResultException.class,
         SlowPathException.class,
         ArithmeticException.class,