Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 10239:70a678a6f975
8061830: [asm] refresh internal ASM version v5.0.3
Reviewed-by: psandoz, sundar
line wrap: on
line diff
--- a/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java Fri Nov 07 01:51:06 2014 +0300 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java Fri Oct 24 06:18:00 2014 -0700 @@ -1858,7 +1858,7 @@ break; case 'B': // pointer to CONSTANT_Byte av.visit(name, - new Byte((byte) readInt(items[readUnsignedShort(v)]))); + (byte) readInt(items[readUnsignedShort(v)])); v += 2; break; case 'Z': // pointer to CONSTANT_Boolean @@ -1868,13 +1868,13 @@ v += 2; break; case 'S': // pointer to CONSTANT_Short - av.visit(name, new Short( - (short) readInt(items[readUnsignedShort(v)]))); + av.visit(name, + (short) readInt(items[readUnsignedShort(v)])); v += 2; break; case 'C': // pointer to CONSTANT_Char - av.visit(name, new Character( - (char) readInt(items[readUnsignedShort(v)]))); + av.visit(name, + (char) readInt(items[readUnsignedShort(v)])); v += 2; break; case 's': // pointer to CONSTANT_Utf8 @@ -2498,13 +2498,13 @@ int index = items[item]; switch (b[index - 1]) { case ClassWriter.INT: - return new Integer(readInt(index)); + return readInt(index); case ClassWriter.FLOAT: - return new Float(Float.intBitsToFloat(readInt(index))); + return Float.intBitsToFloat(readInt(index)); case ClassWriter.LONG: - return new Long(readLong(index)); + return readLong(index); case ClassWriter.DOUBLE: - return new Double(Double.longBitsToDouble(readLong(index))); + return Double.longBitsToDouble(readLong(index)); case ClassWriter.CLASS: return Type.getObjectType(readUTF8(index, buf)); case ClassWriter.STR:
--- a/src/share/classes/jdk/internal/org/objectweb/asm/TypePath.java Fri Nov 07 01:51:06 2014 +0300 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/TypePath.java Fri Oct 24 06:18:00 2014 -0700 @@ -181,6 +181,9 @@ typeArg = typeArg * 10 + c - '0'; i += 1; } + if (i < n && typePath.charAt(i) == ';') { + i += 1; + } out.put11(TYPE_ARGUMENT, typeArg); } } @@ -193,7 +196,7 @@ * ARRAY_ELEMENT} steps are represented with '[', {@link #INNER_TYPE * INNER_TYPE} steps with '.', {@link #WILDCARD_BOUND WILDCARD_BOUND} steps * with '*' and {@link #TYPE_ARGUMENT TYPE_ARGUMENT} steps with their type - * argument index in decimal form. + * argument index in decimal form followed by ';'. */ @Override public String toString() { @@ -211,7 +214,7 @@ result.append('*'); break; case TYPE_ARGUMENT: - result.append(getStepArgument(i)); + result.append(getStepArgument(i)).append(';'); break; default: result.append('_');
--- a/src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java Fri Nov 07 01:51:06 2014 +0300 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java Fri Oct 24 06:18:00 2014 -0700 @@ -408,7 +408,7 @@ } else if (value >= Short.MIN_VALUE && value <= Short.MAX_VALUE) { mv.visitIntInsn(Opcodes.SIPUSH, value); } else { - mv.visitLdcInsn(new Integer(value)); + mv.visitLdcInsn(value); } } @@ -422,7 +422,7 @@ if (value == 0L || value == 1L) { mv.visitInsn(Opcodes.LCONST_0 + (int) value); } else { - mv.visitLdcInsn(new Long(value)); + mv.visitLdcInsn(value); } } @@ -437,7 +437,7 @@ if (bits == 0L || bits == 0x3f800000 || bits == 0x40000000) { // 0..2 mv.visitInsn(Opcodes.FCONST_0 + (int) value); } else { - mv.visitLdcInsn(new Float(value)); + mv.visitLdcInsn(value); } } @@ -452,7 +452,7 @@ if (bits == 0L || bits == 0x3ff0000000000000L) { // +0.0d and 1.0d mv.visitInsn(Opcodes.DCONST_0 + (int) value); } else { - mv.visitLdcInsn(new Double(value)); + mv.visitLdcInsn(value); } } @@ -1647,11 +1647,13 @@ */ public void catchException(final Label start, final Label end, final Type exception) { + Label doCatch = new Label(); if (exception == null) { - mv.visitTryCatchBlock(start, end, mark(), null); + mv.visitTryCatchBlock(start, end, doCatch, null); } else { - mv.visitTryCatchBlock(start, end, mark(), + mv.visitTryCatchBlock(start, end, doCatch, exception.getInternalName()); } + mark(doCatch); } }
--- a/src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java Fri Nov 07 01:51:06 2014 +0300 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java Fri Oct 24 06:18:00 2014 -0700 @@ -737,7 +737,7 @@ } else if (cst >= Short.MIN_VALUE && cst <= Short.MAX_VALUE) { mv.visitIntInsn(Opcodes.SIPUSH, cst); } else { - mv.visitLdcInsn(new Integer(cst)); + mv.visitLdcInsn(cst); } } @@ -745,7 +745,7 @@ if (cst == 0L || cst == 1L) { mv.visitInsn(Opcodes.LCONST_0 + (int) cst); } else { - mv.visitLdcInsn(new Long(cst)); + mv.visitLdcInsn(cst); } } @@ -754,7 +754,7 @@ if (bits == 0L || bits == 0x3f800000 || bits == 0x40000000) { // 0..2 mv.visitInsn(Opcodes.FCONST_0 + (int) cst); } else { - mv.visitLdcInsn(new Float(cst)); + mv.visitLdcInsn(cst); } } @@ -763,7 +763,7 @@ if (bits == 0L || bits == 0x3ff0000000000000L) { // +0.0d and 1.0d mv.visitInsn(Opcodes.DCONST_0 + (int) cst); } else { - mv.visitLdcInsn(new Double(cst)); + mv.visitLdcInsn(cst); } }
--- a/src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java Fri Nov 07 01:51:06 2014 +0300 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java Fri Oct 24 06:18:00 2014 -0700 @@ -366,8 +366,7 @@ protected void addSVUID(long svuid) { FieldVisitor fv = super.visitField(Opcodes.ACC_FINAL - + Opcodes.ACC_STATIC, "serialVersionUID", "J", null, new Long( - svuid)); + + Opcodes.ACC_STATIC, "serialVersionUID", "J", null, svuid); if (fv != null) { fv.visitEnd(); }
--- a/src/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java Fri Nov 07 01:51:06 2014 +0300 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java Fri Oct 24 06:18:00 2014 -0700 @@ -247,11 +247,13 @@ an.accept(av.visitAnnotation(name, an.desc)); } else if (value instanceof List) { AnnotationVisitor v = av.visitArray(name); - List<?> array = (List<?>) value; - for (int j = 0; j < array.size(); ++j) { - accept(v, null, array.get(j)); + if (v != null) { + List<?> array = (List<?>) value; + for (int j = 0; j < array.size(); ++j) { + accept(v, null, array.get(j)); + } + v.visitEnd(); } - v.visitEnd(); } else { av.visit(name, value); }
--- a/src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java Fri Nov 07 01:51:06 2014 +0300 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java Fri Oct 24 06:18:00 2014 -0700 @@ -110,7 +110,7 @@ : labels.length); if (keys != null) { for (int i = 0; i < keys.length; ++i) { - this.keys.add(new Integer(keys[i])); + this.keys.add(keys[i]); } } if (labels != null) {
--- a/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java Fri Nov 07 01:51:06 2014 +0300 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java Fri Oct 24 06:18:00 2014 -0700 @@ -160,6 +160,7 @@ @Override public void accept(final MethodVisitor mv) { mv.visitMethodInsn(opcode, owner, name, desc, itf); + acceptAnnotations(mv); } @Override
--- a/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java Fri Nov 07 01:51:06 2014 +0300 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java Fri Oct 24 06:18:00 2014 -0700 @@ -802,7 +802,7 @@ if (labels.get(label) != null) { throw new IllegalArgumentException("Already visited label"); } - labels.put(label, new Integer(insnCount)); + labels.put(label, insnCount); super.visitLabel(label); }
--- a/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java Fri Nov 07 01:51:06 2014 +0300 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java Fri Oct 24 06:18:00 2014 -0700 @@ -732,7 +732,7 @@ Textifier t = createTextifier(); text.add(t.getText()); text.add(visible ? ") // parameter " : ") // invisible, parameter "); - text.add(new Integer(parameter)); + text.add(parameter); text.add("\n"); return t; }
--- a/src/share/classes/jdk/internal/org/objectweb/asm/version.txt Fri Nov 07 01:51:06 2014 +0300 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/version.txt Fri Oct 24 06:18:00 2014 -0700 @@ -1,12 +1,12 @@ Path: . -Working Copy Root Path: /hudson/jobs/objectweb-pull/workspace/asm-svn-2014-06-19 +Working Copy Root Path: /hudson/jobs/objectweb-init/workspace/asm-svn-2014-10-15 URL: file:///svnroot/asm/trunk/asm Repository Root: file:///svnroot/asm Repository UUID: 271bd773-ee82-43a6-9b2b-1890ed8ce7f9 -Revision: 1750 +Revision: 1772 Node Kind: directory Schedule: normal -Last Changed Author: forax -Last Changed Rev: 1750 -Last Changed Date: 2014-06-06 00:31:02 +0200 (Fri, 06 Jun 2014) +Last Changed Author: ebruneton +Last Changed Rev: 1772 +Last Changed Date: 2014-09-06 09:13:07 +0200 (Sat, 06 Sep 2014)