eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-23 00:24:11 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't write Structure, Function and Address to GC roots

Browse Source
This commit is contained in:
Alexey Andreev 2016-09-08 19:17:06 +03:00
parent 3370898a54
commit d76598ab68
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/org/teavm/backend/wasm/Example.java
View File

@ -36,6 +36,7 @@ public final class Example {
testArrayCopy(); testArrayCopy();
testArrayIsObject(); testArrayIsObject();
testIsAssignableFrom(); testIsAssignableFrom();
testGC();
} }
private static void testFibonacci() { private static void testFibonacci() {
@ -142,6 +143,17 @@ public final class Example {
println("Base.isAssignableFrom(A) = " + Base.class.isAssignableFrom(A.class)); println("Base.isAssignableFrom(A) = " + Base.class.isAssignableFrom(A.class));
} }
private static void testGC() {
List<Integer> list = new ArrayList<>();
for (int i = 0; i < 100000; ++i) {
list.add(i);
if (list.size() == 1000) {
list = new ArrayList<>();
}
}
print("GC complete");
}
private static Base instance(int index) { private static Base instance(int index) {
switch (index) { switch (index) {
case 0: case 0:

30
core/src/main/java/org/teavm/backend/wasm/generate/WasmClassGenerator.java
View File

@ -226,7 +226,7 @@ public class WasmClassGenerator {
private List<FieldReference> getReferenceFields(ClassReader cls) { private List<FieldReference> getReferenceFields(ClassReader cls) {
return cls.getFields().stream() return cls.getFields().stream()
.filter(field -> !field.hasModifier(ElementModifier.STATIC)) .filter(field -> !field.hasModifier(ElementModifier.STATIC))
.filter(field -> !(field.getType() instanceof ValueType.Primitive)) .filter(field -> isReferenceType(field.getType()))
.map(field -> field.getReference()) .map(field -> field.getReference())
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@ -234,11 +234,37 @@ public class WasmClassGenerator {
private List<FieldReference> getStaticReferenceFields(ClassReader cls) { private List<FieldReference> getStaticReferenceFields(ClassReader cls) {
return cls.getFields().stream() return cls.getFields().stream()
.filter(field -> field.hasModifier(ElementModifier.STATIC)) .filter(field -> field.hasModifier(ElementModifier.STATIC))
.filter(field -> !(field.getType() instanceof ValueType.Primitive)) .filter(field -> isReferenceType(field.getType()))
.map(field -> field.getReference()) .map(field -> field.getReference())
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
private boolean isReferenceType(ValueType type) {
if (type instanceof ValueType.Primitive) {
return false;
} else if (type instanceof ValueType.Object) {
ClassReader cls = classSource.get(((ValueType.Object) type).getClassName());
if (cls == null) {
return true;
}
if (cls.getName().equals(Address.class.getName())) {
return true;
}
while (cls != null) {
if (cls.getName().equals(Structure.class.getName()) || cls.getName().equals(Function.class.getName())) {
return false;
}
if (cls.getParent() == null || cls.getParent().equals(cls.getName())) {
return true;
}
cls = classSource.get(cls.getParent());
}
return true;
} else {
return true;
}
}
private void fillVirtualTable(VirtualTable vtable, DataValue array) { private void fillVirtualTable(VirtualTable vtable, DataValue array) {
int index = 0; int index = 0;
for (VirtualTableEntry vtableEntry : vtable.getEntries().values()) { for (VirtualTableEntry vtableEntry : vtable.getEntries().values()) {