From d58620e28870c427d75fff975cdb4b18383cdfb1 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Wed, 7 Oct 2026 07:39:41 -0700
Subject: [PATCH] Fix incorrect `@SideEffectsOnly` indices in BitSet,
 StringLatin1, and StringUTF16

---
 src/java.base/share/classes/java/lang/StringLatin1.java | 2 +-
 src/java.base/share/classes/java/lang/StringUTF16.java  | 2 +-
 src/java.base/share/classes/java/util/BitSet.java       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/StringLatin1.java b/src/java.base/share/classes/java/lang/StringLatin1.java
index ab92a305648d..664ab1681557 100644
--- a/src/java.base/share/classes/java/lang/StringLatin1.java
+++ b/src/java.base/share/classes/java/lang/StringLatin1.java
@@ -83,7 +83,7 @@ public static byte[] inflate(byte[] value, int off, int len) {
         return ret;
     }
 
-    @SideEffectsOnly("#3")
+    @SideEffectsOnly("#4")
     public static void getChars(byte[] value, int srcBegin, int srcEnd, char[] dst, int dstBegin) {
         inflate(value, srcBegin, dst, dstBegin, srcEnd - srcBegin);
     }
diff --git a/src/java.base/share/classes/java/lang/StringUTF16.java b/src/java.base/share/classes/java/lang/StringUTF16.java
index 6994da75bab8..100eac515ee4 100644
--- a/src/java.base/share/classes/java/lang/StringUTF16.java
+++ b/src/java.base/share/classes/java/lang/StringUTF16.java
@@ -251,7 +251,7 @@ static byte[] toBytesSupplementary(int cp) {
     }
 
     @IntrinsicCandidate
-    @SideEffectsOnly("#3")
+    @SideEffectsOnly("#4")
     public static void getChars(byte[] value, int srcBegin, int srcEnd, char[] dst, int dstBegin) {
         // We need a range check here because 'getChar' has no checks
         if (srcBegin < srcEnd) {
diff --git a/src/java.base/share/classes/java/util/BitSet.java b/src/java.base/share/classes/java/util/BitSet.java
index 3d495a63433a..7107e6b8f6b8 100644
--- a/src/java.base/share/classes/java/util/BitSet.java
+++ b/src/java.base/share/classes/java/util/BitSet.java
@@ -549,7 +549,7 @@ public void set(@GuardSatisfied BitSet this, @NonNegative int fromIndex, @NonNeg
      * @throws IndexOutOfBoundsException if the specified index is negative
      * @since  1.0
      */
-    @SideEffectsOnly("#1")
+    @SideEffectsOnly("this")
     public void clear(@GuardSatisfied BitSet this, @NonNegative int bitIndex) {
         if (bitIndex < 0)
             throw new IndexOutOfBoundsException("bitIndex < 0: " + bitIndex);
@@ -575,7 +575,7 @@ public void clear(@GuardSatisfied BitSet this, @NonNegative int bitIndex) {
      *         larger than {@code toIndex}
      * @since  1.4
      */
-    @SideEffectsOnly("#1")
+    @SideEffectsOnly("this")
     public void clear(@GuardSatisfied BitSet this, @NonNegative int fromIndex, @NonNegative int toIndex) {
         checkRange(fromIndex, toIndex);
 
@@ -619,7 +619,7 @@ public void clear(@GuardSatisfied BitSet this, @NonNegative int fromIndex, @NonN
      *
      * @since 1.4
      */
-    @SideEffectsOnly("#1")
+    @SideEffectsOnly("this")
     public void clear(@GuardSatisfied BitSet this) {
         while (wordsInUse > 0)
             words[--wordsInUse] = 0;