stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8006948: Update javac for MethodParameters format change

Browse Source 
Reviewed-by: ksrini, forax
This commit is contained in:
Eric Mccorkle 2013-02-19 17:19:01 -08:00 committed by Kumar Srinivasan
parent 68a3295c8b
commit bfe1255adc
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java
View File

@ -483,7 +483,7 @@ public class ClassWriter {
out.writeByte(attr.method_parameter_table.length); out.writeByte(attr.method_parameter_table.length);
for (MethodParameters_attribute.Entry e : attr.method_parameter_table) { for (MethodParameters_attribute.Entry e : attr.method_parameter_table) {
out.writeShort(e.name_index); out.writeShort(e.name_index);
out.writeInt(e.flags); out.writeShort(e.flags);
} }
return null; return null;
} }

2
langtools/src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java
View File

@ -73,7 +73,7 @@ public class MethodParameters_attribute extends Attribute {
public static class Entry { public static class Entry {
Entry(ClassReader cr) throws IOException { Entry(ClassReader cr) throws IOException {
name_index = cr.readUnsignedShort(); name_index = cr.readUnsignedShort();
flags = cr.readInt(); flags = cr.readUnsignedShort();
} }
public static int length() { public static int length() {

2
langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
View File

@ -1036,7 +1036,7 @@ public class ClassReader implements Completer {
haveParameterNameIndices = true; haveParameterNameIndices = true;
for (int i = 0; i < numEntries; i++) { for (int i = 0; i < numEntries; i++) {
int nameIndex = nextChar(); int nameIndex = nextChar();
int flags = nextInt(); int flags = nextChar();
parameterNameIndices[i] = nameIndex; parameterNameIndices[i] = nameIndex;
} }
} }

2
langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
View File

@ -659,7 +659,7 @@ public class ClassWriter extends ClassFile {
((int) s.flags() & (FINAL | SYNTHETIC | MANDATED)) | ((int) s.flags() & (FINAL | SYNTHETIC | MANDATED)) |
((int) m.flags() & SYNTHETIC); ((int) m.flags() & SYNTHETIC);
databuf.appendChar(pool.put(s.name)); databuf.appendChar(pool.put(s.name));
databuf.appendInt(flags); databuf.appendChar(flags);
} }
endAttr(attrIndex); endAttr(attrIndex);
return 1; return 1;