Merge pull request #21 from Jackkal/FixMissingStaticInitializer

Issue #835 - Static initializer missing
This commit is contained in:
Jindra Petřík
2015-04-06 18:47:56 +02:00

View File

@@ -1645,10 +1645,12 @@ public class AVM2Code implements Cloneable {
if (t.name_index == multinameIndex) {
if ((t instanceof TraitSlotConst)) {
if (((TraitSlotConst) t).isConst() || isStaticInitializer) {
((TraitSlotConst) t).assignedValue = value;
list.remove(i);
i--;
continue;
if ((((TraitSlotConst) t).assignedValue) == null) {
((TraitSlotConst) t).assignedValue = value;
list.remove(i);
i--;
continue;
}
}
break;
}
@@ -1665,9 +1667,7 @@ public class AVM2Code implements Cloneable {
for (GraphTargetItem ti : list) {
if (!(ti instanceof ReturnVoidAVM2Item)) {
if (!(ti instanceof InitPropertyAVM2Item)) {
if (!(ti instanceof SetPropertyAVM2Item)) {
newList.add(ti);
}
newList.add(ti);
}
}
}