LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 09:50:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

use {} static initializer only when referenced later trait

Browse Source
This commit is contained in:
Jindra Petřík
2021-02-10 21:34:05 +01:00
parent 58eb1f38da
commit 665d3c1fad
1 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
+35 -14
View File
@@ -1947,22 +1947,10 @@ public class AVM2Code implements Cloneable {
multinameIndex = ((FullMultinameAVM2Item) ((SetPropertyAVM2Item) ti).propertyName).multinameIndex;
value = ((SetPropertyAVM2Item) ti).value;
}
if (ti instanceof SetPropertyAVM2Item) {
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) {
for (int j = 0; j < ts.traits.size(); j++) {
Trait t = ts.traits.get(j);
Multiname tm = abc.constants.getMultiname(t.name_index);
if (tm != null && tm.equals(m)) {
if ((t instanceof TraitSlotConst)) {
@@ -1970,6 +1958,39 @@ public class AVM2Code implements Cloneable {
TraitSlotConst tsc = (TraitSlotConst) t;
if (value != null && !convertData.assignedValues.containsKey(tsc)) {
if (ti instanceof SetPropertyAVM2Item) { //only for slots
Set<GraphTargetItem> subItems = value.getAllSubItemsRecursively();
subItems.add(value);
List<Multiname> laterMultinames = new ArrayList<>();
for (int k = j + 1; k < ts.traits.size(); k++) {
int tMultinameIndex = ts.traits.get(k).name_index;
if (tMultinameIndex > 0) {
Multiname tMultiname = abc.constants.getMultiname(tMultinameIndex);
laterMultinames.add(tMultiname);
}
}
for (GraphTargetItem item : subItems) {
//if later slot is referenced, we must add it as {} block instead of direct assignment
if (item instanceof GetPropertyAVM2Item) {
Multiname multiName = abc.constants.getMultiname(((FullMultinameAVM2Item) ((GetPropertyAVM2Item) item).propertyName).multinameIndex);
if (laterMultinames.contains(multiName)) {
continue loopi;
}
}
if (item instanceof GetLexAVM2Item) {
Multiname multiName = ((GetLexAVM2Item) item).propertyName;
if (laterMultinames.contains(multiName)) {
continue loopi;
}
}
if (item instanceof LocalRegAVM2Item) { //it is surely in static initializer block, not in slot/const
continue loopi;
}
}
}
if (value instanceof NewFunctionAVM2Item) {
NewFunctionAVM2Item f = (NewFunctionAVM2Item) value;
f.functionName = tsc.getName(abc).getName(abc.constants, fullyQualifiedNames, true, true);