fixes from PR review

Author: stooke

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

@@ -43,8 +43,8 @@ public final class CVDebugInfo extends DebugInfoBase {
 
     /* Register constants for Windows x86_64 */
     /* See AMD64ReservedRegisters.java. */
-    public static final byte rheapbase_x86 = (byte) 14;
-    public static final byte rthread_x86 = (byte) 15;
+    public static final byte RHEAPBASE_X86 = (byte) 14;
+    public static final byte RTHREAD_X86 = (byte) 15;
 
     /**
      * Register used to hold the heap base.
@@ -60,8 +60,8 @@ public CVDebugInfo(PECoffMachine machine, ByteOrder byteOrder) {
         cvSymbolSection = new CVSymbolSectionImpl(this);
         cvTypeSection = new CVTypeSectionImpl();
         if (machine == PECoffMachine.X86_64) {
-            this.heapbaseRegister = rheapbase_x86;
-            this.threadRegister = rthread_x86;
+            this.heapbaseRegister = RHEAPBASE_X86;
+            this.threadRegister = RTHREAD_X86;
         } else {
             /* room for future aach64 port */
             throw GraalError.shouldNotReachHere("Unsupported architecture on Windows");

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

@@ -78,8 +78,6 @@
 
 class CVTypeSectionBuilder {
 
-    // private static final String MAGIC_OBJECT_HEADER_TYPE = "_objhdr";
-    // private static final String JAVA_LANG_CLASS = "java.lang.Class";
     private static final String JAVA_LANG_OBJECT = "java.lang.Object";
 
     private int objectHeaderRecordIndex;
@@ -275,22 +273,6 @@ record = buildType(entry);
         return ptrRecord.getSequenceNumber();
     }
 
-    /**
-     * If the type of the pointee is a primitive type, return it directly. Otherwise, create (if
-     * needed) and return a record representing a pointer to class.
-     *
-     * private int getIndexForPointer(String typeName) { CVTypeRecord ptrRecord =
-     * typeSection.getPointerRecordForType(typeName); if (ptrRecord == null) { CVTypeRecord
-     * clsRecord = typeSection.getType(typeName); if (clsRecord == null) { /* we've never heard of
-     * this class (but it may be in process) * clsRecord = addTypeRecord(new
-     * CVTypeRecord.CVClassRecord((short) ATTR_FORWARD_REF, typeName, null));
-     * typeInfoMap.put(typeName, new TypeInfo(clsRecord, null)); } else if
-     * (clsRecord.getSequenceNumber() <= MAX_PRIMITIVE) { return clsRecord.getSequenceNumber(); } /*
-     * We now have a class record but must create a pointer record. * ptrRecord = addTypeRecord(new
-     * CVTypeRecord.CVTypePointerRecord(clsRecord.getSequenceNumber(),
-     * CVTypeRecord.CVTypePointerRecord.NORMAL_64)); } return ptrRecord.getSequenceNumber(); }
-     */
-
     private int getIndexForType(TypeEntry entry) {
         CVTypeRecord clsRecord = typeSection.getType(entry.getTypeName());
         if (clsRecord == null) {