*** old/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachORelocEntry.java	Tue Aug 22 11:46:32 2017
--- new/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachORelocEntry.java	Tue Aug 22 11:46:32 2017

*** 22,65 ****
--- 22,54 ----
   */
  
  package jdk.tools.jaotc.binformat.macho;
  
  import java.nio.ByteBuffer;
  import java.nio.ByteOrder;
  
  import jdk.tools.jaotc.binformat.macho.MachO;
  import jdk.tools.jaotc.binformat.macho.MachO.reloc_info;
  import jdk.tools.jaotc.binformat.macho.MachOByteBuffer;
  
! public class MachORelocEntry {
!     ByteBuffer entry;
! final class MachORelocEntry {
!     private final ByteBuffer entry;
  
      public MachORelocEntry(int offset,
                             int symno,
                             int pcrel,
                             int length,
                             int isextern,
                             int type) {
+     MachORelocEntry(int offset, int symno, int pcrel, int length, int isextern, int type) {
  
          entry = MachOByteBuffer.allocate(reloc_info.totalsize);
  
          entry.putInt(reloc_info.r_address.off, offset);
  
          // Encode and store the relocation entry bitfields
+         // @formatter:off
          entry.putInt(reloc_info.r_relocinfo.off,
!             ((symno    & reloc_info.REL_SYMNUM_MASK) << reloc_info.REL_SYMNUM_SHIFT) |
!              << reloc_info.REL_SYMNUM_SHIFT) |
              ((pcrel & reloc_info.REL_PCREL_MASK)
!              << reloc_info.REL_PCREL_SHIFT) |
              ((length & reloc_info.REL_LENGTH_MASK)
               << reloc_info.REL_LENGTH_SHIFT) |
              ((isextern & reloc_info.REL_EXTERN_MASK)
               << reloc_info.REL_EXTERN_SHIFT) |
              ((type & reloc_info.REL_TYPE_MASK)
               << reloc_info.REL_TYPE_SHIFT));
!             ((pcrel    & reloc_info.REL_PCREL_MASK)  << reloc_info.REL_PCREL_SHIFT)  |
+             ((length   & reloc_info.REL_LENGTH_MASK) << reloc_info.REL_LENGTH_SHIFT) |
!             ((isextern & reloc_info.REL_EXTERN_MASK) << reloc_info.REL_EXTERN_SHIFT) |
+             ((type     & reloc_info.REL_TYPE_MASK)   << reloc_info.REL_TYPE_SHIFT));
+         // @formatter:on
      }
  
-     public byte[] getArray() {
          return entry.array();
      }
  }