olpaw review

Author: stooke

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

@@ -46,13 +46,7 @@ public final class CVDebugInfo extends DebugInfoBase {
     public static final byte RHEAPBASE_X86 = (byte) 14;
     public static final byte RTHREAD_X86 = (byte) 15;
 
-    /**
-     * Register used to hold the heap base.
-     */
     private final byte heapbaseRegister;
-    /**
-     * Register used to hold the current thread.
-     */
     private final byte threadRegister;
 
     public CVDebugInfo(PECoffMachine machine, ByteOrder byteOrder) {

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

@@ -254,7 +254,7 @@ public static class CVSymbolGData32Record extends CVSymbolSubrecord {
         protected final String name;
         private final String relativeTo;
 
-        CVSymbolGData32Record(CVDebugInfo cvDebugInfo, short cmd, String name, String relativeTo, int typeIndex, int offset, short segment) {
+        protected CVSymbolGData32Record(CVDebugInfo cvDebugInfo, short cmd, String name, String relativeTo, int typeIndex, int offset, short segment) {
             super(cvDebugInfo, cmd);
             this.name = name;
             this.relativeTo = relativeTo;
@@ -263,11 +263,6 @@ public static class CVSymbolGData32Record extends CVSymbolSubrecord {
             this.segment = segment;
         }
 
-        @SuppressWarnings("unused")
-        CVSymbolGData32Record(CVDebugInfo cvDebugInfo, String name, int typeIndex, int offset, short segment) {
-            this(cvDebugInfo, CVDebugConstants.S_GDATA32, name, null, typeIndex, offset, segment);
-        }
-
         CVSymbolGData32Record(CVDebugInfo cvDebugInfo, String name, String relativeTo, int typeIndex, int offset, short segment) {
             this(cvDebugInfo, CVDebugConstants.S_GDATA32, name, relativeTo, typeIndex, offset, segment);
         }

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

@@ -33,13 +33,12 @@
 import com.oracle.objectfile.debugentry.PrimaryEntry;
 import com.oracle.objectfile.debugentry.Range;
 import com.oracle.objectfile.debugentry.TypeEntry;
+import com.oracle.objectfile.elf.dwarf.DwarfDebugInfo;
 import com.oracle.objectfile.pecoff.PECoffObjectFile;
 import org.graalvm.compiler.debug.DebugContext;
 
 import java.lang.reflect.Modifier;
 
-import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.HEAP_BEGIN_NAME;
-
 final class CVSymbolSubsectionBuilder {
 
     private final CVDebugInfo cvDebugInfo;
@@ -106,7 +105,7 @@ private void build(ClassEntry classEntry) {
                 addToSymbolSubsection(new CVSymbolSubrecord.CVSymbolRegRel32Record(cvDebugInfo, externName, typeIndex, f.getOffset(), cvDebugInfo.getHeapbaseRegister()));
             } else {
                 /* Offset from heap begin. */
-                addToSymbolSubsection(new CVSymbolSubrecord.CVSymbolGData32Record(cvDebugInfo, externName, HEAP_BEGIN_NAME, typeIndex, f.getOffset(), sectionId));
+                addToSymbolSubsection(new CVSymbolSubrecord.CVSymbolGData32Record(cvDebugInfo, externName, DwarfDebugInfo.HEAP_BEGIN_NAME, typeIndex, f.getOffset(), sectionId));
             }
         });
     }