[GR-60861] Update checkstyle to 10.21.0 in more suites and fixup.

PullRequest: graal/19745

Author: wirthi

espresso/mx.espresso/suite.py

@@ -92,7 +92,7 @@
             ],
             "javaCompliance" : "8+",
             "checkstyle": "com.oracle.truffle.espresso.polyglot",
-            "checkstyleVersion": "10.7.0",
+            "checkstyleVersion": "10.21.0",
             "license": "UPL",
         },
 
@@ -164,7 +164,7 @@
             "jacoco" : "include",
             "javaCompliance" : "17+",
             "checkstyle": "com.oracle.truffle.espresso",
-            "checkstyleVersion": "10.7.0",
+            "checkstyleVersion": "10.21.0",
         },
 
         "com.oracle.truffle.espresso.resources.libs": {

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/attributes/LineNumberTableAttribute.java

@@ -128,7 +128,7 @@ public int getLineNumber() {
         }
     }
 
-    private class ListWrapper extends AbstractList<Entry> {
+    private final class ListWrapper extends AbstractList<Entry> {
         @Override
         public Entry get(int index) {
             if (index >= 0 && index < size()) {

espresso/src/com.oracle.truffle.espresso.polyglot/src/com/oracle/truffle/espresso/polyglot/TypeLiteral.java

@@ -155,7 +155,7 @@ private static Class<?> arrayTypeFromComponentType(Class<?> componentType) {
 
     // only used by the VM internally
     @SuppressWarnings("unused")
-    private class InternalTypeLiteral extends TypeLiteral<T> {
+    private final class InternalTypeLiteral extends TypeLiteral<T> {
     }
 }
 

espresso/src/com.oracle.truffle.espresso.polyglot/src/com/oracle/truffle/espresso/polyglot/collections/EspressoForeignList.java

@@ -164,7 +164,7 @@ public Iterator<T> iterator() {
     }
 
     // Copied from AbstractList
-    private class Itr implements Iterator<T> {
+    private final class Itr implements Iterator<T> {
         /**
          * Index of element to be returned by subsequent call to next.
          */

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/liveness/History.java

@@ -56,7 +56,7 @@ public Iterable<Record> reverse() {
         return new ReverseIterator();
     }
 
-    private class OrderedIterator implements Iterator<Record> {
+    private final class OrderedIterator implements Iterator<Record> {
         private int pos = 0;
 
         @Override
@@ -70,7 +70,7 @@ public Record next() {
         }
     }
 
-    private class ReverseIterator implements Iterable<Record>, Iterator<Record> {
+    private final class ReverseIterator implements Iterable<Record>, Iterator<Record> {
         private int pos = size - 1;
 
         @Override

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/LoadingConstraints.java

@@ -413,7 +413,7 @@ private static boolean exists(long klass) {
         return klass != NULL_KLASS_ID;
     }
 
-    private static class PurgeInfo {
+    private static final class PurgeInfo {
         int reclaimedSlots = 0;
         int reclaimedConstraints = 0;
         int emptyBuckets = 0;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java

@@ -943,7 +943,7 @@ public void registerExternalHotSwapHandler(StaticObject handler) {
         redefinitionPluginHandler.registerExternalHotSwapHandler(handler);
     }
 
-    private static class HierarchyComparator implements Comparator<ChangePacket> {
+    private static final class HierarchyComparator implements Comparator<ChangePacket> {
         public int compare(ChangePacket packet1, ChangePacket packet2) {
             Klass k1 = packet1.info.getKlass();
             Klass k2 = packet2.info.getKlass();
@@ -972,7 +972,7 @@ public int compare(ChangePacket packet1, ChangePacket packet2) {
         }
     }
 
-    private static class SubClassHierarchyComparator implements Comparator<ObjectKlass> {
+    private static final class SubClassHierarchyComparator implements Comparator<ObjectKlass> {
         public int compare(ObjectKlass k1, ObjectKlass k2) {
             // we need to do this check because isAssignableFrom is true in this case
             // and we would get an order that doesn't exist

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionGraphKit.java

@@ -291,7 +291,7 @@ private ValueNode widenPrimitive(ValueNode unboxedValue, JavaKind fromKind, Java
         if (fromStackKind == toStackKind) {
             return unboxedValue;
         }
-        // Checkstyle: stop
+        // Checkstyle: stop FallThrough
         switch (fromStackKind) {
             case Int:
                 switch (toStackKind) {
@@ -323,6 +323,6 @@ private ValueNode widenPrimitive(ValueNode unboxedValue, JavaKind fromKind, Java
             default:
                 throw VMError.shouldNotReachHereUnexpectedInput(fromStackKind); // ExcludeFromJacocoGeneratedReport
         }
-        // Checkstyle: resume
+        // Checkstyle: resume FallThrough
     }
 }

sulong/mx.sulong/suite.py

@@ -486,7 +486,7 @@
         "jdk.unsupported", # sun.misc.Signal
       ],
       "checkstyle" : "com.oracle.truffle.llvm.runtime",
-      "checkstyleVersion" : "10.7.0",
+      "checkstyleVersion" : "10.21.0",
       "annotationProcessors" : ["truffle:TRUFFLE_DSL_PROCESSOR"],
       "javaCompliance" : "17+",
       "spotbugsIgnoresGenerated" : True,

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/ExportSymbolsMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ public abstract class ExportSymbolsMapper {
      */
     public abstract void registerExports(LLVMScope fileScope, LLVMScope publicFileScope);
 
-    private static class Default extends ExportSymbolsMapper {
+    private static final class Default extends ExportSymbolsMapper {
         @Override
         public void registerExports(LLVMScope fileScope, LLVMScope publicFileScope) {
         }