Automatic merge of jdk:master into master

Author: duke

src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java

@@ -2778,6 +2778,7 @@ static final class InvokeAnyRoot<E> extends ForkJoinTask<E> {
         @SuppressWarnings("serial") // Conditionally serializable
         volatile E result;
         final AtomicInteger count;  // in case all throw
+        @SuppressWarnings("serial")
         final ForkJoinPool pool;    // to check shutdown while collecting
         InvokeAnyRoot(int n, ForkJoinPool p) {
             pool = p;

src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java

@@ -1444,8 +1444,8 @@ static final class AdaptedInterruptibleCallable<T> extends ForkJoinTask<T>
         implements RunnableFuture<T> {
         @SuppressWarnings("serial") // Conditionally serializable
         final Callable<? extends T> callable;
-        @SuppressWarnings("serial") // Conditionally serializable
         transient volatile Thread runner;
+        @SuppressWarnings("serial") // Conditionally serializable
         T result;
         AdaptedInterruptibleCallable(Callable<? extends T> callable) {
             if (callable == null) throw new NullPointerException();