8197531: Miscellaneous changes imported from jsr166 CVS 2018-04

Reviewed-by: martin, psandoz

Author: Doug Lea

src/java.base/share/classes/java/util/ArrayDeque.java

@@ -208,7 +208,7 @@ public ArrayDeque(int numElements) {
      */
     public ArrayDeque(Collection<? extends E> c) {
         this(c.size());
-        addAll(c);
+        copyElements(c);
     }
 
     /**
@@ -322,10 +322,14 @@ public boolean addAll(Collection<? extends E> c) {
         final int s, needed;
         if ((needed = (s = size()) + c.size() + 1 - elements.length) > 0)
             grow(needed);
-        c.forEach(this::addLast);
+        copyElements(c);
         return size() > s;
     }
 
+    private void copyElements(Collection<? extends E> c) {
+        c.forEach(this::addLast);
+    }
+
     /**
      * Inserts the specified element at the front of this deque.
      *

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

@@ -2883,7 +2883,7 @@ static final class MinimalStage<T> extends CompletableFuture<T> {
             STACK = l.findVarHandle(CompletableFuture.class, "stack", Completion.class);
             NEXT = l.findVarHandle(Completion.class, "next", Completion.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to

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

@@ -6383,7 +6383,7 @@ public final void compute() {
         ABASE = U.arrayBaseOffset(Node[].class);
         int scale = U.arrayIndexScale(Node[].class);
         if ((scale & (scale - 1)) != 0)
-            throw new Error("array index scale not a power of two");
+            throw new ExceptionInInitializerError("array index scale not a power of two");
         ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
 
         // Reduce the risk of rare disastrous classloading in first call to

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

@@ -1671,7 +1671,7 @@ public void forEach(Consumer<? super E> action) {
             NEXT = l.findVarHandle(Node.class, "next", Node.class);
             ITEM = l.findVarHandle(Node.class, "item", Object.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 }

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

@@ -1069,7 +1069,7 @@ public void forEach(Consumer<? super E> action) {
             ITEM = l.findVarHandle(Node.class, "item", Object.class);
             NEXT = l.findVarHandle(Node.class, "next", Node.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 }

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

@@ -3412,7 +3412,7 @@ final EntrySpliterator<K,V> entrySpliterator() {
             VAL = l.findVarHandle(Node.class, "val", Object.class);
             RIGHT = l.findVarHandle(Index.class, "right", Index.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 }

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

@@ -775,7 +775,7 @@ protected void setRawResult(T t) { }
             PENDING = l.findVarHandle(CountedCompleter.class, "pending", int.class);
 
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 }

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

@@ -641,7 +641,7 @@ public V exchange(V x, long timeout, TimeUnit unit)
             MATCH = l.findVarHandle(Node.class, "match", Object.class);
             AA = MethodHandles.arrayElementVarHandle(Node[].class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 

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

@@ -1540,7 +1540,7 @@ private void readObject(java.io.ObjectInputStream s)
             MethodHandles.Lookup l = MethodHandles.lookup();
             STATUS = l.findVarHandle(ForkJoinTask.class, "status", int.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 

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

@@ -526,7 +526,7 @@ public String toString() {
             RUNNER = l.findVarHandle(FutureTask.class, "runner", Thread.class);
             WAITERS = l.findVarHandle(FutureTask.class, "waiters", WaitNode.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to

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

@@ -1739,7 +1739,7 @@ public void forEach(Consumer<? super E> action) {
             NEXT = l.findVarHandle(Node.class, "next", Node.class);
             WAITER = l.findVarHandle(Node.class, "waiter", Thread.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to

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

@@ -1137,7 +1137,7 @@ public boolean block() {
             MethodHandles.Lookup l = MethodHandles.lookup();
             STATE = l.findVarHandle(Phaser.class, "state", long.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to

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

@@ -1014,7 +1014,7 @@ public Spliterator<E> spliterator() {
                                                  "allocationSpinLock",
                                                  int.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 }

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

@@ -1096,7 +1096,7 @@ final int offer(T item, boolean unowned) {
             if (cap > 0) {
                 boolean added;
                 if (n >= cap && cap < maxCapacity) // resize
-                    added = growAndoffer(item, a, t);
+                    added = growAndOffer(item, a, t);
                 else if (n >= cap || unowned)      // need volatile CAS
                     added = QA.compareAndSet(a, i, null, item);
                 else {                             // can use release mode
@@ -1115,7 +1115,7 @@ else if (n >= cap || unowned)      // need volatile CAS
          * Tries to expand buffer and add item, returning true on
          * success. Currently fails only if out of memory.
          */
-        final boolean growAndoffer(T item, Object[] a, int t) {
+        final boolean growAndOffer(T item, Object[] a, int t) {
             int cap = 0, newCap = 0;
             Object[] newArray = null;
             if (a != null && (cap = a.length) > 0 && (newCap = cap << 1) > 0) {
@@ -1466,7 +1466,7 @@ else if (timed)
                                          long.class);
                 QA = MethodHandles.arrayElementVarHandle(Object[].class);
             } catch (ReflectiveOperationException e) {
-                throw new Error(e);
+                throw new ExceptionInInitializerError(e);
             }
 
             // Reduce the risk of rare disastrous classloading in first call to

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

@@ -293,7 +293,7 @@ boolean isCancelled() {
                     SMATCH = l.findVarHandle(SNode.class, "match", SNode.class);
                     SNEXT = l.findVarHandle(SNode.class, "next", SNode.class);
                 } catch (ReflectiveOperationException e) {
-                    throw new Error(e);
+                    throw new ExceptionInInitializerError(e);
                 }
             }
         }
@@ -516,7 +516,7 @@ void clean(SNode s) {
                 MethodHandles.Lookup l = MethodHandles.lookup();
                 SHEAD = l.findVarHandle(TransferStack.class, "head", SNode.class);
             } catch (ReflectiveOperationException e) {
-                throw new Error(e);
+                throw new ExceptionInInitializerError(e);
             }
         }
     }
@@ -583,7 +583,7 @@ boolean isOffList() {
                     QITEM = l.findVarHandle(QNode.class, "item", Object.class);
                     QNEXT = l.findVarHandle(QNode.class, "next", QNode.class);
                 } catch (ReflectiveOperationException e) {
-                    throw new Error(e);
+                    throw new ExceptionInInitializerError(e);
                 }
             }
         }
@@ -830,7 +830,7 @@ void clean(QNode pred, QNode s) {
                 QCLEANME = l.findVarHandle(TransferQueue.class, "cleanMe",
                                            QNode.class);
             } catch (ReflectiveOperationException e) {
-                throw new Error(e);
+                throw new ExceptionInInitializerError(e);
             }
         }
     }

src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java

@@ -56,7 +56,7 @@ public class AtomicBoolean implements java.io.Serializable {
             MethodHandles.Lookup l = MethodHandles.lookup();
             VALUE = l.findVarHandle(AtomicBoolean.class, "value", int.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 

src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java

@@ -199,7 +199,7 @@ public boolean attemptMark(V expectedReference, boolean newMark) {
             PAIR = l.findVarHandle(AtomicMarkableReference.class, "pair",
                                    Pair.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 

src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java

@@ -56,7 +56,7 @@ public class AtomicReference<V> implements java.io.Serializable {
             MethodHandles.Lookup l = MethodHandles.lookup();
             VALUE = l.findVarHandle(AtomicReference.class, "value", Object.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 

src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java

@@ -199,7 +199,7 @@ public boolean attemptStamp(V expectedReference, int newStamp) {
             PAIR = l.findVarHandle(AtomicStampedReference.class, "pair",
                                    Pair.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 

src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java

@@ -144,7 +144,7 @@ final long getAndSet(long val) {
                 MethodHandles.Lookup l = MethodHandles.lookup();
                 VALUE = l.findVarHandle(Cell.class, "value", long.class);
             } catch (ReflectiveOperationException e) {
-                throw new Error(e);
+                throw new ExceptionInInitializerError(e);
             }
         }
     }
@@ -396,13 +396,13 @@ public MethodHandles.Lookup run() {
                             try {
                                 return MethodHandles.privateLookupIn(Thread.class, MethodHandles.lookup());
                             } catch (ReflectiveOperationException e) {
-                                throw new Error(e);
+                                throw new ExceptionInInitializerError(e);
                             }
                         }});
             THREAD_PROBE = l.findVarHandle(Thread.class,
                     "threadLocalRandomProbe", int.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 

src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java

@@ -1830,7 +1830,7 @@ protected final Collection<Thread> getWaitingThreads() {
             HEAD = l.findVarHandle(AbstractQueuedLongSynchronizer.class, "head", Node.class);
             TAIL = l.findVarHandle(AbstractQueuedLongSynchronizer.class, "tail", Node.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to

src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java

@@ -555,7 +555,7 @@ final void setPrevRelaxed(Node p) {
                 THREAD = l.findVarHandle(Node.class, "thread", Thread.class);
                 WAITSTATUS = l.findVarHandle(Node.class, "waitStatus", int.class);
             } catch (ReflectiveOperationException e) {
-                throw new Error(e);
+                throw new ExceptionInInitializerError(e);
             }
         }
     }
@@ -2308,7 +2308,7 @@ protected final Collection<Thread> getWaitingThreads() {
             HEAD = l.findVarHandle(AbstractQueuedSynchronizer.class, "head", Node.class);
             TAIL = l.findVarHandle(AbstractQueuedSynchronizer.class, "tail", Node.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to

src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java

@@ -1614,7 +1614,7 @@ private long cancelWaiter(WNode node, WNode group, boolean interrupted) {
             WNEXT = l.findVarHandle(WNode.class, "next", WNode.class);
             WCOWAIT = l.findVarHandle(WNode.class, "cowait", WNode.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 }