CODETOOLS-7902984: jcstress: Fix lint warnings in generated code and utilities

shipilev · web-flow · commit 8573c1b38641 · 2021-06-22T10:36:25.000+02:00
diff --git a/jcstress-core/pom.xml b/jcstress-core/pom.xml
@@ -51,7 +51,7 @@ questions.
                 <configuration>
                     <proc>none</proc>
                     <compilerArgs>
-                        <arg>-Xlint:all</arg>
+                        <arg>-Xlint:all,-options,-serial</arg>
                         <arg>-Werror</arg>
                     </compilerArgs>
                 </configuration>
diff --git a/jcstress-core/src/main/java/org/openjdk/jcstress/Main.java b/jcstress-core/src/main/java/org/openjdk/jcstress/Main.java
@@ -62,7 +62,7 @@ public static void main(String[] args) throws Exception {
     }
 
     static void printVersion(PrintStream out) {
-        Class clazz = Main.class;
+        Class<?> clazz = Main.class;
         String className = clazz.getSimpleName() + ".class";
         String classPath = clazz.getResource(className).toString();
         if (!classPath.startsWith("jar")) {
diff --git a/jcstress-core/src/main/java/org/openjdk/jcstress/annotations/JCStressMeta.java b/jcstress-core/src/main/java/org/openjdk/jcstress/annotations/JCStressMeta.java
@@ -40,6 +40,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface JCStressMeta {
 
-    Class value();
+    Class<?> value();
 
 }
diff --git a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/JCStressTestProcessor.java b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/JCStressTestProcessor.java
@@ -65,7 +65,26 @@ public SourceVersion getSupportedSourceVersion() {
 
     @Override
     public Set<String> getSupportedAnnotationTypes() {
-        return Collections.singleton(JCStressTest.class.getName());
+        List<Class<?>> classes = Arrays.asList(
+                JCStressTest.class,
+                JCStressMeta.class,
+                State.class,
+                Result.class,
+                Actor.class,
+                Arbiter.class,
+                Signal.class,
+                Outcome.class,
+                Outcome.Outcomes.class,
+                Ref.class,
+                Ref.Refs.class,
+                Description.class
+        );
+
+        HashSet<String> set = new HashSet<>();
+        for (Class<?> cl : classes) {
+            set.add(cl.getCanonicalName());
+        }
+        return set;
     }
 
     @Override
@@ -480,7 +499,7 @@ private void generateContinuous(TestInfo info) {
             pw.println("        }});");
         }
         pw.println();
-        pw.println("        for (CounterThread t : threads) {");
+        pw.println("        for (CounterThread<" + r + "> t : threads) {");
         pw.println("            t.start();");
         pw.println("        }");
         pw.println();
diff --git a/jcstress-core/src/main/java/org/openjdk/jcstress/os/Scheduler.java b/jcstress-core/src/main/java/org/openjdk/jcstress/os/Scheduler.java
@@ -524,6 +524,7 @@ private List<SchedulingClass> noneOrGlobalAffinityFor(AffinityMode mode, int thr
         return Collections.singletonList(scl);
     }
 
+    @SuppressWarnings("fallthrough")
     public List<SchedulingClass> scheduleClasses(int actorThreads, int threadLimit, AffinityMode mode) {
         switch (mode) {
             case LOCAL:
diff --git a/jcstress-core/src/main/java/org/openjdk/jcstress/util/ResultUtils.java b/jcstress-core/src/main/java/org/openjdk/jcstress/util/ResultUtils.java
@@ -28,7 +28,7 @@ public class ResultUtils {
 
     public static String resultName(Class<?>... args) {
         String name = "";
-        for (Class k : args) {
+        for (Class<?> k : args) {
             if (k.isPrimitive()) {
                 if (k == boolean.class) name += "Z";
                 if (k == byte.class)    name += "B";
diff --git a/jcstress-core/src/main/java/sun/misc/Unsafe.java b/jcstress-core/src/main/java/sun/misc/Unsafe.java
@@ -246,9 +246,9 @@ public static Unsafe getUnsafe() {
 
     public abstract void putByte(java.lang.Object o, long l, byte l1);
 
-    public abstract int arrayBaseOffset(java.lang.Class aClass);
+    public abstract int arrayBaseOffset(java.lang.Class<?> aClass);
 
-    public abstract int arrayIndexScale(java.lang.Class aClass);
+    public abstract int arrayIndexScale(java.lang.Class<?> aClass);
 
     public abstract int getAndAddInt(Object o, long offset, int delta);
 
diff --git a/jcstress-result-gen/src/main/java/org/openjdk/jcstress/ResultGenerator.java b/jcstress-result-gen/src/main/java/org/openjdk/jcstress/ResultGenerator.java
@@ -43,7 +43,7 @@ public ResultGenerator(String srcRoot) {
     public String generateResult(Class<?>... args) {
         boolean allPrimitive = true;
         String name = "";
-        for (Class k : args) {
+        for (Class<?> k : args) {
             if (k.isPrimitive()) {
                 if (k == boolean.class) name += "Z";
                 if (k == byte.class)    name += "B";
@@ -88,7 +88,7 @@ public String generateResult(Class<?>... args) {
 
         {
             int n = 1;
-            for (Class k : args) {
+            for (Class<?> k : args) {
                 pw.println("    @sun.misc.Contended");
                 pw.println("    @jdk.internal.vm.annotation.Contended");
                 pw.println("    public " + k.getSimpleName() + " r" + n + ";");
@@ -108,7 +108,7 @@ public String generateResult(Class<?>... args) {
         pw.println("        return ");
         {
             int n = 1;
-            for (Class k : args) {
+            for (Class<?> k : args) {
                 pw.print("        ");
                 if (n != 1) {
                     pw.print(" + ");
@@ -147,7 +147,7 @@ public String generateResult(Class<?>... args) {
 
         {
             int n = 1;
-            for (Class k : args) {
+            for (Class<?> k : args) {
                 if (k == boolean.class || k == byte.class || k == short.class || k == char.class
                         || k == int.class || k == long.class) {
                     pw.println("        if (r" + n + " != that.r" + n + ") return false;");
@@ -170,7 +170,7 @@ public String generateResult(Class<?>... args) {
         pw.print("        return \"\" + ");
         {
             int n = 1;
-            for (Class k : args) {
+            for (Class<?> k : args) {
                 if (n != 1)
                     pw.print(" + \", \" + ");
                 pw.print("r" + n);
diff --git a/jcstress-test-gen/src/main/java/org/openjdk/jcstress/generator/TestGenerator.java b/jcstress-test-gen/src/main/java/org/openjdk/jcstress/generator/TestGenerator.java
@@ -227,7 +227,7 @@ public Class<?> type(int index) {
             return types[index];
         }
 
-        public Class[] all() {
+        public Class<?>[] all() {
             return types;
         }
 
diff --git a/jcstress-test-gen/src/main/java/org/openjdk/jcstress/generator/seqcst/SeqCstTraceGenerator.java b/jcstress-test-gen/src/main/java/org/openjdk/jcstress/generator/seqcst/SeqCstTraceGenerator.java
@@ -185,10 +185,8 @@ private void check(Set<String> ids, String id, String info) {
     private void emit(MultiThread mt, Collection<TraceResult> scResults) {
         String klass = mt.canonicalId() + "_Test";
 
-        Class[] klasses = new Class[mt.loadCount() + mt.allVariables().size()];
-        for (int c = 0; c < klasses.length; c++) {
-            klasses[c] = int.class;
-        }
+        Class<?>[] klasses = new Class<?>[mt.loadCount() + mt.allVariables().size()];
+        Arrays.fill(klasses, int.class);
 
         String resultName = ResultUtils.resultName(klasses);
 
diff --git a/jcstress-test-gen/src/main/resources/fences/X-LoadStoreFenceTest1.java.template b/jcstress-test-gen/src/main/resources/fences/X-LoadStoreFenceTest1.java.template
@@ -52,7 +52,8 @@ public class $TestClassName$ {
 
     @Actor
     public void actor2($T$$T$_Result r) {
-        r.r1 = field;
-        x = ($type$) r.r1;
+        $type$ t = field;
+        x = t;
+        r.r1 = t;
     }
 }
diff --git a/jcstress-test-gen/src/main/resources/fences/X-LoadStoreFenceTest2.java.template b/jcstress-test-gen/src/main/resources/fences/X-LoadStoreFenceTest2.java.template
@@ -52,7 +52,8 @@ public class $TestClassName$ {
 
     @Actor
     public void actor2($T$$T$_Result r) {
-        r.r1 = y;
-        field = ($type$) r.r1;
+        $type$ t = y;
+        field = t;
+        r.r1 = t;
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -78,10 +78,15 @@ questions.
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.0</version>
+                    <version>3.8.1</version>
                     <configuration>
                         <source>1.8</source>
                         <target>1.8</target>
+                        <compilerArgs>
+                            <arg>-Xlint:all,-deprecation,-options,-serial,-processing</arg>
+                            <arg>-Werror</arg>
+                        </compilerArgs>
+                        <showWarnings>true</showWarnings>
                     </configuration>
                 </plugin>
                 <plugin>

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public static void main(String[] args) throws Exception {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`static void printVersion(PrintStream out) {`
`65`		`- Class clazz = Main.class;`
	`65`	`+ Class<?> clazz = Main.class;`
`66`	`66`	`String className = clazz.getSimpleName() + ".class";`
`67`	`67`	`String classPath = clazz.getResource(className).toString();`
`68`	`68`	`if (!classPath.startsWith("jar")) {`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@`
`40`	`40`	`@Retention(RetentionPolicy.RUNTIME)`
`41`	`41`	`public @interface JCStressMeta {`
`42`	`42`
`43`		`- Class value();`
	`43`	`+ Class<?> value();`
`44`	`44`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -524,6 +524,7 @@ private List<SchedulingClass> noneOrGlobalAffinityFor(AffinityMode mode, int thr`
`524`	`524`	`return Collections.singletonList(scl);`
`525`	`525`	`}`
`526`	`526`
	`527`	`+ @SuppressWarnings("fallthrough")`
`527`	`528`	`public List<SchedulingClass> scheduleClasses(int actorThreads, int threadLimit, AffinityMode mode) {`
`528`	`529`	`switch (mode) {`
`529`	`530`	`case LOCAL:`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public Class<?> type(int index) {`
`227`	`227`	`return types[index];`
`228`	`228`	`}`
`229`	`229`
`230`		`- public Class[] all() {`
	`230`	`+ public Class<?>[] all() {`
`231`	`231`	`return types;`
`232`	`232`	`}`
`233`	`233`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ public class $TestClassName$ {`
`52`	`52`
`53`	`53`	`@Actor`
`54`	`54`	`public void actor2($T$$T$_Result r) {`
`55`		`- r.r1 = field;`
`56`		`- x = ($type$) r.r1;`
	`55`	`+ $type$ t = field;`
	`56`	`+ x = t;`
	`57`	`+ r.r1 = t;`
`57`	`58`	`}`
`58`	`59`	`}`