src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java

*** 220,11 ***
      public static String flagNames(long flags) {
          StringBuilder sbuf = new StringBuilder();
          int i = 0;
          long f = flags & StandardFlags;
          while (f != 0) {
!             if ((f & 1) != 0) {
                  sbuf.append(" ");
                  sbuf.append(flagName[i]);
              }
              f = f >> 1;
              i++;
--- 220,11 ---
      public static String flagNames(long flags) {
          StringBuilder sbuf = new StringBuilder();
          int i = 0;
          long f = flags & StandardFlags;
          while (f != 0) {
!             if ((f & 1) != 0 && flagName[i] != "") {
                  sbuf.append(" ");
                  sbuf.append(flagName[i]);
              }
              f = f >> 1;
              i++;

*** 232,11 ***
          return sbuf.toString();
      }
      //where
          private static final String[] flagName = {
              "PUBLIC", "PRIVATE", "PROTECTED", "STATIC", "FINAL",
!             "SUPER", "VOLATILE", "TRANSIENT", "NATIVE", "INTERFACE",
              "ABSTRACT", "STRICTFP"};
  
  /******************************************************************
   * Output routines
   ******************************************************************/
--- 232,12 ---
          return sbuf.toString();
      }
      //where
          private static final String[] flagName = {
              "PUBLIC", "PRIVATE", "PROTECTED", "STATIC", "FINAL",
!             // the empty position should be for synchronized but right now we don't have any test checking it
+             "", "VOLATILE", "TRANSIENT", "NATIVE", "INTERFACE",
              "ABSTRACT", "STRICTFP"};
  
  /******************************************************************
   * Output routines
   ******************************************************************/

*** 834,11 ***
          databuf.appendChar(poolWriter.innerClasses.size());
          for (ClassSymbol inner : poolWriter.innerClasses) {
              inner.markAbstractIfNeeded(types);
              int flags = adjustFlags(inner.flags_field);
              if ((flags & INTERFACE) != 0) flags |= ABSTRACT; // Interfaces are always ABSTRACT
-             flags &= ~STRICTFP; //inner classes should not have the strictfp flag set.
              if (dumpInnerClassModifiers) {
                  PrintWriter pw = log.getWriter(Log.WriterKind.ERROR);
                  pw.println("INNERCLASS  " + inner.name);
                  pw.println("---" + flagNames(flags));
              }
--- 835,10 ---

*** 850,10 ***
--- 850,21 ---
              databuf.appendChar(flags);
          }
          endAttr(alenIdx);
      }
  
+      /** Write out "Preload" attribute by enumerating the value classes encountered in field/method descriptors during this compilation.
+       */
+      void writePreloadAttribute() {
+         int alenIdx = writeAttr(names.Preload);
+         databuf.appendChar(poolWriter.preloadClasses.size());
+         for (ClassSymbol c : poolWriter.preloadClasses) {
+             databuf.appendChar(poolWriter.putClass(c));
+         }
+         endAttr(alenIdx);
+      }
+ 
      int writeRecordAttribute(ClassSymbol csym) {
          int alenIdx = writeAttr(names.Record);
          Scope s = csym.members();
          databuf.appendChar(csym.getRecordComponents().size());
          for (VarSymbol v: csym.getRecordComponents()) {

*** 972,10 ***
--- 983,14 ---
              pw.println("FIELD  " + v.name);
              pw.println("---" + flagNames(v.flags()));
          }
          databuf.appendChar(poolWriter.putName(v.name));
          databuf.appendChar(poolWriter.putDescriptor(v));
+         Type fldType = v.erasure(types);
+         if (fldType.requiresPreload(v.owner)) {
+             poolWriter.enterPreloadClass((ClassSymbol) fldType.tsym);
+         }
          int acountIdx = beginAttrs();
          int acount = 0;
          if (v.getConstValue() != null) {
              int alenIdx = writeAttr(names.ConstantValue);
              databuf.appendChar(poolWriter.putConstant(v.getConstValue()));

*** 997,10 ***
--- 1012,20 ---
              pw.println("METHOD  " + m.name);
              pw.println("---" + flagNames(m.flags()));
          }
          databuf.appendChar(poolWriter.putName(m.name));
          databuf.appendChar(poolWriter.putDescriptor(m));
+         MethodType mtype = (MethodType) m.externalType(types);
+         for (Type t : mtype.getParameterTypes()) {
+             if (t.requiresPreload(m.owner)) {
+                 poolWriter.enterPreloadClass((ClassSymbol) t.tsym);
+             }
+         }
+         Type returnType = mtype.getReturnType();
+         if (returnType.requiresPreload(m.owner)) {
+             poolWriter.enterPreloadClass((ClassSymbol) returnType.tsym);
+         }
          int acountIdx = beginAttrs();
          int acount = 0;
          if (m.code != null) {
              int alenIdx = writeAttr(names.Code);
              writeCode(m.code);

*** 1574,14 ***
  
          int flags;
          if (c.owner.kind == MDL) {
              flags = ACC_MODULE;
          } else {
!             flags = adjustFlags(c.flags() & ~DEFAULT);
              if ((flags & PROTECTED) != 0) flags |= PUBLIC;
!             flags = flags & ClassFlags & ~STRICTFP;
!             if ((flags & INTERFACE) == 0) flags |= ACC_SUPER;
          }
  
          if (dumpClassModifiers) {
              PrintWriter pw = log.getWriter(Log.WriterKind.ERROR);
              pw.println();
--- 1599,15 ---
  
          int flags;
          if (c.owner.kind == MDL) {
              flags = ACC_MODULE;
          } else {
!             long originalFlags = c.flags();
+             flags = adjustFlags(c.flags() & ~(DEFAULT | STRICTFP));
              if ((flags & PROTECTED) != 0) flags |= PUBLIC;
!             flags = flags & ClassFlags;
!             flags |= (originalFlags & IDENTITY_TYPE) != 0 ? ACC_IDENTITY : flags;
          }
  
          if (dumpClassModifiers) {
              PrintWriter pw = log.getWriter(Log.WriterKind.ERROR);
              pw.println();

*** 1703,10 ***
--- 1729,15 ---
          if (!poolWriter.innerClasses.isEmpty()) {
              writeInnerClasses();
              acount++;
          }
  
+         if (!poolWriter.preloadClasses.isEmpty()) {
+             writePreloadAttribute();
+             acount++;
+         }
+ 
          endAttrs(acountIdx, acount);
  
          out.write(poolbuf.elems, 0, poolbuf.length);
  
          poolWriter.writePool(out);

*** 1746,10 ***
--- 1777,16 ---
              result |= ACC_BRIDGE;
          if ((flags & VARARGS) != 0)
              result |= ACC_VARARGS;
          if ((flags & DEFAULT) != 0)
              result &= ~ABSTRACT;
+         if ((flags & IDENTITY_TYPE) != 0) {
+             result |= ACC_IDENTITY;
+         }
+         if ((flags & STRICT) != 0) {
+             result |= ACC_STRICT;
+         }
          return result;
      }
  
      long getLastModified(FileObject filename) {
          long mod = 0;