Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jaxp
changeset 800:02d2df45bda8
8062608: BCEL corrupts debug data of methods that use generics
Summary: Fixed MethodGen constructor to not overwrite LocalVariableTable.
Reviewed-by: joehw
author | dbuck |
---|---|
date | Fri, 07 Nov 2014 01:18:43 -0800 |
parents | 9df027c40f0f |
children | 572db6f408a2 |
files | src/com/sun/org/apache/bcel/internal/generic/MethodGen.java |
diffstat | 1 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java Wed Oct 29 10:50:33 2014 -0700 +++ b/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java Fri Nov 07 01:18:43 2014 -0800 @@ -259,10 +259,11 @@ l.getIndex(), start, end); } } else if (a instanceof LocalVariableTypeTable) { - LocalVariable[] lv = ((LocalVariableTypeTable) a).getLocalVariableTypeTable(); - removeLocalVariables(); - for (int k = 0; k < lv.length; k++) { - LocalVariable l = lv[k]; + LocalVariable[] oldLV = ((LocalVariableTypeTable) a).getLocalVariableTypeTable(); + int lvLength = oldLV.length; + LocalVariable[] newLV = new LocalVariable[lvLength]; + for (int k = 0; k < lvLength; k++) { + LocalVariable l = oldLV[k]; InstructionHandle start = il.findHandle(l.getStartPC()); InstructionHandle end = il.findHandle(l.getStartPC() + l.getLength()); // Repair malformed handles @@ -272,9 +273,16 @@ if (null == end) { end = il.getEnd(); } - addLocalVariable(l.getName(), Type.getType(l.getSignature()), l - .getIndex(), start, end); + LocalVariable newVar = new LocalVariable(l); + int startPosition = start.getPosition(); + newVar.setStartPC(startPosition); + newVar.setLength(end.getPosition() - startPosition); + newLV[k] = newVar; } + LocalVariableTypeTable newLVTT = new LocalVariableTypeTable( + (LocalVariableTypeTable)a); + newLVTT.setLocalVariableTable(newLV); + addCodeAttribute(newLVTT); } else addCodeAttribute(a); }