From 142c5855d5229c210d36caa913d791b1dbb184c1 Mon Sep 17 00:00:00 2001
From: liach <liach@openjdk.org>
Date: Thu, 10 Jul 2025 18:38:17 -0500
Subject: [PATCH 1/5] 8315131: Clarify VarHandle set/get access on 32-bit
 platforms

---
 .../share/classes/java/lang/invoke/MethodHandles.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index 3d7ba22e54e09..8ed5ded0b1f5e 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -4305,9 +4305,10 @@ public static VarHandle byteArrayViewVarHandle(Class<?> viewArrayClass,
      * If access is aligned then following access modes are supported and are
      * guaranteed to support atomic access:
      * <ul>
-     * <li>read write access modes for all {@code T}, with the exception of
-     *     access modes {@code get} and {@code set} for {@code long} and
-     *     {@code double} on 32-bit platforms.
+     * <li>read write access modes for all {@code T}. On 32-bit platforms,
+     *     access modes {@code get} and {@code set} for {@code long}, {@code
+     *     double} are supported but might lead to word tearing, as described in
+     *     Section {@jls 17.7} of <cite>The Java Language Specification</cite>.
      * <li>atomic update access modes for {@code int}, {@code long},
      *     {@code float} or {@code double}.
      *     (Future major platform releases of the JDK may support additional

From 1550fcc0aaef19070852f99bd3b6475a2ba0317f Mon Sep 17 00:00:00 2001
From: liach <liach@openjdk.org>
Date: Fri, 11 Jul 2025 09:23:28 -0500
Subject: [PATCH 2/5] Correct term is atomic, not word tearing

---
 .../share/classes/java/lang/foreign/MemoryLayout.java         | 2 +-
 .../share/classes/java/lang/invoke/MethodHandles.java         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
index cb51bbaf795b0..cf69bffb1b438 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
@@ -278,7 +278,7 @@
  * <ul>
  * <li>read write access modes for all {@code T}. On 32-bit platforms, access modes
  *     {@code get} and {@code set} for {@code long}, {@code double} and {@code MemorySegment}
- *     are supported but might lead to word tearing, as described in Section {@jls 17.7}.
+ *     are supported but not atomic, as described in Section {@jls 17.7}
  *     of <cite>The Java Language Specification</cite>.
  * <li>atomic update access modes for {@code int}, {@code long},
  *     {@code float}, {@code double} and {@link MemorySegment}.
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index 8ed5ded0b1f5e..3b1ac28e35541 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -4307,8 +4307,8 @@ public static VarHandle byteArrayViewVarHandle(Class<?> viewArrayClass,
      * <ul>
      * <li>read write access modes for all {@code T}. On 32-bit platforms,
      *     access modes {@code get} and {@code set} for {@code long}, {@code
-     *     double} are supported but might lead to word tearing, as described in
-     *     Section {@jls 17.7} of <cite>The Java Language Specification</cite>.
+     *     double} are supported but not atomic, as described in Section
+     *     {@jls 17.7} of <cite>The Java Language Specification</cite>.
      * <li>atomic update access modes for {@code int}, {@code long},
      *     {@code float} or {@code double}.
      *     (Future major platform releases of the JDK may support additional

From 7563e6b706f3868d35bbecafbb2967e8f78570f3 Mon Sep 17 00:00:00 2001
From: Chen Liang <chen.l.liang@oracle.com>
Date: Fri, 11 Jul 2025 13:54:05 -0500
Subject: [PATCH 3/5] "may be non-atomic"

---
 src/java.base/share/classes/java/lang/foreign/MemoryLayout.java | 2 +-
 src/java.base/share/classes/java/lang/invoke/MethodHandles.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
index cf69bffb1b438..4f0ef317acb17 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
@@ -278,7 +278,7 @@
  * <ul>
  * <li>read write access modes for all {@code T}. On 32-bit platforms, access modes
  *     {@code get} and {@code set} for {@code long}, {@code double} and {@code MemorySegment}
- *     are supported but not atomic, as described in Section {@jls 17.7}
+ *     are supported but may be non-atomic, as described in Section {@jls 17.7}
  *     of <cite>The Java Language Specification</cite>.
  * <li>atomic update access modes for {@code int}, {@code long},
  *     {@code float}, {@code double} and {@link MemorySegment}.
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index 3b1ac28e35541..8bd7f1dbc0bba 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -4307,7 +4307,7 @@ public static VarHandle byteArrayViewVarHandle(Class<?> viewArrayClass,
      * <ul>
      * <li>read write access modes for all {@code T}. On 32-bit platforms,
      *     access modes {@code get} and {@code set} for {@code long}, {@code
-     *     double} are supported but not atomic, as described in Section
+     *     double} are supported but may be non-atomic, as described in Section
      *     {@jls 17.7} of <cite>The Java Language Specification</cite>.
      * <li>atomic update access modes for {@code int}, {@code long},
      *     {@code float} or {@code double}.

From 3235899aae70aaab0c1db4236aeb83bfccc7fd02 Mon Sep 17 00:00:00 2001
From: Chen Liang <chen.l.liang@oracle.com>
Date: Thu, 17 Jul 2025 12:50:58 -0500
Subject: [PATCH 4/5] avoid "non-atomic"

---
 .../share/classes/java/lang/foreign/MemoryLayout.java    | 9 +++++----
 .../share/classes/java/lang/invoke/MethodHandles.java    | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
index 4f0ef317acb17..f707f5147f062 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
@@ -276,10 +276,11 @@
  * if {@code A >= S}. An aligned var handle is guaranteed to support the following
  * access modes:
  * <ul>
- * <li>read write access modes for all {@code T}. On 32-bit platforms, access modes
- *     {@code get} and {@code set} for {@code long}, {@code double} and {@code MemorySegment}
- *     are supported but may be non-atomic, as described in Section {@jls 17.7}
- *     of <cite>The Java Language Specification</cite>.
+ * <li>read write access modes for all {@code T}.  Access modes {@code get} and
+ *     {@code set} for {@code long}, {@code double} and {@code MemorySegment}
+ *     are supported but have no atomicity guarantee; in particular, the
+ *     situation described in Section {@jls 17.7} of <cite>The Java Language
+ *     Specification</cite> may happen.
  * <li>atomic update access modes for {@code int}, {@code long},
  *     {@code float}, {@code double} and {@link MemorySegment}.
  *     (Future major platform releases of the JDK may support additional
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index 8bd7f1dbc0bba..c217fcf8fd519 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -4305,10 +4305,11 @@ public static VarHandle byteArrayViewVarHandle(Class<?> viewArrayClass,
      * If access is aligned then following access modes are supported and are
      * guaranteed to support atomic access:
      * <ul>
-     * <li>read write access modes for all {@code T}. On 32-bit platforms,
-     *     access modes {@code get} and {@code set} for {@code long}, {@code
-     *     double} are supported but may be non-atomic, as described in Section
-     *     {@jls 17.7} of <cite>The Java Language Specification</cite>.
+     * <li>read write access modes for all {@code T}.  Access modes {@code get}
+     *     and {@code set} for {@code long} and {@code double} are supported but
+     *     have no atomicity guarantee; in particular, the situation described
+     *     in Section {@jls 17.7} of <cite>The Java Language
+     *     Specification</cite> may happen.
      * <li>atomic update access modes for {@code int}, {@code long},
      *     {@code float} or {@code double}.
      *     (Future major platform releases of the JDK may support additional

From 8e702d2723395e2c9fc0136c484a02284e2b23d1 Mon Sep 17 00:00:00 2001
From: Chen Liang <chen.l.liang@oracle.com>
Date: Thu, 17 Jul 2025 13:24:56 -0500
Subject: [PATCH 5/5] Simplify wording

---
 .../share/classes/java/lang/foreign/MemoryLayout.java        | 5 ++---
 .../share/classes/java/lang/invoke/MethodHandles.java        | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
index f707f5147f062..f55deba6e7fac 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
@@ -278,9 +278,8 @@
  * <ul>
  * <li>read write access modes for all {@code T}.  Access modes {@code get} and
  *     {@code set} for {@code long}, {@code double} and {@code MemorySegment}
- *     are supported but have no atomicity guarantee; in particular, the
- *     situation described in Section {@jls 17.7} of <cite>The Java Language
- *     Specification</cite> may happen.
+ *     are supported but have no atomicity guarantee, as described in Section
+ *     {@jls 17.7} of <cite>The Java Language Specification</cite>.
  * <li>atomic update access modes for {@code int}, {@code long},
  *     {@code float}, {@code double} and {@link MemorySegment}.
  *     (Future major platform releases of the JDK may support additional
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index c217fcf8fd519..b0f7a53ea713a 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -4307,9 +4307,8 @@ public static VarHandle byteArrayViewVarHandle(Class<?> viewArrayClass,
      * <ul>
      * <li>read write access modes for all {@code T}.  Access modes {@code get}
      *     and {@code set} for {@code long} and {@code double} are supported but
-     *     have no atomicity guarantee; in particular, the situation described
-     *     in Section {@jls 17.7} of <cite>The Java Language
-     *     Specification</cite> may happen.
+     *     have no atomicity guarantee, as described in Section {@jls 17.7} of
+     *     <cite>The Java Language Specification</cite>.
      * <li>atomic update access modes for {@code int}, {@code long},
      *     {@code float} or {@code double}.
      *     (Future major platform releases of the JDK may support additional