find all known targets of pointer types

Author: adinn

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java

@@ -344,6 +344,8 @@ private int writeStructField(DebugContext context, FieldEntry fieldEntry, byte[]
                 pos = writeEmbeddedArrayDataType(context, foreignValueType, valueSize, fieldSize / valueSize, buffer, pos);
             } else {
                 if (foreignValueType.isPointer()) {
+                    TypeEntry pointerTo = foreignValueType.getPointerTo();
+                    assert pointerTo != null : "ADDRESS field pointer type must have a known target type";
                     // type the array using the referent of the pointer type
                     //
                     // n.b it is critical for correctness to use the index of the referent rather
@@ -355,7 +357,7 @@ private int writeStructField(DebugContext context, FieldEntry fieldEntry, byte[]
                     // of the referring type and the latter precedes the definition of the
                     // referent type then the layout index of the referring type may still be unset
                     // at this point.
-                    valueTypeIdx = getTypeIndex(foreignValueType.getPointerTo());
+                    valueTypeIdx = getTypeIndex(pointerTo);
                 } else {
                     valueTypeIdx = getIndirectLayoutIndex(foreignValueType);
                 }
@@ -1354,6 +1356,8 @@ private int writeEmbeddedArrayDataType(DebugContext context, ForeignTypeEntry fo
         String elementTypeName = foreignValueType.getTypeName();
         int elementTypeIdx;
         if (foreignValueType.isPointer()) {
+            TypeEntry pointerTo = foreignValueType.getPointerTo();
+            assert pointerTo != null : "ADDRESS field pointer type must have a known target type";
             // type the array using the referent of the pointer type
             //
             // n.b it is critical for correctness to use the index of the referent rather than
@@ -1363,7 +1367,7 @@ private int writeEmbeddedArrayDataType(DebugContext context, ForeignTypeEntry fo
             // However, if this embedded struct field definition precedes the definition of the
             // referring type and the latter precedes the definition of the referent type then
             // the layout index of the referring type may still be unset at this point.
-            elementTypeIdx = getTypeIndex(foreignValueType.getPointerTo());
+            elementTypeIdx = getTypeIndex(pointerTo);
         } else {
             // type the array using the layout type
             elementTypeIdx = getIndirectLayoutIndex(foreignValueType);

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java

@@ -125,6 +125,7 @@
 import jdk.vm.ci.meta.Signature;
 import jdk.vm.ci.meta.Value;
 import org.graalvm.nativeimage.c.struct.CPointerTo;
+import org.graalvm.nativeimage.c.struct.RawPointerTo;
 import org.graalvm.word.WordBase;
 
 /**
@@ -969,11 +970,18 @@ public ResolvedJavaType parent() {
         @Override
         public ResolvedJavaType pointerTo() {
             if (isPointer()) {
+                // any target type for the pointer will be defined by a CPointerTo or RawPointerTo
+                // annotation
                 CPointerTo cPointerTo = hostedType.getAnnotation(CPointerTo.class);
                 if (cPointerTo != null) {
                     HostedType pointerTo = heap.hMetaAccess.lookupJavaType(cPointerTo.value());
                     return getOriginal(pointerTo);
                 }
+                RawPointerTo rawPointerTo = hostedType.getAnnotation(RawPointerTo.class);
+                if (rawPointerTo != null) {
+                    HostedType pointerTo = heap.hMetaAccess.lookupJavaType(rawPointerTo.value());
+                    return getOriginal(pointerTo);
+                }
             }
             return null;
         }