Skip to content

Fix AbstractMap assumptions about the atomicity of field assignments in thread #2761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −2
Open

Fix AbstractMap assumptions about the atomicity of field assignments in thread #2761

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions jre_emul/android/platform/libcore/ojluni/src/main/java/java/util/AbstractMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,14 @@ public void clear() {
* }
*}</pre>
*/
transient Set<K> keySet;
transient Collection<V> values;

/**
* J2ObjC: Despite the discussion above, no field race is safe in J2ObjC because
* field access is not atomic in J2ObjC, so mark these volatile so the abstract
* implementation is always safe.
*/
transient volatile Set<K> keySet;
transient volatile Collection<V> values;

/**
* {@inheritDoc}
Expand Down