minor code cleanups

Author: adinn

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ClassEntry.java

@@ -298,9 +298,9 @@ protected void processMethod(DebugMethodInfo debugMethodInfo, DebugInfoBase debu
     @Override
     protected FieldEntry addField(DebugInfoProvider.DebugFieldInfo debugFieldInfo, DebugInfoBase debugInfoBase, DebugContext debugContext) {
         FieldEntry fieldEntry = super.addField(debugFieldInfo, debugInfoBase, debugContext);
-        FileEntry fileEntry = fieldEntry.getFileEntry();
-        if (fileEntry != null) {
-            indexLocalFileEntry(fileEntry);
+        FileEntry fieldFileEntry = fieldEntry.getFileEntry();
+        if (fieldFileEntry != null) {
+            indexLocalFileEntry(fieldFileEntry);
         }
         return fieldEntry;
     }

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/InterfaceClassEntry.java

@@ -74,10 +74,10 @@ public int getSize() {
          */
         int maxSize = super.size;
         for (ClassEntry implementor : implementors) {
-            int size = implementor.getSize();
+            int nextSize = implementor.getSize();
 
-            if (size > maxSize) {
-                maxSize = size;
+            if (nextSize > maxSize) {
+                maxSize = nextSize;
             }
         }
         return maxSize;

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

@@ -1056,7 +1056,7 @@ private int writeArrayLayout(DebugContext context, ArrayTypeEntry arrayTypeEntry
         pos = writeFields(context, arrayTypeEntry, buffer, pos);
         /* Write a zero length element array field. */
         pos = writeArrayElementField(context, size, arrayDataTypeIdx, buffer, pos);
-        pos = writeArraySuperReference(context, arrayTypeEntry, buffer, pos);
+        pos = writeArraySuperReference(context, buffer, pos);
         /*
          * Write a terminating null attribute.
          */
@@ -1133,26 +1133,14 @@ private int writeArrayElementField(DebugContext context, int offset, int arrayDa
 
     }
 
-    private int writeArraySuperReference(DebugContext context, ArrayTypeEntry arrayTypeEntry, byte[] buffer, int p) {
+    private int writeArraySuperReference(DebugContext context, byte[] buffer, int p) {
         int pos = p;
         /* Arrays all inherit from java.lang.Object */
         String superName = "java.lang.Object";
         TypeEntry objectType = lookupType(superName);
         assert objectType instanceof ClassEntry;
         int superOffset = getLayoutIndex((ClassEntry) objectType);
-        log(context, "  [0x%08x] super reference", pos);
-        int abbrevCode = DwarfDebugInfo.DW_ABBREV_CODE_super_reference;
-        log(context, "  [0x%08x] <2> Abbrev Number %d", pos, abbrevCode);
-        pos = writeAbbrevCode(abbrevCode, buffer, pos);
-        log(context, "  [0x%08x]     type 0x%x (%s)", pos, superOffset, superName);
-        pos = writeAttrRefAddr(superOffset, buffer, pos);
-        /* Parent layout is embedded at start of object. */
-        log(context, "  [0x%08x]     data_member_location (super) 0x%x", pos, 0);
-        pos = writeAttrData1((byte) 0, buffer, pos);
-        log(context, "  [0x%08x]     modifiers public", pos);
-        int modifiers = Modifier.PUBLIC;
-        pos = writeAttrAccessibility(modifiers, buffer, pos);
-        return pos;
+        return writeSuperReference(context, superOffset, superName, buffer, pos);
     }
 
     private int writeArrayTypes(DebugContext context, ArrayTypeEntry arrayTypeEntry, int layoutOffset, int indirectLayoutOffset, byte[] buffer, int p) {