ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/ArrayList.java

Comparing jsr166/src/main/java/util/ArrayList.java (file contents):
Revision 1.37 by jsr166, Fri Nov 4 03:09:27 2016 UTC vs.
Revision 1.57 by jsr166, Wed Mar 28 02:50:41 2018 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
2	>	* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
3		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4		*
5		* This code is free software; you can redistribute it and/or modify it
#	Line 28 | Line 28 | package java.util;
28		import java.util.function.Consumer;
29		import java.util.function.Predicate;
30		import java.util.function.UnaryOperator;
31	+	import jdk.internal.misc.SharedSecrets;
32
33		/**
34		* Resizable-array implementation of the {@code List} interface.  Implements
#	Line 91 | Line 92 | import java.util.function.UnaryOperator;
92		* should be used only to detect bugs.</i>
93		*
94		* <p>This class is a member of the
95	<	* <a href="{@docRoot}/../technotes/guides/collections/index.html">
95	>	* <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework">
96		* Java Collections Framework</a>.
97		*
98		* @param <E> the type of elements in this list
#	Line 423 | Line 424 | public class ArrayList<E> extends Abstra
424		return (E) elementData[index];
425		}
426
427	+	@SuppressWarnings("unchecked")
428	+	static <E> E elementAt(Object[] es, int index) {
429	+	return (E) es[index];
430	+	}
431	+
432		/**
433		* Returns the element at the specified position in this list.
434		*
#	Line 496 | Line 502 | public class ArrayList<E> extends Abstra
502		s - index);
503		elementData[index] = element;
504		size = s + 1;
505	+	// checkInvariants();
506		}
507
508		/**
#	Line 509 | Line 516 | public class ArrayList<E> extends Abstra
516		*/
517		public E remove(int index) {
518		Objects.checkIndex(index, size);
519	+	final Object[] es = elementData;
520
521	<	modCount++;
522	<	E oldValue = elementData(index);
515	<
516	<	int numMoved = size - index - 1;
517	<	if (numMoved > 0)
518	<	System.arraycopy(elementData, index+1, elementData, index,
519	<	numMoved);
520	<	elementData[--size] = null; // clear to let GC do its work
521	>	@SuppressWarnings("unchecked") E oldValue = (E) es[index];
522	>	fastRemove(es, index);
523
524	+	// checkInvariants();
525		return oldValue;
526		}
527
#	Line 536 | Line 539 | public class ArrayList<E> extends Abstra
539		* @return {@code true} if this list contained the specified element
540		*/
541		public boolean remove(Object o) {
542	<	if (o == null) {
543	<	for (int index = 0; index < size; index++)
544	<	if (elementData[index] == null) {
545	<	fastRemove(index);
546	<	return true;
547	<	}
548	<	} else {
549	<	for (int index = 0; index < size; index++)
550	<	if (o.equals(elementData[index])) {
551	<	fastRemove(index);
552	<	return true;
553	<	}
542	>	final Object[] es = elementData;
543	>	final int size = this.size;
544	>	int i = 0;
545	>	found: {
546	>	if (o == null) {
547	>	for (; i < size; i++)
548	>	if (es[i] == null)
549	>	break found;
550	>	} else {
551	>	for (; i < size; i++)
552	>	if (o.equals(es[i]))
553	>	break found;
554	>	}
555	>	return false;
556		}
557	<	return false;
557	>	fastRemove(es, i);
558	>	return true;
559		}
560
561	<	/*
561	>	/**
562		* Private remove method that skips bounds checking and does not
563		* return the value removed.
564		*/
565	<	private void fastRemove(int index) {
565	>	private void fastRemove(Object[] es, int i) {
566		modCount++;
567	<	int numMoved = size - index - 1;
568	<	if (numMoved > 0)
569	<	System.arraycopy(elementData, index+1, elementData, index,
570	<	numMoved);
565	<	elementData[--size] = null; // clear to let GC do its work
567	>	final int newSize;
568	>	if ((newSize = size - 1) > i)
569	>	System.arraycopy(es, i + 1, es, i, newSize - i);
570	>	es[size = newSize] = null;
571		}
572
573		/**
#	Line 571 | Line 576 | public class ArrayList<E> extends Abstra
576		*/
577		public void clear() {
578		modCount++;
579	<
580	<	// clear to let GC do its work
581	<	for (int i = 0; i < size; i++)
577	<	elementData[i] = null;
578	<
579	<	size = 0;
579	>	final Object[] es = elementData;
580	>	for (int to = size, i = size = 0; i < to; i++)
581	>	es[i] = null;
582		}
583
584		/**
#	Line 604 | Line 606 | public class ArrayList<E> extends Abstra
606		elementData = grow(s + numNew);
607		System.arraycopy(a, 0, elementData, s, numNew);
608		size = s + numNew;
609	+	// checkInvariants();
610		return true;
611		}
612
#	Line 642 | Line 645 | public class ArrayList<E> extends Abstra
645		numMoved);
646		System.arraycopy(a, 0, elementData, index, numNew);
647		size = s + numNew;
648	+	// checkInvariants();
649		return true;
650		}
651
#	Line 664 | Line 668 | public class ArrayList<E> extends Abstra
668		outOfBoundsMsg(fromIndex, toIndex));
669		}
670		modCount++;
671	<	int numMoved = size - toIndex;
672	<	System.arraycopy(elementData, toIndex, elementData, fromIndex,
673	<	numMoved);
674	<
675	<	// clear to let GC do its work
676	<	int newSize = size - (toIndex-fromIndex);
677	<	for (int i = newSize; i < size; i++) {
678	<	elementData[i] = null;
679	<	}
676	<	size = newSize;
671	>	shiftTailOverGap(elementData, fromIndex, toIndex);
672	>	// checkInvariants();
673	>	}
674	>
675	>	/** Erases the gap from lo to hi, by sliding down following elements. */
676	>	private void shiftTailOverGap(Object[] es, int lo, int hi) {
677	>	System.arraycopy(es, hi, es, lo, size - hi);
678	>	for (int to = size, i = (size -= hi - lo); i < to; i++)
679	>	es[i] = null;
680		}
681
682		/**
#	Line 716 | Line 719 | public class ArrayList<E> extends Abstra
719		* @see Collection#contains(Object)
720		*/
721		public boolean removeAll(Collection<?> c) {
722	<	return batchRemove(c, false);
722	>	return batchRemove(c, false, 0, size);
723		}
724
725		/**
#	Line 736 | Line 739 | public class ArrayList<E> extends Abstra
739		* @see Collection#contains(Object)
740		*/
741		public boolean retainAll(Collection<?> c) {
742	<	return batchRemove(c, true);
742	>	return batchRemove(c, true, 0, size);
743		}
744
745	<	private boolean batchRemove(Collection<?> c, boolean complement) {
745	>	boolean batchRemove(Collection<?> c, boolean complement,
746	>	final int from, final int end) {
747		Objects.requireNonNull(c);
748		final Object[] es = elementData;
745	–	final int size = this.size;
746	–	final boolean modified;
749		int r;
750		// Optimize for initial run of survivors
751	<	for (r = 0; r < size; r++)
751	>	for (r = from;; r++) {
752	>	if (r == end)
753	>	return false;
754		if (c.contains(es[r]) != complement)
755		break;
752	–	if (modified = (r < size)) {
753	–	int w = r++;
754	–	try {
755	–	for (Object e; r < size; r++)
756	–	if (c.contains(e = es[r]) == complement)
757	–	es[w++] = e;
758	–	} catch (Throwable ex) {
759	–	// Preserve behavioral compatibility with AbstractCollection,
760	–	// even if c.contains() throws.
761	–	System.arraycopy(es, r, es, w, size - r);
762	–	w += size - r;
763	–	throw ex;
764	–	} finally {
765	–	modCount += size - w;
766	–	Arrays.fill(es, (this.size = w), size, null);
767	–	}
756		}
757	<	return modified;
757	>	int w = r++;
758	>	try {
759	>	for (Object e; r < end; r++)
760	>	if (c.contains(e = es[r]) == complement)
761	>	es[w++] = e;
762	>	} catch (Throwable ex) {
763	>	// Preserve behavioral compatibility with AbstractCollection,
764	>	// even if c.contains() throws.
765	>	System.arraycopy(es, r, es, w, end - r);
766	>	w += end - r;
767	>	throw ex;
768	>	} finally {
769	>	modCount += end - w;
770	>	shiftTailOverGap(es, w, end);
771	>	}
772	>	// checkInvariants();
773	>	return true;
774		}
775
776		/**
777	<	* Save the state of the {@code ArrayList} instance to a stream (that
778	<	* is, serialize it).
777	>	* Saves the state of the {@code ArrayList} instance to a stream
778	>	* (that is, serializes it).
779		*
780	+	* @param s the stream
781	+	* @throws java.io.IOException if an I/O error occurs
782		* @serialData The length of the array backing the {@code ArrayList}
783		*             instance is emitted (int), followed by all of its elements
784		*             (each an {@code Object}) in the proper order.
785		*/
786		private void writeObject(java.io.ObjectOutputStream s)
787	<	throws java.io.IOException{
787	>	throws java.io.IOException {
788		// Write out element count, and any hidden stuff
789		int expectedModCount = modCount;
790		s.defaultWriteObject();
791
792	<	// Write out size as capacity for behavioural compatibility with clone()
792	>	// Write out size as capacity for behavioral compatibility with clone()
793		s.writeInt(size);
794
795		// Write out all elements in the proper order.
#	Line 797 | Line 803 | public class ArrayList<E> extends Abstra
803		}
804
805		/**
806	<	* Reconstitute the {@code ArrayList} instance from a stream (that is,
807	<	* deserialize it).
806	>	* Reconstitutes the {@code ArrayList} instance from a stream (that is,
807	>	* deserializes it).
808	>	* @param s the stream
809	>	* @throws ClassNotFoundException if the class of a serialized object
810	>	*         could not be found
811	>	* @throws java.io.IOException if an I/O error occurs
812		*/
813		private void readObject(java.io.ObjectInputStream s)
814		throws java.io.IOException, ClassNotFoundException {
#	Line 811 | Line 821 | public class ArrayList<E> extends Abstra
821
822		if (size > 0) {
823		// like clone(), allocate array based upon size not capacity
824	+	SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size);
825		Object[] elements = new Object[size];
826
827		// Read in all elements in the proper order.
#	Line 910 | Line 921 | public class ArrayList<E> extends Abstra
921		}
922
923		@Override
924	<	@SuppressWarnings("unchecked")
925	<	public void forEachRemaining(Consumer<? super E> consumer) {
915	<	Objects.requireNonNull(consumer);
924	>	public void forEachRemaining(Consumer<? super E> action) {
925	>	Objects.requireNonNull(action);
926		final int size = ArrayList.this.size;
927		int i = cursor;
928	<	if (i >= size) {
929	<	return;
930	<	}
931	<	final Object[] elementData = ArrayList.this.elementData;
932	<	if (i >= elementData.length) {
933	<	throw new ConcurrentModificationException();
934	<	}
935	<	while (i != size && modCount == expectedModCount) {
936	<	consumer.accept((E) elementData[i++]);
928	>	if (i < size) {
929	>	final Object[] es = elementData;
930	>	if (i >= es.length)
931	>	throw new ConcurrentModificationException();
932	>	for (; i < size && modCount == expectedModCount; i++)
933	>	action.accept(elementAt(es, i));
934	>	// update once at end to reduce heap write traffic
935	>	cursor = i;
936	>	lastRet = i - 1;
937	>	checkForComodification();
938		}
928	–	// update once at end of iteration to reduce heap write traffic
929	–	cursor = i;
930	–	lastRet = i - 1;
931	–	checkForComodification();
939		}
940
941		final void checkForComodification() {
#	Line 1115 | Line 1122 | public class ArrayList<E> extends Abstra
1122		return true;
1123		}
1124
1125	+	public boolean removeAll(Collection<?> c) {
1126	+	return batchRemove(c, false);
1127	+	}
1128	+
1129	+	public boolean retainAll(Collection<?> c) {
1130	+	return batchRemove(c, true);
1131	+	}
1132	+
1133	+	private boolean batchRemove(Collection<?> c, boolean complement) {
1134	+	checkForComodification();
1135	+	int oldSize = root.size;
1136	+	boolean modified =
1137	+	root.batchRemove(c, complement, offset, offset + size);
1138	+	if (modified)
1139	+	updateSizeAndModCount(root.size - oldSize);
1140	+	return modified;
1141	+	}
1142	+
1143	+	public boolean removeIf(Predicate<? super E> filter) {
1144	+	checkForComodification();
1145	+	int oldSize = root.size;
1146	+	boolean modified = root.removeIf(filter, offset, offset + size);
1147	+	if (modified)
1148	+	updateSizeAndModCount(root.size - oldSize);
1149	+	return modified;
1150	+	}
1151	+
1152	+	public Object[] toArray() {
1153	+	checkForComodification();
1154	+	return Arrays.copyOfRange(root.elementData, offset, offset + size);
1155	+	}
1156	+
1157	+	@SuppressWarnings("unchecked")
1158	+	public <T> T[] toArray(T[] a) {
1159	+	checkForComodification();
1160	+	if (a.length < size)
1161	+	return (T[]) Arrays.copyOfRange(
1162	+	root.elementData, offset, offset + size, a.getClass());
1163	+	System.arraycopy(root.elementData, offset, a, 0, size);
1164	+	if (a.length > size)
1165	+	a[size] = null;
1166	+	return a;
1167	+	}
1168	+
1169		public Iterator<E> iterator() {
1170		return listIterator();
1171		}
#	Line 1162 | Line 1213 | public class ArrayList<E> extends Abstra
1213		return (E) elementData[offset + (lastRet = i)];
1214		}
1215
1216	<	@SuppressWarnings("unchecked")
1217	<	public void forEachRemaining(Consumer<? super E> consumer) {
1167	<	Objects.requireNonNull(consumer);
1216	>	public void forEachRemaining(Consumer<? super E> action) {
1217	>	Objects.requireNonNull(action);
1218		final int size = SubList.this.size;
1219		int i = cursor;
1220	<	if (i >= size) {
1221	<	return;
1222	<	}
1223	<	final Object[] elementData = root.elementData;
1224	<	if (offset + i >= elementData.length) {
1225	<	throw new ConcurrentModificationException();
1226	<	}
1227	<	while (i != size && modCount == expectedModCount) {
1228	<	consumer.accept((E) elementData[offset + (i++)]);
1220	>	if (i < size) {
1221	>	final Object[] es = root.elementData;
1222	>	if (offset + i >= es.length)
1223	>	throw new ConcurrentModificationException();
1224	>	for (; i < size && modCount == expectedModCount; i++)
1225	>	action.accept(elementAt(es, offset + i));
1226	>	// update once at end to reduce heap write traffic
1227	>	cursor = i;
1228	>	lastRet = i - 1;
1229	>	checkForComodification();
1230		}
1180	–	// update once at end of iteration to reduce heap write traffic
1181	–	lastRet = cursor = i;
1182	–	checkForComodification();
1231		}
1232
1233		public int nextIndex() {
#	Line 1269 | Line 1317 | public class ArrayList<E> extends Abstra
1317		public Spliterator<E> spliterator() {
1318		checkForComodification();
1319
1320	<	// ArrayListSpliterator is not used because late-binding logic
1321	<	// is different here
1274	<	return new Spliterator<>() {
1320	>	// ArrayListSpliterator not used here due to late-binding
1321	>	return new Spliterator<E>() {
1322		private int index = offset; // current index, modified on advance/split
1323		private int fence = -1; // -1 until used; then one past last index
1324		private int expectedModCount; // initialized when fence set
#	Line 1285 | Line 1332 | public class ArrayList<E> extends Abstra
1332		return hi;
1333		}
1334
1335	<	public ArrayListSpliterator<E> trySplit() {
1335	>	public ArrayList<E>.ArrayListSpliterator trySplit() {
1336		int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
1337	<	// ArrayListSpliterator could be used here as the source is already bound
1337	>	// ArrayListSpliterator can be used here as the source is already bound
1338		return (lo >= mid) ? null : // divide range in half unless too small
1339	<	new ArrayListSpliterator<>(root, lo, index = mid,
1293	<	expectedModCount);
1339	>	root.new ArrayListSpliterator(lo, index = mid, expectedModCount);
1340		}
1341
1342		public boolean tryAdvance(Consumer<? super E> action) {
#	Line 1332 | Line 1378 | public class ArrayList<E> extends Abstra
1378		}
1379
1380		public long estimateSize() {
1381	<	return (long) (getFence() - index);
1381	>	return getFence() - index;
1382		}
1383
1384		public int characteristics() {
#	Line 1342 | Line 1388 | public class ArrayList<E> extends Abstra
1388		}
1389		}
1390
1391	+	/**
1392	+	* @throws NullPointerException {@inheritDoc}
1393	+	*/
1394		@Override
1395		public void forEach(Consumer<? super E> action) {
1396		Objects.requireNonNull(action);
1397		final int expectedModCount = modCount;
1398	<	@SuppressWarnings("unchecked")
1350	<	final E[] elementData = (E[]) this.elementData;
1398	>	final Object[] es = elementData;
1399		final int size = this.size;
1400	<	for (int i=0; modCount == expectedModCount && i < size; i++) {
1401	<	action.accept(elementData[i]);
1402	<	}
1355	<	if (modCount != expectedModCount) {
1400	>	for (int i = 0; modCount == expectedModCount && i < size; i++)
1401	>	action.accept(elementAt(es, i));
1402	>	if (modCount != expectedModCount)
1403		throw new ConcurrentModificationException();
1357	–	}
1404		}
1405
1406		/**
#	Line 1372 | Line 1418 | public class ArrayList<E> extends Abstra
1418		*/
1419		@Override
1420		public Spliterator<E> spliterator() {
1421	<	return new ArrayListSpliterator<>(this, 0, -1, 0);
1421	>	return new ArrayListSpliterator(0, -1, 0);
1422		}
1423
1424		/** Index-based split-by-two, lazily initialized Spliterator */
1425	<	static final class ArrayListSpliterator<E> implements Spliterator<E> {
1425	>	final class ArrayListSpliterator implements Spliterator<E> {
1426
1427		/*
1428		* If ArrayLists were immutable, or structurally immutable (no
#	Line 1410 | Line 1456 | public class ArrayList<E> extends Abstra
1456		* these streamlinings.
1457		*/
1458
1413	–	private final ArrayList<E> list;
1459		private int index; // current index, modified on advance/split
1460		private int fence; // -1 until used; then one past last index
1461		private int expectedModCount; // initialized when fence set
1462
1463	<	/** Create new spliterator covering the given  range */
1464	<	ArrayListSpliterator(ArrayList<E> list, int origin, int fence,
1420	<	int expectedModCount) {
1421	<	this.list = list; // OK if null unless traversed
1463	>	/** Creates new spliterator covering the given range. */
1464	>	ArrayListSpliterator(int origin, int fence, int expectedModCount) {
1465		this.index = origin;
1466		this.fence = fence;
1467		this.expectedModCount = expectedModCount;
#	Line 1426 | Line 1469 | public class ArrayList<E> extends Abstra
1469
1470		private int getFence() { // initialize fence to size on first use
1471		int hi; // (a specialized variant appears in method forEach)
1429	–	ArrayList<E> lst;
1472		if ((hi = fence) < 0) {
1473	<	if ((lst = list) == null)
1474	<	hi = fence = 0;
1433	<	else {
1434	<	expectedModCount = lst.modCount;
1435	<	hi = fence = lst.size;
1436	<	}
1473	>	expectedModCount = modCount;
1474	>	hi = fence = size;
1475		}
1476		return hi;
1477		}
1478
1479	<	public ArrayListSpliterator<E> trySplit() {
1479	>	public ArrayListSpliterator trySplit() {
1480		int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
1481		return (lo >= mid) ? null : // divide range in half unless too small
1482	<	new ArrayListSpliterator<>(list, lo, index = mid,
1445	<	expectedModCount);
1482	>	new ArrayListSpliterator(lo, index = mid, expectedModCount);
1483		}
1484
1485		public boolean tryAdvance(Consumer<? super E> action) {
#	Line 1451 | Line 1488 | public class ArrayList<E> extends Abstra
1488		int hi = getFence(), i = index;
1489		if (i < hi) {
1490		index = i + 1;
1491	<	@SuppressWarnings("unchecked") E e = (E)list.elementData[i];
1491	>	@SuppressWarnings("unchecked") E e = (E)elementData[i];
1492		action.accept(e);
1493	<	if (list.modCount != expectedModCount)
1493	>	if (modCount != expectedModCount)
1494		throw new ConcurrentModificationException();
1495		return true;
1496		}
#	Line 1462 | Line 1499 | public class ArrayList<E> extends Abstra
1499
1500		public void forEachRemaining(Consumer<? super E> action) {
1501		int i, hi, mc; // hoist accesses and checks from loop
1502	<	ArrayList<E> lst; Object[] a;
1502	>	Object[] a;
1503		if (action == null)
1504		throw new NullPointerException();
1505	<	if ((lst = list) != null && (a = lst.elementData) != null) {
1505	>	if ((a = elementData) != null) {
1506		if ((hi = fence) < 0) {
1507	<	mc = lst.modCount;
1508	<	hi = lst.size;
1507	>	mc = modCount;
1508	>	hi = size;
1509		}
1510		else
1511		mc = expectedModCount;
#	Line 1477 | Line 1514 | public class ArrayList<E> extends Abstra
1514		@SuppressWarnings("unchecked") E e = (E) a[i];
1515		action.accept(e);
1516		}
1517	<	if (lst.modCount == mc)
1517	>	if (modCount == mc)
1518		return;
1519		}
1520		}
#	Line 1485 | Line 1522 | public class ArrayList<E> extends Abstra
1522		}
1523
1524		public long estimateSize() {
1525	<	return (long) (getFence() - index);
1525	>	return getFence() - index;
1526		}
1527
1528		public int characteristics() {
#	Line 1493 | Line 1530 | public class ArrayList<E> extends Abstra
1530		}
1531		}
1532
1533	<	@SuppressWarnings("unchecked")
1533	>	// A tiny bit set implementation
1534	>
1535	>	private static long[] nBits(int n) {
1536	>	return new long[((n - 1) >> 6) + 1];
1537	>	}
1538	>	private static void setBit(long[] bits, int i) {
1539	>	bits[i >> 6] |= 1L << i;
1540	>	}
1541	>	private static boolean isClear(long[] bits, int i) {
1542	>	return (bits[i >> 6] & (1L << i)) == 0;
1543	>	}
1544	>
1545	>	/**
1546	>	* @throws NullPointerException {@inheritDoc}
1547	>	*/
1548		@Override
1549		public boolean removeIf(Predicate<? super E> filter) {
1550	+	return removeIf(filter, 0, size);
1551	+	}
1552	+
1553	+	/**
1554	+	* Removes all elements satisfying the given predicate, from index
1555	+	* i (inclusive) to index end (exclusive).
1556	+	*/
1557	+	boolean removeIf(Predicate<? super E> filter, int i, final int end) {
1558		Objects.requireNonNull(filter);
1559		int expectedModCount = modCount;
1560		final Object[] es = elementData;
1502	–	final int size = this.size;
1503	–	final boolean modified;
1504	–	int r;
1561		// Optimize for initial run of survivors
1562	<	for (r = 0; r < size; r++)
1563	<	if (filter.test((E) es[r]))
1564	<	break;
1565	<	if (modified = (r < size)) {
1566	<	expectedModCount++;
1562	>	for (; i < end && !filter.test(elementAt(es, i)); i++)
1563	>	;
1564	>	// Tolerate predicates that reentrantly access the collection for
1565	>	// read (but writers still get CME), so traverse once to find
1566	>	// elements to delete, a second pass to physically expunge.
1567	>	if (i < end) {
1568	>	final int beg = i;
1569	>	final long[] deathRow = nBits(end - beg);
1570	>	deathRow[0] = 1L;   // set bit 0
1571	>	for (i = beg + 1; i < end; i++)
1572	>	if (filter.test(elementAt(es, i)))
1573	>	setBit(deathRow, i - beg);
1574	>	if (modCount != expectedModCount)
1575	>	throw new ConcurrentModificationException();
1576		modCount++;
1577	<	int w = r++;
1578	<	try {
1579	<	for (E e; r < size; r++)
1580	<	if (!filter.test(e = (E) es[r]))
1581	<	es[w++] = e;
1582	<	} catch (Throwable ex) {
1583	<	// copy remaining elements
1584	<	System.arraycopy(es, r, es, w, size - r);
1585	<	w += size - r;
1586	<	throw ex;
1587	<	} finally {
1588	<	Arrays.fill(es, (this.size = w), size, null);
1524	<	}
1577	>	int w = beg;
1578	>	for (i = beg; i < end; i++)
1579	>	if (isClear(deathRow, i - beg))
1580	>	es[w++] = es[i];
1581	>	shiftTailOverGap(es, w, end);
1582	>	// checkInvariants();
1583	>	return true;
1584	>	} else {
1585	>	if (modCount != expectedModCount)
1586	>	throw new ConcurrentModificationException();
1587	>	// checkInvariants();
1588	>	return false;
1589		}
1526	–	if (modCount != expectedModCount)
1527	–	throw new ConcurrentModificationException();
1528	–	return modified;
1590		}
1591
1592		@Override
1532	–	@SuppressWarnings("unchecked")
1593		public void replaceAll(UnaryOperator<E> operator) {
1594		Objects.requireNonNull(operator);
1595		final int expectedModCount = modCount;
1596	+	final Object[] es = elementData;
1597		final int size = this.size;
1598	<	for (int i=0; modCount == expectedModCount && i < size; i++) {
1599	<	elementData[i] = operator.apply((E) elementData[i]);
1600	<	}
1540	<	if (modCount != expectedModCount) {
1598	>	for (int i = 0; modCount == expectedModCount && i < size; i++)
1599	>	es[i] = operator.apply(elementAt(es, i));
1600	>	if (modCount != expectedModCount)
1601		throw new ConcurrentModificationException();
1542	–	}
1602		modCount++;
1603	+	// checkInvariants();
1604		}
1605
1606		@Override
#	Line 1548 | Line 1608 | public class ArrayList<E> extends Abstra
1608		public void sort(Comparator<? super E> c) {
1609		final int expectedModCount = modCount;
1610		Arrays.sort((E[]) elementData, 0, size, c);
1611	<	if (modCount != expectedModCount) {
1611	>	if (modCount != expectedModCount)
1612		throw new ConcurrentModificationException();
1553	–	}
1613		modCount++;
1614	+	// checkInvariants();
1615	+	}
1616	+
1617	+	void checkInvariants() {
1618	+	// assert size >= 0;
1619	+	// assert size == elementData.length || elementData[size] == null;
1620		}
1621		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines