adjust LineNumberTable and LocalVariableTable when removing instructions

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@623 379699f6-c40d-0410-875b-85095c16579e
stable
jochen 26 years ago
parent 31ab5d096f
commit 9777f1ccaa
  1. 58
      jode/jode/bytecode/Instruction.java

@ -167,7 +167,6 @@ public class Instruction implements Opcodes{
* Removes this instruction (as if it would be replaced by a nop). * Removes this instruction (as if it would be replaced by a nop).
*/ */
public void removeInstruction() { public void removeInstruction() {
try{
/* remove from chained list */ /* remove from chained list */
if (prevByAddr != null) if (prevByAddr != null)
prevByAddr.nextByAddr = nextByAddr; prevByAddr.nextByAddr = nextByAddr;
@ -228,23 +227,50 @@ public class Instruction implements Opcodes{
i--; i--;
} }
} }
} catch (Exception ex) {
ex.printStackTrace(); /* adjust local variable table and line number table */
System.err.println(getDescription()+ " " LocalVariableInfo[] lvt = codeinfo.getLocalVariableTable();
+ Integer.toHexString(hashCode())); if (lvt != null) {
if (succs != null) { for (int i=0; i< lvt.length; i++) {
System.err.print("\tsuccs: "+succs[0]); if (lvt[i].start == this)
for (int i = 1; i < succs.length; i++) lvt[i].start = nextByAddr;
System.err.print(", "+succs[i]); if (lvt[i].end == this)
System.err.println(); lvt[i].end = prevByAddr;
if (lvt[i].start == null
|| lvt[i].end == null
|| lvt[i].end.nextByAddr == lvt[i].start) {
/* Remove the local variable info.
* This is very seldom, so we can make it slow */
LocalVariableInfo[] newLVT =
new LocalVariableInfo[lvt.length - 1];
System.arraycopy(lvt, 0, newLVT, 0, i);
System.arraycopy(lvt, i+1, newLVT, i,
newLVT.length - i);
lvt = newLVT;
codeinfo.setLocalVariableTable(newLVT);
i--;
}
}
}
LineNumber[] lnt = codeinfo.getLineNumberTable();
if (lnt != null) {
for (int i=0; i< lnt.length; i++) {
if (lnt[i].start == this)
lnt[i].start = nextByAddr;
if (lnt[i].start == null
|| (i+1 < lnt.length && lnt[i].start == lnt[i+1].start)) {
/* Remove the line number.
* This is very seldom, so we can make it slow */
LineNumber[] newLNT =
new LineNumber[lnt.length - 1];
System.arraycopy(lnt, 0, newLNT, 0, i);
System.arraycopy(lnt, i+1, newLNT, i,
newLNT.length - i);
lnt = newLNT;
codeinfo.setLineNumberTable(newLNT);
i--;
} }
if (preds != null) {
System.err.print("\tpreds: " + preds[0]);
for (int i=1; i < preds.length; i++)
System.err.print(", " + preds[i]);
System.err.println();
} }
codeinfo.dumpCode(System.err);
} }
} }

Loading…
Cancel
Save