Skip to content

Commit b23f159

Browse files
wirthiwirthi
committed
[GR-60664] Update checkstyle to 10.21.0.
PullRequest: graal/19695
2 parents 4584bd5 + aebdca4 commit b23f159

File tree

260 files changed

+420
-404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+420
-404
lines changed

‎common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.36.1",
7+
"mx_version": "7.36.5",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {

‎compiler/mx.compiler/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
"GRAAL_PROCESSOR"
213213
],
214214
"checkPackagePrefix": "false",
215-
"checkstyleVersion" : "10.7.0",
215+
"checkstyleVersion" : "10.21.0",
216216
"javaCompliance" : "21+",
217217
"workingSets" : "API,Graal",
218218
"jacoco" : "include",

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/BlackholeDirectiveTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void testInt() {
103103
test("blackholeIntSnippet", 17);
104104
}
105105

106-
private static class Dummy {
106+
private static final class Dummy {
107107
private int x = 42;
108108
}
109109

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/OpaqueDirectiveTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void testDouble() {
108108
test("opaqueDoubleSnippet");
109109
}
110110

111-
private static class Dummy {
111+
private static final class Dummy {
112112
}
113113

114114
@OpaqueSnippet(expectedReturnNode = ConstantNode.class)

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompilationResultTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void testCompilationResult() {
7777
assertTrue(result.toString().length() > 0); // test for NPE
7878
}
7979

80-
private static class TestMarkId implements CompilationResult.MarkId {
80+
private static final class TestMarkId implements CompilationResult.MarkId {
8181
@Override
8282
public String getName() {
8383
return "test";

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest10.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class ConditionalEliminationTest10 extends ConditionalEliminationTestBase
4747
private static boolean condition1;
4848
private static boolean condition2;
4949

50-
private static class TestClass {
50+
private static final class TestClass {
5151
int x;
5252
}
5353

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DegeneratedLoopsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void test1() {
5050
test("test1Snippet");
5151
}
5252

53-
private static class UnresolvedException extends RuntimeException {
53+
private static final class UnresolvedException extends RuntimeException {
5454

5555
private static final long serialVersionUID = 5215434338750728440L;
5656

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NodePropertiesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ public void simplify(Node node, SimplifierTool tool) {
318318
}
319319
}
320320

321-
private static class GraphCostPhase extends TestBasePhase<CoreProviders> {
321+
private static final class GraphCostPhase extends TestBasePhase<CoreProviders> {
322322
private double finalCycles;
323323
private double finalSize;
324324

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyAssertionUsageTest.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public static void afterClass() {
8787
/**
8888
* Valid call with an assertion message.
8989
*/
90-
private static class ValidAssertUsage1 extends TestPhase {
90+
private static final class ValidAssertUsage1 extends TestPhase {
9191
@Override
9292
protected void run(StructuredGraph graph) {
9393
assert graph.hasLoops() : "Must have loops";
@@ -98,7 +98,7 @@ protected void run(StructuredGraph graph) {
9898
* Valid call with a trivial condition. Null check is trivial in that if it fails the error is
9999
* "clear" to spot by inspecting the code.
100100
*/
101-
private static class ValidAssertUsage2 extends TestPhase {
101+
private static final class ValidAssertUsage2 extends TestPhase {
102102
@Override
103103
protected void run(StructuredGraph graph) {
104104
assert graph != null;
@@ -108,7 +108,7 @@ protected void run(StructuredGraph graph) {
108108
/**
109109
* Valid usage of known assertion methods that are always safe to call.
110110
*/
111-
private static class ValidAssertUsage3 extends TestPhase {
111+
private static final class ValidAssertUsage3 extends TestPhase {
112112
@Override
113113
protected void run(StructuredGraph graph) {
114114
assert GraphOrder.assertSchedulableGraph(graph);
@@ -119,7 +119,7 @@ protected void run(StructuredGraph graph) {
119119
/**
120120
* Invalid assertion call: missing assertion message.
121121
*/
122-
private static class InvalidAssertUsage extends TestPhase {
122+
private static final class InvalidAssertUsage extends TestPhase {
123123
@Override
124124
protected void run(StructuredGraph graph) {
125125
assert graph.hasLoops();
@@ -131,7 +131,7 @@ protected void run(StructuredGraph graph) {
131131
* further but call further eventually calls a method with an assertion error message so the
132132
* assertion usage is correct several levels down the call graph.
133133
*/
134-
private static class ValidCallGraphUsage1 extends TestPhase {
134+
private static final class ValidCallGraphUsage1 extends TestPhase {
135135
@Override
136136
protected void run(StructuredGraph graph) {
137137
assert verifyGraph(graph);
@@ -160,7 +160,7 @@ private static boolean callFurther1(StructuredGraph g) {
160160
* Invalid call: call further is missing the assertion message and run calls callFurther so this
161161
* is a missing assertion message 1 level down the call graph.
162162
*/
163-
private static class InvalidCallGraphUsage1 extends TestPhase {
163+
private static final class InvalidCallGraphUsage1 extends TestPhase {
164164
@Override
165165
protected void run(StructuredGraph graph) {
166166
assert callFurther(graph);
@@ -182,7 +182,7 @@ private static boolean callFurther(StructuredGraph g) {
182182
* Invalid call graph usage: multiple calls to methods without an error message a second level
183183
* down the call graph.
184184
*/
185-
private static class InvalidCallGraphUsage2 extends TestPhase {
185+
private static final class InvalidCallGraphUsage2 extends TestPhase {
186186
@Override
187187
protected void run(StructuredGraph graph) {
188188
assert callFurther(graph);
@@ -207,7 +207,7 @@ private static boolean callFurther(StructuredGraph g) {
207207
* superfluous: callFurther does assertion checking and will always return true - thus the error
208208
* message in run is never used.
209209
*/
210-
private static class InvalidCallGraphUsage3 extends TestPhase {
210+
private static final class InvalidCallGraphUsage3 extends TestPhase {
211211
@Override
212212
protected void run(StructuredGraph graph) {
213213
assert callFurther(graph) : "Invalid superfluous message";
@@ -235,7 +235,7 @@ private static boolean callFurther1(StructuredGraph g) {
235235
/**
236236
* Same as {@link InvalidCallGraphUsage3} but without multiple levels.
237237
*/
238-
private static class InvalidCallGraphUsage31 extends TestPhase {
238+
private static final class InvalidCallGraphUsage31 extends TestPhase {
239239
@Override
240240
protected void run(StructuredGraph graph) {
241241
assert verifyGraph(graph) : "Invalid superfluous message";
@@ -254,7 +254,7 @@ private static boolean verifyGraph(StructuredGraph graph) {
254254
* the caller. Specifically assertSth has a return false path that would fire the error in the
255255
* caller run without a message.
256256
*/
257-
private static class InvalidCallGraphUsage4 extends TestPhase {
257+
private static final class InvalidCallGraphUsage4 extends TestPhase {
258258
@Override
259259
protected void run(StructuredGraph graph) {
260260
assert assertSth(graph);
@@ -282,7 +282,7 @@ private static boolean assertSth1(StructuredGraph g) {
282282
/**
283283
* Invalid assertion usage: the path doSth() does not assert anything.
284284
*/
285-
private static class InvalidCallGraphUsage5 extends TestPhase {
285+
private static final class InvalidCallGraphUsage5 extends TestPhase {
286286
@Override
287287
protected void run(StructuredGraph graph) {
288288
assert assertSth(graph);
@@ -304,7 +304,7 @@ static void doSth() {
304304
* - the paths where they are missing them is loop iterations so those are fine. They still
305305
* return {@code true} on all paths.
306306
*/
307-
private static class ValidCallGraphUsage5 extends TestPhase {
307+
private static final class ValidCallGraphUsage5 extends TestPhase {
308308
@Override
309309
protected void run(StructuredGraph graph) {
310310
assert assertSth(graph);
@@ -339,7 +339,7 @@ private static boolean assertSth2(StructuredGraph g) {
339339
* Correct assertion usage: calling another method not via an assert but regularly where that
340340
* method itself calls an assertion.
341341
*/
342-
private static class ValidCallGraphUsage6 extends TestPhase {
342+
private static final class ValidCallGraphUsage6 extends TestPhase {
343343
@Override
344344
protected void run(StructuredGraph graph) {
345345
assert assertSth(graph);

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyBailoutUsageTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,35 +53,35 @@
5353

5454
public class VerifyBailoutUsageTest {
5555

56-
private static class InvalidBailoutUsagePhase1 extends TestPhase {
56+
private static final class InvalidBailoutUsagePhase1 extends TestPhase {
5757
@Override
5858
protected void run(StructuredGraph graph) {
5959
throw new BailoutException("Bailout in graph %s", graph);
6060
}
6161
}
6262

63-
private static class InvalidBailoutUsagePhase2 extends TestPhase {
63+
private static final class InvalidBailoutUsagePhase2 extends TestPhase {
6464
@Override
6565
protected void run(StructuredGraph graph) {
6666
throw new BailoutException(new GraalError("other cause"), "Bailout in graph %s", graph);
6767
}
6868
}
6969

70-
private static class InvalidBailoutUsagePhase3 extends TestPhase {
70+
private static final class InvalidBailoutUsagePhase3 extends TestPhase {
7171
@Override
7272
protected void run(StructuredGraph graph) {
7373
throw new BailoutException(true/* permanent */, "Bailout in graph %s", graph);
7474
}
7575
}
7676

77-
private static class ValidPermanentBailoutUsage extends TestPhase {
77+
private static final class ValidPermanentBailoutUsage extends TestPhase {
7878
@Override
7979
protected void run(StructuredGraph graph) {
8080
throw new PermanentBailoutException("Valid permanent bailout %s", graph);
8181
}
8282
}
8383

84-
private static class ValidRetryableBailoutUsage extends TestPhase {
84+
private static final class ValidRetryableBailoutUsage extends TestPhase {
8585
@Override
8686
protected void run(StructuredGraph graph) {
8787
throw new RetryableBailoutException("Valid retryable bailout %s", graph);

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyDebugUsageTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
public class VerifyDebugUsageTest {
5656

57-
private static class InvalidLogUsagePhase extends TestPhase {
57+
private static final class InvalidLogUsagePhase extends TestPhase {
5858
@Override
5959
protected void run(StructuredGraph graph) {
6060
DebugContext debug = graph.getDebug();
@@ -65,7 +65,7 @@ protected void run(StructuredGraph graph) {
6565

6666
}
6767

68-
private static class InvalidLogAndIndentUsagePhase extends TestPhase {
68+
private static final class InvalidLogAndIndentUsagePhase extends TestPhase {
6969
@Override
7070
@SuppressWarnings("try")
7171
protected void run(StructuredGraph graph) {
@@ -107,7 +107,7 @@ int getLevel() {
107107
}
108108
}
109109

110-
private static class InvalidVerifyUsagePhase extends TestPhase {
110+
private static final class InvalidVerifyUsagePhase extends TestPhase {
111111
@Override
112112
protected void run(StructuredGraph graph) {
113113
DebugContext debug = graph.getDebug();
@@ -116,7 +116,7 @@ protected void run(StructuredGraph graph) {
116116

117117
}
118118

119-
private static class InvalidConcatLogUsagePhase extends TestPhase {
119+
private static final class InvalidConcatLogUsagePhase extends TestPhase {
120120
@Override
121121
protected void run(StructuredGraph graph) {
122122
DebugContext debug = graph.getDebug();
@@ -127,7 +127,7 @@ protected void run(StructuredGraph graph) {
127127

128128
}
129129

130-
private static class InvalidConcatLogAndIndentUsagePhase extends TestPhase {
130+
private static final class InvalidConcatLogAndIndentUsagePhase extends TestPhase {
131131
@Override
132132
@SuppressWarnings("try")
133133
protected void run(StructuredGraph graph) {
@@ -218,14 +218,14 @@ protected void run(StructuredGraph graph) {
218218

219219
public static Object sideEffect;
220220

221-
private static class InvalidGraalErrorCtorPhase extends TestPhase {
221+
private static final class InvalidGraalErrorCtorPhase extends TestPhase {
222222
@Override
223223
protected void run(StructuredGraph graph) {
224224
sideEffect = new GraalError("No Error %s", graph.toString());
225225
}
226226
}
227227

228-
private static class ValidGraalErrorCtorPhase extends TestPhase {
228+
private static final class ValidGraalErrorCtorPhase extends TestPhase {
229229
@Override
230230
protected void run(StructuredGraph graph) {
231231
sideEffect = new GraalError("Error %s", graph);

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/MonitorDeoptTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private enum State {
5555

5656
static final long TIMEOUT = 5000;
5757

58-
private static class Monitor {
58+
private static final class Monitor {
5959
private volatile State state = State.INITIAL;
6060

6161
public synchronized void setState(State newState) {

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/inlining/ImpreciseArgumentStampInliningTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
*/
6161
public class ImpreciseArgumentStampInliningTest extends GraalCompilerTest {
6262

63-
private static class InlineMethodHolder {
63+
private static final class InlineMethodHolder {
6464
static void inlineMe(UnresolveableClass argument) {
6565
GraalDirectives.blackhole(argument);
6666
}
@@ -76,7 +76,7 @@ public static void snippet() {
7676
}
7777

7878
// Will be unresolved during bytecode parsing, and resolved during inlining.
79-
private static class UnresolveableClass {
79+
private static final class UnresolveableClass {
8080
}
8181

8282
@Test

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ArrayNewInstanceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void testNewArrayInLoop() {
102102
assertTrue(box.inCompiledCode != shouldDeopt);
103103
}
104104

105-
private static class DeoptimizationBox {
105+
private static final class DeoptimizationBox {
106106
volatile boolean inCompiledCode = false;
107107
}
108108

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ClassSubstitutionsTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ public boolean fieldIsArray() {
208208
private static class A {
209209
}
210210

211-
private static class B extends A {
211+
private static final class B extends A {
212212
}
213213

214-
private static class C {
214+
private static final class C {
215215
}
216216

217217
private static final A aInstance = new A();

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ExplicitExceptionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void testNPEArray() {
102102
test("testNPEArraySnippet", array);
103103
}
104104

105-
private static class TestClass {
105+
private static final class TestClass {
106106
int field;
107107
}
108108

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public static int systemIdentityHashCode(Object obj) {
170170
return System.identityHashCode(obj);
171171
}
172172

173-
private static class TestClassA {
173+
private static final class TestClassA {
174174
}
175175

176176
public static String testCallSiteGetTargetSnippet(int i) throws Exception {

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/JVMCIInfopointErrorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public void testUnexpectedObject() {
276276
});
277277
}
278278

279-
private static class UnknownJavaValue implements JavaValue {
279+
private static final class UnknownJavaValue implements JavaValue {
280280
}
281281

282282
@SuppressWarnings("try")

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/PolymorphicInliningTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,21 +156,21 @@ private abstract static class SuperClass {
156156
abstract int foo();
157157
}
158158

159-
private static class A extends SuperClass {
159+
private static final class A extends SuperClass {
160160
@Override
161161
public int foo() {
162162
return 'A';
163163
}
164164
}
165165

166-
private static class B extends SuperClass {
166+
private static final class B extends SuperClass {
167167
@Override
168168
public int foo() {
169169
return 'B';
170170
}
171171
}
172172

173-
private static class NotInlinableSubClass extends SuperClass {
173+
private static final class NotInlinableSubClass extends SuperClass {
174174
@Override
175175
public int foo() {
176176
return 'X';

0 commit comments

Comments
 (0)