Fix file indexes in ClassEntry for substituted methods

Author: zakkak

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

@@ -682,7 +682,7 @@ private int writeMethodDeclaration(DebugContext context, ClassEntry classEntry,
         String name = uniqueDebugString(range.getMethodName());
         log(context, "  [0x%08x]     name 0x%x (%s)", pos, debugStringIndex(name), name);
         pos = writeAttrStrp(name, buffer, pos);
-        int fileIdx = classEntry.localFilesIdx();
+        int fileIdx = classEntry.localFilesIdx(range.getFileEntry());
         log(context, "  [0x%08x]     file 0x%x (%s)", pos, fileIdx, range.getFileEntry().getFullName());
         pos = writeAttrData2((short) fileIdx, buffer, pos);
         String returnTypeName = range.getMethodReturnTypeName();

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

@@ -436,7 +436,6 @@ private int writeLineNumberTable(DebugContext context, ClassEntry classEntry, by
         String primaryClassName = classEntry.getTypeName();
         String primaryFileName = classEntry.getFileName();
         String file = primaryFileName;
-        int fileIdx = 1;
         log(context, "  [0x%08x] primary class %s", pos, primaryClassName);
         log(context, "  [0x%08x] primary file %s", pos, primaryFileName);
         for (PrimaryEntry primaryEntry : classEntry.getPrimaryEntries()) {
@@ -464,6 +463,7 @@ private int writeLineNumberTable(DebugContext context, ClassEntry classEntry, by
             /*
              * Initialize and write a row for the start of the primary method.
              */
+            int fileIdx = classEntry.localFilesIdx(primaryRange.getFileEntry());
             pos = writeSetFileOp(context, file, fileIdx, buffer, pos);
             pos = writeSetBasicBlockOp(context, buffer, pos);
             /*