diff options
| author | 2019-12-03 12:20:01 +0000 | |
|---|---|---|
| committer | 2019-12-11 18:46:44 +0000 | |
| commit | 270db1ce48377e3d9ca0c3dcec834ac807ca885b (patch) | |
| tree | ffc553c6ff1ad37bdc3caca01ad686fa41ca0688 /test/2000-virtual-list-structural/AbstractCollection.patch | |
| parent | 42b9c19772542457701d5efea26aae4449dec8c7 (diff) | |
Revert^4 "Allow structural redefinition on non-final classes."
This reverts commit 664999a12d6fc8a8ef5c0519b12ec1e8a51bb085.
Fixed issues with GC and quickened instructions in parent CLs.
Reason for revert: Fixed issues with GC CHECK fail and device SEGVs.
Test: ./test.py --host
Test: ./test.py --target
Bug: 134162467
Bug: 144168550
Change-Id: Ibacddaf45beb72184f97d53d5d048bd442578658
Diffstat (limited to 'test/2000-virtual-list-structural/AbstractCollection.patch')
| -rw-r--r-- | test/2000-virtual-list-structural/AbstractCollection.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/test/2000-virtual-list-structural/AbstractCollection.patch b/test/2000-virtual-list-structural/AbstractCollection.patch new file mode 100644 index 0000000000..7507c7d862 --- /dev/null +++ b/test/2000-virtual-list-structural/AbstractCollection.patch @@ -0,0 +1,16 @@ +--- ../../../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 |