Add @DoesNotUnrefineReceiver("modifiability") annotations

.azure/azure-pipelines.yml

@@ -75,7 +75,6 @@ jobs:
           git config --global core.protectNTFS false
           cd ../jdk21u
           git diff --exit-code
-          echo $?
         displayName: clone-related-jdk21u
       - bash: |
           git config --global --add safe.directory $(cd ../jdk21u && pwd)

.azure/azure-pipelines.yml.m4

@@ -78,7 +78,6 @@ jobs:
           git config --global core.protectNTFS false
           cd ../jdk21u
           git diff --exit-code
-          echo $?
         displayName: clone-related-jdk21u
       - bash: |
           git config --global --add safe.directory $(cd ../jdk21u && pwd)

.github/workflows/ci.yml

@@ -51,6 +51,7 @@ jobs:
         run: make jdk
 
   build_jdk21u:
+    if: endsWith(github.repository, '/jdk')
     needs:
       - check_generated_ci
     runs-on: ubuntu-latest
@@ -90,10 +91,13 @@ jobs:
           git config --global pull.rebase false
           git config --global core.longpaths true
           git config --global core.protectNTFS false
+          git config --global --add safe.directory /__w/jdk/jdk
         # This creates ../jdk21u .
         # Run `git-clone-related` without a limit on depth, because if the depth is
         # too small, the merge will fail.  Don't use "--filter=blob:none" because that
         # leads to "fatal: remote error:  filter 'combine' not supported".
+      - name: ci-info
+        run: /tmp/$USER/plume-scripts/ci-info --debug
       - name: clone-related-jdk21u
         run: |
           set -ex
@@ -107,15 +111,21 @@ jobs:
           /tmp/$USER/git-scripts/git-clone-related typetools jdk21u ../jdk21u --single-branch
           cd ../jdk21u
           git diff --exit-code
-          echo $?
       - name: git merge
         run: |
           set -ex
           cd ../jdk21u
           git status
           eval $(/tmp/$USER/plume-scripts/ci-info typetools)
           echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
-          cd ../jdk21u && git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}" || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
+          if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}"; then
+            git --version
+            git show | head -100
+            git status && git diff | head -1000
+            echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md"
+            false
+          fi
+        shell: bash --noprofile --norc -e {0}
       - name: configure
         run: |
           cd ../jdk21u

.github/workflows/ci.yml.m4

@@ -55,6 +55,7 @@ jobs:
         run: make jdk
 
   build_jdk21u:
+    if: endsWith(github.repository, '/jdk')
     needs:
       - check_generated_ci
     runs-on: ubuntu-latest
@@ -94,10 +95,13 @@ jobs:
           git config --global pull.rebase false
           git config --global core.longpaths true
           git config --global core.protectNTFS false
+          git config --global --add safe.directory /__w/jdk/jdk
         # This creates ../jdk21u .
         # Run `git-clone-related` without a limit on depth, because if the depth is
         # too small, the merge will fail.  Don't use "--filter=blob:none" because that
         # leads to "fatal: remote error:  filter 'combine' not supported".
+      - name: ci-info
+        run: /tmp/$USER/plume-scripts/ci-info --debug
       - name: clone-related-jdk21u
         run: |
           set -ex
@@ -111,15 +115,21 @@ jobs:
           /tmp/$USER/git-scripts/git-clone-related typetools jdk21u ../jdk21u --single-branch
           cd ../jdk21u
           git diff --exit-code
-          echo $?
       - name: git merge
         run: |
           set -ex
           cd ../jdk21u
           git status
           eval $(/tmp/$USER/plume-scripts/ci-info typetools)
           echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
-          cd ../jdk21u && git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}" || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
+          if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}"; then
+            git --version
+            git show | head -100
+            git status && git diff | head -1000
+            echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md"
+            false
+          fi
+        shell: bash --noprofile --norc -e {0}
       - name: configure
         run: |
           cd ../jdk21u

.github/workflows/defs.m4

@@ -1,9 +1,11 @@
 changequote
+define(`LBRACKET',`[')dnl
+define(`RBRACKET',`]')dnl
 changequote(`[',`]')dnl
-
+ifelse([The built-in "dnl" m4 macro means "discard to next line",])dnl
 define([canary_os], [ubuntu])dnl
 define([canary_version], [25])dnl
-define([latest_version], [25])dnl
+define([latest_version], [26])dnl
 define([canary_test], [canary_os[]canary_version])dnl
 define([docker_testing], [])dnl
 ifelse([uncomment the next line to use the "testing" Docker images])dnl

.gitignore

@@ -23,4 +23,4 @@ NashornProfile.txt
 /.cproject
 /compile_commands.json
 /.cache
-.plume-scripts/
+.plume-scripts

src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp

@@ -298,7 +298,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm,
   } else {
     assert(is_phantom, "only remaining strength");
     assert(!is_narrow, "phantom access cannot be narrow");
-    target = CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_weak);
+    target = CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_phantom);
   }
   __ call(target);
   __ mv(t0, x10);

src/java.base/share/classes/java/io/BufferedReader.java

@@ -38,8 +38,9 @@
 import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.dataflow.qual.Pure;
-import org.checkerframework.dataflow.qual.SideEffectsOnly;
+// import org.checkerframework.dataflow.qual.SideEffectsOnly;
 import org.checkerframework.framework.qual.AnnotatedFor;
+import org.checkerframework.framework.qual.DoesNotUnrefineReceiver;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
@@ -510,8 +511,8 @@ private long implSkip(long n) throws IOException {
      *
      * @throws     IOException  If an I/O error occurs
      */
-    @EnsuresNonNullIf(expression={"readLine()"}, result=true)
     @Pure
+    @EnsuresNonNullIf(expression={"readLine()"}, result=true)
     public boolean ready(@GuardSatisfied BufferedReader this) throws IOException {
         Object lock = this.lock;
         if (lock instanceof InternalLock locker) {
@@ -708,7 +709,8 @@ public boolean hasNext() {
             }
 
             @Override
-            @SideEffectsOnly("this")
+            // @SideEffectsOnly("this")
+            @DoesNotUnrefineReceiver("modifiability")
             public String next(/*@NonEmpty Iterator<String> this*/) {
                 if (nextLine != null || hasNext()) {
                     String line = nextLine;

src/java.base/share/classes/java/lang/AbstractStringBuilder.java

@@ -35,7 +35,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.dataflow.qual.Pure;
 import org.checkerframework.dataflow.qual.SideEffectFree;
-import org.checkerframework.dataflow.qual.SideEffectsOnly;
+// import org.checkerframework.dataflow.qual.SideEffectsOnly;
 import org.checkerframework.framework.qual.AnnotatedFor;
 
 import jdk.internal.math.DoubleToDecimal;
@@ -527,7 +527,7 @@ public int codePointBefore(@Positive int index) {
      *             {@code dst.length}
      *             </ul>
      */
-    @SideEffectsOnly("#3")
+    // @SideEffectsOnly("#3")
     public void getChars(@NonNegative int srcBegin, @NonNegative int srcEnd, char[] dst, @IndexOrHigh({"#3"}) int dstBegin)
     {
         Preconditions.checkFromToIndex(srcBegin, srcEnd, count, Preconditions.SIOOBE_FORMATTER);  // compatible to old version

src/java.base/share/classes/java/lang/CharSequence.java

@@ -34,8 +34,9 @@
 import org.checkerframework.checker.nonempty.qual.NonEmpty;
 import org.checkerframework.dataflow.qual.Pure;
 import org.checkerframework.dataflow.qual.SideEffectFree;
-import org.checkerframework.dataflow.qual.SideEffectsOnly;
+// import org.checkerframework.dataflow.qual.SideEffectsOnly;
 import org.checkerframework.framework.qual.AnnotatedFor;
+import org.checkerframework.framework.qual.DoesNotUnrefineReceiver;
 
 import java.util.NoSuchElementException;
 import java.util.Objects;
@@ -174,7 +175,8 @@ public boolean hasNext() {
                 return cur < length();
             }
 
-            @SideEffectsOnly("this")
+            // @SideEffectsOnly("this")
+            @DoesNotUnrefineReceiver("modifiability")
             public int nextInt(@NonEmpty CharIterator this) {
                 if (hasNext()) {
                     return charAt(cur++);
@@ -251,7 +253,8 @@ public boolean hasNext() {
                 return cur < length();
             }
 
-            @SideEffectsOnly("this")
+            // @SideEffectsOnly("this")
+            @DoesNotUnrefineReceiver("modifiability")
             public int nextInt(@NonEmpty CodePointIterator this) {
                 final int length = length();
 

src/java.base/share/classes/java/lang/Class.java

@@ -853,8 +853,8 @@ public Void run() {
      *          {@code false} otherwise.
      * @since   1.1
      */
-    @EnsuresNonNullIf(expression={"getComponentType()"}, result=true)
     @Pure
+    @EnsuresNonNullIf(expression={"getComponentType()"}, result=true)
     @IntrinsicCandidate
     public native boolean isArray(@GuardSatisfied Class<T> this);
 

src/java.base/share/classes/java/lang/StackStreamFactory.java

@@ -26,7 +26,7 @@
 
 import org.checkerframework.checker.nonempty.qual.EnsuresNonEmptyIf;
 import org.checkerframework.dataflow.qual.Pure;
-import org.checkerframework.dataflow.qual.SideEffectsOnly;
+// import org.checkerframework.dataflow.qual.SideEffectsOnly;
 import jdk.internal.reflect.MethodAccessor;
 import jdk.internal.reflect.ConstructorAccessor;
 import java.lang.StackWalker.Option;
@@ -375,7 +375,7 @@ private void setContinuation(Continuation cont) {
          *
          * @see #tryNextFrame
          */
-        @SideEffectsOnly("this")
+        // @SideEffectsOnly("this")
         final Class<?> nextFrame() {
             if (!hasNext()) {
                 return null;

src/java.base/share/classes/java/lang/String.java

@@ -56,7 +56,7 @@
 import org.checkerframework.common.value.qual.StringVal;
 import org.checkerframework.dataflow.qual.Pure;
 import org.checkerframework.dataflow.qual.SideEffectFree;
-import org.checkerframework.dataflow.qual.SideEffectsOnly;
+// import org.checkerframework.dataflow.qual.SideEffectsOnly;
 import org.checkerframework.framework.qual.AnnotatedFor;
 import org.checkerframework.framework.qual.CFComment;
 
@@ -1777,7 +1777,7 @@ public int codePointBefore(@LTEqLengthOf({"this"}) @Positive int index) {
      *            <li>{@code dstBegin+(srcEnd-srcBegin)} is larger than
      *                {@code dst.length}</ul>
      */
-    @SideEffectsOnly("#3")
+    // @SideEffectsOnly("#3")
     public void getChars(@IndexOrHigh({"this"}) int srcBegin, @IndexOrHigh({"this"}) int srcEnd, char @GuardSatisfied [] dst, @IndexOrHigh({"#3"}) int dstBegin) {
         checkBoundsBeginEnd(srcBegin, srcEnd, length());
         checkBoundsOffCount(dstBegin, srcEnd - srcBegin, dst.length);
@@ -1934,8 +1934,8 @@ public void getBytes(@IndexOrHigh({"this"}) int srcBegin, @IndexOrHigh({"this"})
      * @see  #compareTo(String)
      * @see  #equalsIgnoreCase(String)
      */
-    @EnsuresNonNullIf(expression={"#1"}, result=true)
     @Pure
+    @EnsuresNonNullIf(expression={"#1"}, result=true)
     @StaticallyExecutable
     public boolean equals(@GuardSatisfied @Nullable Object anObject) {
         if (this == anObject) {
@@ -2073,8 +2073,8 @@ public boolean contentEquals(@GuardSatisfied CharSequence cs) {
      * @see  #equals(Object)
      * @see  #codePoints()
      */
-    @EnsuresNonNullIf(expression={"#1"}, result=true)
     @Pure
+    @EnsuresNonNullIf(expression={"#1"}, result=true)
     @StaticallyExecutable
     public boolean equalsIgnoreCase(@Nullable String anotherString) {
         return (this == anotherString) ? true

src/java.base/share/classes/java/lang/StringBuffer.java

@@ -35,7 +35,7 @@
 import org.checkerframework.common.aliasing.qual.Unique;
 import org.checkerframework.dataflow.qual.Pure;
 import org.checkerframework.dataflow.qual.SideEffectFree;
-import org.checkerframework.dataflow.qual.SideEffectsOnly;
+// import org.checkerframework.dataflow.qual.SideEffectsOnly;
 import org.checkerframework.framework.qual.AnnotatedFor;
 
 import java.io.IOException;
@@ -304,7 +304,7 @@ public synchronized int offsetByCodePoints(int index, int codePointOffset) {
     /**
      * @throws IndexOutOfBoundsException {@inheritDoc}
      */
-    @SideEffectsOnly("#3")
+    // @SideEffectsOnly("#3")
     @Override
     public synchronized void getChars(int srcBegin, int srcEnd, char[] dst,
                                       @IndexOrHigh({"#3"}) int dstBegin)