[GR-32209] Backport to GraalVM 20.3: G1 bugfixes for nmethod unloading.

PullRequest: graal/9428
oracle · Jul 29, 2021 · 4d0ee64 · 4d0ee64
2 parents 3dd5ab1 + 4b9c63d
commit 4d0ee64
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoOffsets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoOffsets.java
@@ -82,4 +82,8 @@ public static long codeConstantsReferenceMapEncoding() {
     public static long codeConstantsReferenceMapIndex() {
         return OffsetOf.get(CodeInfoImpl.class, "CodeConstantsReferenceMapIndex");
     }
+
+    public static long areAllObjectsInImageHeap() {
+        return OffsetOf.get(CodeInfoImpl.class, "AllObjectsAreInImageHeap");
+    }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoMemory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoMemory.java
@@ -206,7 +206,8 @@ public boolean walkRuntimeMethodsDuringGC(CodeInfoVisitor visitor) {
                 }
 
                 // If the visitor removed the current entry from the table, then it is necessary to
-                // visit the now updated entry one more time.
+                // visit the now updated entry one more time. However, this could have the effect
+                // that some entries are visited more than once.
                 if (info == NonmovableArrays.getWord(table, i)) {
                     i++;
                 }