[GR-67673] Report more information if the heap verification finds a broken reference on the stack.

PullRequest: graal/21493

Author: christianhaeubl

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

@@ -33,6 +33,7 @@
 
 import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.genscavenge.AlignedHeapChunk.AlignedHeader;
+import com.oracle.svm.core.genscavenge.StackVerifier.VerifyFrameReferencesVisitor;
 import com.oracle.svm.core.genscavenge.UnalignedHeapChunk.UnalignedHeader;
 import com.oracle.svm.core.genscavenge.remset.RememberedSet;
 import com.oracle.svm.core.heap.Heap;
@@ -384,10 +385,11 @@ private static boolean verifyReference(Object parentObject, Pointer reference, P
     }
 
     private static void printParent(Object parentObject) {
-        if (parentObject != null) {
-            Log.log().string("The object that contains the invalid reference is of type ").string(parentObject.getClass().getName()).newline();
+        if (parentObject instanceof VerifyFrameReferencesVisitor visitor) {
+            Log.log().string("The invalid reference is on the stack: sp=").zhex(visitor.getSP()).string(", ip=").zhex(visitor.getIP()).newline();
         } else {
-            Log.log().string("The invalid reference is on the stack").newline();
+            assert parentObject != null;
+            Log.log().string("The object that contains the invalid reference is of type ").string(parentObject.getClass().getName()).newline();
         }
     }
 

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

@@ -89,7 +89,7 @@ public void initialize() {
         @Override
         @RestrictHeapAccess(access = RestrictHeapAccess.Access.NO_ALLOCATION, reason = "Must not allocate while verifying the stack.")
         public boolean visitRegularFrame(Pointer currentSP, CodePointer currentIP, CodeInfo codeInfo) {
-            verifyFrameReferencesVisitor.initialize();
+            verifyFrameReferencesVisitor.initialize(currentSP, currentIP);
             CodeInfoTable.visitObjectReferences(currentSP, currentIP, codeInfo, verifyFrameReferencesVisitor);
             result &= verifyFrameReferencesVisitor.result;
             return true;
@@ -103,29 +103,44 @@ protected boolean visitDeoptimizedFrame(Pointer originalSP, CodePointer deoptStu
         }
     }
 
-    private static class VerifyFrameReferencesVisitor implements ObjectReferenceVisitor {
+    public static class VerifyFrameReferencesVisitor implements ObjectReferenceVisitor {
+        private Pointer sp;
+        private CodePointer ip;
         private boolean result;
 
         @Platforms(Platform.HOSTED_ONLY.class)
         VerifyFrameReferencesVisitor() {
         }
 
-        public void initialize() {
+        @SuppressWarnings("hiding")
+        public void initialize(Pointer sp, CodePointer ip) {
+            this.sp = sp;
+            this.ip = ip;
             this.result = true;
         }
 
+        public Pointer getSP() {
+            return sp;
+        }
+
+        public CodePointer getIP() {
+            return ip;
+        }
+
         @Override
         public void visitObjectReferences(Pointer firstObjRef, boolean compressed, int referenceSize, Object holderObject, int count) {
+            assert holderObject == null;
+
             Pointer pos = firstObjRef;
             Pointer end = firstObjRef.add(Word.unsigned(count).multiply(referenceSize));
             while (pos.belowThan(end)) {
-                visitObjectReference(pos, compressed, holderObject);
+                visitObjectReference(pos, compressed);
                 pos = pos.add(referenceSize);
             }
         }
 
-        private void visitObjectReference(Pointer objRef, boolean compressed, Object holderObject) {
-            result &= HeapVerifier.verifyReference(holderObject, objRef, compressed);
+        private void visitObjectReference(Pointer objRef, boolean compressed) {
+            result &= HeapVerifier.verifyReference(this, objRef, compressed);
         }
     }
 }