Updates after pejovica review and merge from head.

Author: stooke

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVNames.java

@@ -26,7 +26,8 @@
 
 package com.oracle.objectfile.pecoff.cv;
 
-import com.oracle.objectfile.debugentry.MemberEntry;
+import com.oracle.objectfile.debugentry.FieldEntry;
+import com.oracle.objectfile.debugentry.MethodEntry;
 import com.oracle.objectfile.debugentry.TypeEntry;
 
 final class CVNames {
@@ -39,7 +40,11 @@ static String typeNameToCodeViewName(TypeEntry typeEntry) {
         return typeNameToCodeViewName(typeEntry.getTypeName());
     }
 
-    static String memberNameToCodeViewName(MemberEntry memberEntry) {
+    static String methodNameToCodeViewName(MethodEntry memberEntry) {
+        return typeNameToCodeViewName(memberEntry.ownerType()) + "::" + memberEntry.methodName();
+    }
+
+    static String fieldNameToCodeViewName(FieldEntry memberEntry) {
         return typeNameToCodeViewName(memberEntry.ownerType()) + "::" + memberEntry.fieldName();
     }
 }

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSymbolSubsectionBuilder.java

@@ -85,15 +85,15 @@ void build() {
     private void buildClass(ClassEntry classEntry) {
 
         /* Define all the functions in this class all functions defined in this class. */
-        classEntry.compiledEntries().forEach(compiledEntry -> buildFunction(compiledEntry));
+        classEntry.compiledEntries().forEach(this::buildFunction);
 
         /* Define the class itself. */
         addTypeRecords(classEntry);
 
         /* Add manifested static fields as S_GDATA32 records. */
         classEntry.fields().filter(CVSymbolSubsectionBuilder::isManifestedStaticField).forEach(f -> {
             int typeIndex = cvDebugInfo.getCVTypeSection().getIndexForPointer(f.getValueType());
-            String displayName = CVNames.memberNameToCodeViewName(f);
+            String displayName = CVNames.fieldNameToCodeViewName(f);
             if (cvDebugInfo.useHeapBase()) {
                 /*
                  * Isolates are enabled. Static member is located at REL32 offset from heap base
@@ -121,7 +121,7 @@ private void buildFunction(CompiledMethodEntry compiledEntry) {
         final Range primaryRange = compiledEntry.getPrimary();
 
         /* The name as it will appear in the debugger. */
-        final String debuggerName = CVNames.memberNameToCodeViewName(primaryRange.getMethodEntry());
+        final String debuggerName = CVNames.methodNameToCodeViewName(primaryRange.getMethodEntry());
 
         /* The name as exposed to the linker. */
         final String externalName = primaryRange.getSymbolName();
@@ -197,7 +197,7 @@ private void addTypeRecords(TypeEntry typeEntry) {
      * @param entry compiled method containing entities whos type records must be added
      * @return type index of function type
      */
-    private int addTypeRecords(@SuppressWarnings("unused") CompiledMethodEntry entry) {
+    private int addTypeRecords(CompiledMethodEntry entry) {
         return cvDebugInfo.getCVTypeSection().addTypeRecords(entry).getSequenceNumber();
     }
 }

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeSectionBuilder.java

@@ -28,11 +28,11 @@
 
 import com.oracle.objectfile.debugentry.ArrayTypeEntry;
 import com.oracle.objectfile.debugentry.ClassEntry;
+import com.oracle.objectfile.debugentry.CompiledMethodEntry;
 import com.oracle.objectfile.debugentry.FieldEntry;
 import com.oracle.objectfile.debugentry.HeaderTypeEntry;
 import com.oracle.objectfile.debugentry.MemberEntry;
 import com.oracle.objectfile.debugentry.MethodEntry;
-import com.oracle.objectfile.debugentry.PrimaryEntry;
 import com.oracle.objectfile.debugentry.StructureTypeEntry;
 import com.oracle.objectfile.debugentry.TypeEntry;
 
@@ -149,15 +149,13 @@ CVTypeRecord buildType(TypeEntry typeEntry) {
      * @param entry primaryEntry containing entities whose type records must be added
      * @return type record for this function (may return existing matching record)
      */
-    CVTypeRecord buildFunction(PrimaryEntry entry) {
+    CVTypeRecord buildFunction(CompiledMethodEntry entry) {
         return buildMemberFunction(entry.getClassEntry(), entry.getPrimary().getMethodEntry());
     }
 
     static class FieldListBuilder {
 
-        /* Size of the header part of a field list record (record type + size) */
-        private static final int FIELD_LIST_RECORD_OVERHEAD = Short.BYTES + Short.BYTES;
-
+        static final int CV_INDEX_RECORD_SIZE = CVUtil.align4(new CVTypeRecord.CVIndexRecord(0).computeSize());
         final List<CVTypeRecord.FieldRecord> fields = new ArrayList<>();
 
         FieldListBuilder() {
@@ -184,7 +182,13 @@ CVTypeRecord.CVFieldListRecord buildFieldListRecords(CVTypeSectionBuilder builde
 
             /* Build all Field List records in field order (FIFO). */
             for (CVTypeRecord.FieldRecord fieldRecord : fields) {
-                if (FIELD_LIST_RECORD_OVERHEAD + currentFieldList.getEstimatedSize() + CVUtil.align4(fieldRecord.computeSize()) >= CV_TYPE_RECORD_MAX_SIZE) {
+                /*
+                 * Calculate the potential size of the fieldList if the current fieldRecord and a
+                 * (potential) index record are added to it.
+                 */
+                int sizeOfExpandedFieldList = currentFieldList.getEstimatedSize() + CVUtil.align4(fieldRecord.computeSize()) + CV_INDEX_RECORD_SIZE;
+                /* If there isn't enough room for the new fieldRecord, start a new CVFieldList. */
+                if (sizeOfExpandedFieldList >= CV_TYPE_RECORD_MAX_SIZE) {
                     currentFieldList = new CVTypeRecord.CVFieldListRecord();
                     fl.add(currentFieldList);
                 }
@@ -296,7 +300,7 @@ private CVTypeRecord buildStructureTypeEntry(final StructureTypeEntry typeEntry)
 
                 /* LF_MFUNCTION records */
                 methods.stream().filter(methodEntry -> methodEntry.methodName().equals(mname)).forEach(m -> {
-                    log("overloaded method %s(%s) attr=(%s) valuetype=%s", m.fieldName(), m.methodName(), m.getModifiersString(), m.getValueType().getTypeName());
+                    log("overloaded method %s attr=(%s) valuetype=%s", m.methodName(), m.getModifiersString(), m.getValueType().getTypeName());
                     CVTypeRecord.CVTypeMFunctionRecord mFunctionRecord = buildMemberFunction((ClassEntry) typeEntry, m);
                     short attr = modifiersToAttr(m);
                     log("    overloaded method %s", mFunctionRecord);
@@ -311,7 +315,7 @@ private CVTypeRecord buildStructureTypeEntry(final StructureTypeEntry typeEntry)
             });
 
             methods.stream().filter(methodEntry -> !overloaded.contains(methodEntry.methodName())).forEach(m -> {
-                log("`unique method %s %s %s(...)", m.fieldName(), m.methodName(), m.getModifiersString(), m.getValueType().getTypeName(), m.methodName());
+                log("`unique method %s %s(...)", m.methodName(), m.getModifiersString(), m.getValueType().getTypeName(), m.methodName());
                 CVTypeRecord.CVOneMethodRecord method = buildMethod((ClassEntry) typeEntry, m);
                 log("    unique method %s", method);
                 fieldListBuilder.addField(method);
@@ -335,7 +339,7 @@ private CVTypeRecord buildStructureTypeEntry(final StructureTypeEntry typeEntry)
              * Try to find a line number for the first function - if none, don't bother to create
              * the record.
              */
-            int line = classEntry.getPrimaryEntries().isEmpty() ? 0 : classEntry.getPrimaryEntries().get(0).getPrimary().getLine();
+            int line = classEntry.getMethods().isEmpty() ? 0 : classEntry.getMethods().get(0).getLine();
             if (line > 0) {
                 int idIdx = typeSection.getStringId(classEntry.getFullFileName()).getSequenceNumber();
                 CVTypeRecord.CVUdtTypeLineRecord udt = new CVTypeRecord.CVUdtTypeLineRecord(typeRecord.getSequenceNumber(), idIdx, line);

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeSectionImpl.java

@@ -30,7 +30,7 @@
 import com.oracle.objectfile.LayoutDecision;
 import com.oracle.objectfile.LayoutDecisionMap;
 import com.oracle.objectfile.ObjectFile;
-import com.oracle.objectfile.debugentry.PrimaryEntry;
+import com.oracle.objectfile.debugentry.CompiledMethodEntry;
 import com.oracle.objectfile.debugentry.TypeEntry;
 import com.oracle.objectfile.pecoff.PECoffObjectFile;
 import org.graalvm.compiler.debug.DebugContext;
@@ -140,7 +140,7 @@ public Set<BuildDependency> getDependencies(Map<ObjectFile.Element, LayoutDecisi
      * @param entry primaryEntry containing entities whose type records must be added
      * @return type index of function type
      */
-    CVTypeRecord addTypeRecords(PrimaryEntry entry) {
+    CVTypeRecord addTypeRecords(CompiledMethodEntry entry) {
         return builder.buildFunction(entry);
     }