Tue, 19 Feb 2013 17:19:01 -0800
8006948: Update javac for MethodParameters format change
Reviewed-by: ksrini, forax
Contributed-by: eric.mccorkle@oracle.com
1.1 --- a/src/share/classes/com/sun/tools/classfile/ClassWriter.java Tue Feb 19 17:53:16 2013 +0000 1.2 +++ b/src/share/classes/com/sun/tools/classfile/ClassWriter.java Tue Feb 19 17:19:01 2013 -0800 1.3 @@ -483,7 +483,7 @@ 1.4 out.writeByte(attr.method_parameter_table.length); 1.5 for (MethodParameters_attribute.Entry e : attr.method_parameter_table) { 1.6 out.writeShort(e.name_index); 1.7 - out.writeInt(e.flags); 1.8 + out.writeShort(e.flags); 1.9 } 1.10 return null; 1.11 }
2.1 --- a/src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java Tue Feb 19 17:53:16 2013 +0000 2.2 +++ b/src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java Tue Feb 19 17:19:01 2013 -0800 2.3 @@ -73,7 +73,7 @@ 2.4 public static class Entry { 2.5 Entry(ClassReader cr) throws IOException { 2.6 name_index = cr.readUnsignedShort(); 2.7 - flags = cr.readInt(); 2.8 + flags = cr.readUnsignedShort(); 2.9 } 2.10 2.11 public static int length() {
3.1 --- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Tue Feb 19 17:53:16 2013 +0000 3.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Tue Feb 19 17:19:01 2013 -0800 3.3 @@ -1036,7 +1036,7 @@ 3.4 haveParameterNameIndices = true; 3.5 for (int i = 0; i < numEntries; i++) { 3.6 int nameIndex = nextChar(); 3.7 - int flags = nextInt(); 3.8 + int flags = nextChar(); 3.9 parameterNameIndices[i] = nameIndex; 3.10 } 3.11 }
4.1 --- a/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Tue Feb 19 17:53:16 2013 +0000 4.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Tue Feb 19 17:19:01 2013 -0800 4.3 @@ -659,7 +659,7 @@ 4.4 ((int) s.flags() & (FINAL | SYNTHETIC | MANDATED)) | 4.5 ((int) m.flags() & SYNTHETIC); 4.6 databuf.appendChar(pool.put(s.name)); 4.7 - databuf.appendInt(flags); 4.8 + databuf.appendChar(flags); 4.9 } 4.10 endAttr(attrIndex); 4.11 return 1;