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

*** 24,41 ****
--- 24,40 ----
  package jdk.tools.jaotc.binformat.macho;
  
  import java.io.File;
  import java.io.FileOutputStream;
  
! public class MachOContainer {
! final class MachOContainer {
  
!     private final File outputFile;
!     private FileOutputStream outputStream;
!     private long fileOffset;
  
-     public MachOContainer(String fileName) {
          String baseName;
  
          outputFile = new File(fileName);
          if (outputFile.exists()) {
              outputFile.delete();
          }

*** 46,83 ****
--- 45,81 ----
              System.out.println("MachOContainer: Can't create file " + fileName);
          }
          fileOffset = 0;
      }
  
-     public void close() {
          try {
              outputStream.close();
          } catch (Exception e) {
              System.out.println("MachOContainer: close failed");
          }
      }
  
!     public void writeBytes(byte [] bytes) {
          try {
              outputStream.write(bytes);
          } catch (Exception e) {
              System.out.println("MachOContainer: writeBytes failed");
          }
          fileOffset += bytes.length;
      }
  
      // Write bytes to output file with up front alignment padding
!     public void writeBytes(byte [] bytes, int alignment) {
          try {
              // Pad to alignment
!             while ((fileOffset & (long)(alignment-1)) != 0) {
!             while ((fileOffset & (alignment - 1)) != 0) {
                  outputStream.write(0);
                  fileOffset++;
              }
              outputStream.write(bytes);
          } catch (Exception e) {
              System.out.println("MachOContainer: writeBytes failed");
          }
          fileOffset += bytes.length;
      }
  }