src/share/classes/com/sun/tools/classfile/ClassWriter.java

*** 725,740 ****
  
          // TODO: Move this to TypeAnnotation to be closer with similar logic?
          private void write(TypeAnnotation.Position p, ClassOutputStream out) {
              out.writeByte(p.type.targetTypeValue());
              switch (p.type) {
-             // type cast
-             case CAST:
              // instanceof
              case INSTANCEOF:
              // new expression
              case NEW:
                  out.writeShort(p.offset);
                  break;
              // local variable
              case LOCAL_VARIABLE:
              // resource variable
--- 725,741 ----
  
          // TODO: Move this to TypeAnnotation to be closer with similar logic?
          private void write(TypeAnnotation.Position p, ClassOutputStream out) {
              out.writeByte(p.type.targetTypeValue());
              switch (p.type) {
              // instanceof
              case INSTANCEOF:
              // new expression
              case NEW:
+             // constructor/method reference receiver
+             case CONSTRUCTOR_REFERENCE:
+             case METHOD_REFERENCE:
                  out.writeShort(p.offset);
                  break;
              // local variable
              case LOCAL_VARIABLE:
              // resource variable
*** 777,801 ****
                  break;
              // method parameter
              case METHOD_FORMAL_PARAMETER:
                  out.writeByte(p.parameter_index);
                  break;
              // method/constructor/reference type argument
              case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
              case METHOD_INVOCATION_TYPE_ARGUMENT:
              case METHOD_REFERENCE_TYPE_ARGUMENT:
                  out.writeShort(p.offset);
                  out.writeByte(p.type_index);
                  break;
              // We don't need to worry about these
              case METHOD_RETURN:
              case FIELD:
                  break;
-             // lambda formal parameter
-             case LAMBDA_FORMAL_PARAMETER:
-                 out.writeByte(p.parameter_index);
-                 break;
              case UNKNOWN:
                  throw new AssertionError("ClassWriter: UNKNOWN target type should never occur!");
              default:
                  throw new AssertionError("ClassWriter: Unknown target type for position: " + p);
              }
--- 778,801 ----
                  break;
              // method parameter
              case METHOD_FORMAL_PARAMETER:
                  out.writeByte(p.parameter_index);
                  break;
+             // type cast
+             case CAST:
              // method/constructor/reference type argument
              case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
              case METHOD_INVOCATION_TYPE_ARGUMENT:
+             case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT:
              case METHOD_REFERENCE_TYPE_ARGUMENT:
                  out.writeShort(p.offset);
                  out.writeByte(p.type_index);
                  break;
              // We don't need to worry about these
              case METHOD_RETURN:
              case FIELD:
                  break;
              case UNKNOWN:
                  throw new AssertionError("ClassWriter: UNKNOWN target type should never occur!");
              default:
                  throw new AssertionError("ClassWriter: Unknown target type for position: " + p);
              }