fixup! Revisit newly added files.

Author: peter-hofer

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheFixupWalker.java

@@ -28,21 +28,17 @@
 import org.graalvm.nativeimage.Platforms;
 
 import com.oracle.svm.core.code.CodeInfo;
-import com.oracle.svm.core.code.CodeInfoAccess;
 import com.oracle.svm.core.code.RuntimeCodeCache.CodeInfoVisitor;
 import com.oracle.svm.core.code.RuntimeCodeInfoAccess;
-import com.oracle.svm.core.heap.ObjectReferenceVisitor;
+import com.oracle.svm.core.genscavenge.compacting.ObjectRefFixupVisitor;
 
-/**
- * Before compaction, updates the same references that were visited by
- * {@link RuntimeCodeCacheWalker} during the mark phase.
- */
+/** Before compaction, updates references from {@link CodeInfo} structures. */
 final class RuntimeCodeCacheFixupWalker implements CodeInfoVisitor {
 
-    private final ObjectReferenceVisitor visitor;
+    private final ObjectRefFixupVisitor visitor;
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    RuntimeCodeCacheFixupWalker(ObjectReferenceVisitor visitor) {
+    RuntimeCodeCacheFixupWalker(ObjectRefFixupVisitor visitor) {
         this.visitor = visitor;
     }
 
@@ -52,18 +48,10 @@ public boolean visitCode(CodeInfo codeInfo) {
             return true;
         }
 
-        int state = CodeInfoAccess.getState(codeInfo);
-        if (state == CodeInfo.STATE_UNREACHABLE || state == CodeInfo.STATE_READY_FOR_INVALIDATION) {
-            /*
-             * The code will be freed during this collection, but we need to make sure that all the
-             * objects that are accessed during the invalidation remain accessible. Those objects
-             * can only be collected in a subsequent garbage collection.
-             */
-            RuntimeCodeInfoAccess.walkObjectFields(codeInfo, visitor);
-            return true;
-        }
-
-        /* The CodeInfo remains valid, so we need to fix up all references. */
+        /*
+         * Whether this CodeInfo remains valid or will be invalidated or freed during this GC, we
+         * update all references, including clearing those to objects that do not survive.
+         */
         RuntimeCodeInfoAccess.walkStrongReferences(codeInfo, visitor);
         RuntimeCodeInfoAccess.walkWeakReferences(codeInfo, visitor);
         return true;