changeset 1591:9345394ac8fe

8006948: Update javac for MethodParameters format change Reviewed-by: ksrini, forax Contributed-by: eric.mccorkle@oracle.com
author ksrini
date Tue, 19 Feb 2013 17:19:01 -0800
parents dc8b7aa7cef3
children 4cf6e84f844f
files src/share/classes/com/sun/tools/classfile/ClassWriter.java src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java src/share/classes/com/sun/tools/javac/jvm/ClassReader.java src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
diffstat 4 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/classfile/ClassWriter.java	Tue Feb 19 17:53:16 2013 +0000
+++ b/src/share/classes/com/sun/tools/classfile/ClassWriter.java	Tue Feb 19 17:19:01 2013 -0800
@@ -483,7 +483,7 @@
             out.writeByte(attr.method_parameter_table.length);
             for (MethodParameters_attribute.Entry e : attr.method_parameter_table) {
                 out.writeShort(e.name_index);
-                out.writeInt(e.flags);
+                out.writeShort(e.flags);
             }
             return null;
         }
--- a/src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java	Tue Feb 19 17:53:16 2013 +0000
+++ b/src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java	Tue Feb 19 17:19:01 2013 -0800
@@ -73,7 +73,7 @@
     public static class Entry {
         Entry(ClassReader cr) throws IOException {
             name_index = cr.readUnsignedShort();
-            flags = cr.readInt();
+            flags = cr.readUnsignedShort();
         }
 
         public static int length() {
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Tue Feb 19 17:53:16 2013 +0000
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Tue Feb 19 17:19:01 2013 -0800
@@ -1036,7 +1036,7 @@
                         haveParameterNameIndices = true;
                         for (int i = 0; i < numEntries; i++) {
                             int nameIndex = nextChar();
-                            int flags = nextInt();
+                            int flags = nextChar();
                             parameterNameIndices[i] = nameIndex;
                         }
                     }
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Tue Feb 19 17:53:16 2013 +0000
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Tue Feb 19 17:19:01 2013 -0800
@@ -659,7 +659,7 @@
                     ((int) s.flags() & (FINAL | SYNTHETIC | MANDATED)) |
                     ((int) m.flags() & SYNTHETIC);
                 databuf.appendChar(pool.put(s.name));
-                databuf.appendInt(flags);
+                databuf.appendChar(flags);
             }
             endAttr(attrIndex);
             return 1;