LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-11 05:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: #1188 AS3 Static initializer - init slot/const only when not referencing other property

Browse Source
This commit is contained in:
Jindra Petřík
2021-02-10 20:47:23 +01:00
parent cd1e28db42
commit c573e57976
7 changed files with 79 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
View File

@@ -252,6 +252,8 @@ import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.CoerceAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.ConvertAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.GetLexAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.GetPropertyAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.InitPropertyAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.NewActivationAVM2Item;
@@ -1945,6 +1947,17 @@ public class AVM2Code implements Cloneable {
multinameIndex = ((FullMultinameAVM2Item) ((SetPropertyAVM2Item) ti).propertyName).multinameIndex;
value = ((SetPropertyAVM2Item) ti).value;
}
Set<GraphTargetItem> subItems = value.getAllSubItemsRecursively();
subItems.add(value);
for (GraphTargetItem item : subItems) {
if ((item instanceof GetPropertyAVM2Item) || (item instanceof GetLexAVM2Item)) { //references other property
continue loopi;
}
if (item instanceof LocalRegAVM2Item) { //it is surely in static initializer block, not in slot/const
continue loopi;
}
}
Multiname m = abc.constants.getMultiname(multinameIndex);
for (Traits ts : initTraits) {
for (Trait t : ts.traits) {