ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

decompiler: removeLast helper to avoid possible errors

Browse Source
This commit is contained in:
Egor.Ushakov
2015-03-25 19:27:51 +03:00
parent 5770d25e59
commit ce31439c20
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
View File

@@ -252,7 +252,7 @@ public class DeadCodeHelper {
Instruction instr = block.getLastInstruction();
if (instr != null && instr.opcode == CodeConstants.opc_goto) {
block.getSeq().removeInstruction(block.getSeq().length() - 1);
block.getSeq().removeLast();
}
}

8
src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
View File

@@ -863,11 +863,11 @@ public class FinallyProcessor {
if ((type & 2) > 0) { // last
if (finallytype == 0 || finallytype == 2) {
seqPattern.removeInstruction(seqPattern.length() - 1);
seqPattern.removeLast();
}
if (finallytype == 2) {
seqPattern.removeInstruction(seqPattern.length() - 1);
seqPattern.removeLast();
}
}
}
@@ -1078,11 +1078,11 @@ public class FinallyProcessor {
if ((blocktype & 2) > 0) { // last
if (finallytype == 2 || finallytype == 0) {
seq.removeInstruction(seq.length() - 1);
seq.removeLast();
}
if (finallytype == 2) { // astore
seq.removeInstruction(seq.length() - 1);
seq.removeLast();
}
}
}