LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-14 17:41:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: #2413 AS3 direct editation - try/catch clause in instance initializer

Browse Source
This commit is contained in:
Jindra Petřík
2025-04-19 22:49:25 +02:00
parent 814cb1a0e1
commit 0ed3f97c29
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AVM2SourceGenerator.java
View File

@@ -826,7 +826,6 @@ public class AVM2SourceGenerator implements SourceGenerator {
}
}
//List<AVM2Instruction> cinitcode = new ArrayList<>();
List<AVM2Instruction> initcode = new ArrayList<>();
for (GraphTargetItem ti : commands) {
if ((ti instanceof SlotAVM2Item) || (ti instanceof ConstAVM2Item)) {
@@ -854,13 +853,6 @@ public class AVM2SourceGenerator implements SourceGenerator {
continue;
}
}
/*if (isStatic && val != null) {
cinitcode.add(ins(AVM2Instructions.FindProperty, traitName(ns, tname)));
localData.isStatic = true;
cinitcode.addAll(toInsList(val.toSource(localData, this)));
cinitcode.add(ins(isConst ? AVM2Instructions.InitProperty : AVM2Instructions.SetProperty, traitName(ns, tname)));
}
*/
if (!isStatic && val != null) {
//do not init basic values, that can be stored in trait
if (!(val instanceof IntegerValueAVM2Item)
@@ -881,11 +873,18 @@ public class AVM2SourceGenerator implements SourceGenerator {
MethodBody initBody = null;
if (!isInterface) {
initBody = abcIndex.getSelectedAbc().findBody(init);
int len = 0;
for (AVM2Instruction ins : initcode) {
len += ins.getBytesLength();
}
initBody.getCode().code.addAll(iinit == null ? 0 : 2, initcode); //after getlocal0,pushscope
/*if (cinitBody.getCode().code.get(cinitBody.getCode().code.size() - 1).definition instanceof ReturnVoidIns) {
cinitBody.getCode().code.addAll(2, cinitcode); //after getlocal0,pushscope
}*/
for (ABCException ex:initBody.exceptions) {
ex.start += len;
ex.end += len;
ex.target += len;
}
}
cinitBody.markOffsets();
cinitBody.autoFillStats(abcIndex.getSelectedAbc(), initScope + (implementsStr.isEmpty() ? 0 : 1), true);