summaryrefslogtreecommitdiff
path: root/test/2000-virtual-list-structural/AbstractCollection.patch
diff options
context:
space:
mode:
author Roland Levillain <rpl@google.com> 2019-11-26 14:13:44 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> 2019-11-26 15:55:26 +0000
commit88b1c83080afcb2bfb6f781ded1c90fe8f9eab4d (patch)
treee3ee63ccca83c60c5790e51610349889f44daacf /test/2000-virtual-list-structural/AbstractCollection.patch
parent8e895008a3e2f2813bb46cb0c6bc76884e46e9ac (diff)
Revert "Allow structural redefinition on non-final classes."
This reverts commit c47040d31cbcd8cddd5fadb552b4f0f6c94b5bd0. Reason for revert: Breaks ART tests (see e.g. b/145197371). Bug: 145197371 Bug: 134162467 Bug: 144168550 Change-Id: Ia8e5788655057e380fc723a38900d26d69cda938
Diffstat (limited to 'test/2000-virtual-list-structural/AbstractCollection.patch')
-rw-r--r--test/2000-virtual-list-structural/AbstractCollection.patch16
1 files changed, 0 insertions, 16 deletions
diff --git a/test/2000-virtual-list-structural/AbstractCollection.patch b/test/2000-virtual-list-structural/AbstractCollection.patch
deleted file mode 100644
index 7507c7d862..0000000000
--- a/test/2000-virtual-list-structural/AbstractCollection.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../../../libcore/ojluni/src/main/java/java/util/AbstractCollection.java 2019-05-31 10:36:26.634361294 -0700
-+++ src-ex/java/util/AbstractCollection.java 2019-11-18 13:04:48.253575013 -0800
-@@ -63,7 +63,13 @@
- * Sole constructor. (For invocation by subclass constructors, typically
- * implicit.)
- */
-+ public static volatile int TOTAL_COUNT;
-+ public int cnt;
-+
- protected AbstractCollection() {
-+ synchronized (Collection.class) {
-+ cnt = ++TOTAL_COUNT;
-+ }
- }
-
- // Query Operations