svm: ImageHeapScanner#rescanField should except an AnalysisField

Author: zapster

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapScanner.java

@@ -703,6 +703,10 @@ public void rescanRoot(Field reflectionField, ScanReason rescanReason) {
         });
     }
 
+    public void rescanField(Object receiver, Field reflectionField, ScanReason reason) {
+        rescanField(receiver, metaAccess.lookupJavaField(reflectionField), reason);
+    }
+
     /**
      * Trigger rescanning of an instance field. If the receiver value or field value were not
      * scanned before they will first be scanned and added to the shadow heap, then the value will
@@ -711,11 +715,10 @@ public void rescanRoot(Field reflectionField, ScanReason rescanReason) {
      * type ({@code Object[]}, {{@link Collection}, {@link Map} or {@link EconomicMap}} then its
      * elements will be rescanned too.
      */
-    public void rescanField(Object receiver, Field reflectionField, ScanReason reason) {
+    public void rescanField(Object receiver, AnalysisField field, ScanReason reason) {
         maybeRunInExecutor(unused -> {
-            AnalysisType type = metaAccess.lookupJavaType(reflectionField.getDeclaringClass());
+            AnalysisType type = field.getType();
             if (type.isReachable()) {
-                AnalysisField field = metaAccess.lookupJavaField(reflectionField);
                 assert !field.isStatic() : field;
                 if (!field.isReachable()) {
                     return;