--- jsr166/src/main/java/util/PriorityQueue.java	2019/08/30 18:05:39	1.132
+++ jsr166/src/main/java/util/PriorityQueue.java	2020/07/24 20:57:26	1.134
@@ -111,6 +111,7 @@ public class PriorityQueue<E> extends Ab
      * The comparator, or null if priority queue uses elements'
      * natural ordering.
      */
+    @SuppressWarnings("serial") // Conditionally serializable
     private final Comparator<? super E> comparator;
 
     /**
@@ -262,8 +263,7 @@ public class PriorityQueue<E> extends Ab
     private void initElementsFromCollection(Collection<? extends E> c) {
         Object[] es = c.toArray();
         int len = es.length;
-        // If c.toArray incorrectly doesn't return Object[], copy it.
-        if (es.getClass() != Object[].class)
+        if (c.getClass() != ArrayList.class)
             es = Arrays.copyOf(es, len, Object[].class);
         if (len == 1 || this.comparator != null)
             for (Object e : es)