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

wasm gc: fix building virtual tables for interface default methods

Browse Source
This commit is contained in:
Alexey Andreev 2024-09-03 14:16:52 +02:00
parent 019eb4500c
commit 8038d68963
1 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
core/src/main/java/org/teavm/backend/wasm/gc/vtable/WasmGCVirtualTableBuilder.java
View File

@ -162,19 +162,7 @@ class WasmGCVirtualTableBuilder {
indexes.put(entry.method, entry.index); indexes.put(entry.method, entry.index);
} }
table.currentImplementors.putAll(parent.currentImplementors); table.currentImplementors.putAll(parent.currentImplementors);
} table.interfaces.addAll(parent.interfaces);
var group = groupedMethodsAtCallSites.get(table.cls.getName());
if (group != null) {
table.used = true;
for (var method : group) {
if (indexes.getOrDefault(method, -1) < 0) {
var entry = new Entry(method, table, table.entries.size());
table.entries.add(entry);
indexes.put(method, entry.index);
table.implementors.add(table.currentImplementors.get(method));
}
}
} }
for (var method : table.cls.getMethods()) { for (var method : table.cls.getMethods()) {
@ -185,13 +173,56 @@ class WasmGCVirtualTableBuilder {
if (!isVirtual.test(method.getReference())) { if (!isVirtual.test(method.getReference())) {
continue; continue;
} }
var index = indexes.getOrDefault(method.getDescriptor(), -1);
if (index >= 0) {
table.implementors.set(index, method.getReference());
}
table.currentImplementors.put(method.getDescriptor(), method.getReference()); table.currentImplementors.put(method.getDescriptor(), method.getReference());
} }
} }
for (var itfName : table.cls.getInterfaces()) {
fillFromInterfaces(itfName, table);
}
var group = groupedMethodsAtCallSites.get(table.cls.getName());
if (group != null) {
table.used = true;
for (var method : group) {
if (indexes.getOrDefault(method, -1) < 0) {
var entry = new Entry(method, table, table.entries.size());
table.entries.add(entry);
indexes.put(method, entry.index);
table.implementors.add(null);
}
}
}
for (var entry : indexes) {
var implementor = table.currentImplementors.get(entry.key);
table.implementors.set(entry.value, implementor);
}
}
private void fillFromInterfaces(String itfName, Table table) {
if (!table.interfaces.add(itfName)) {
return;
}
var cls = classes.get(itfName);
if (cls == null) {
return;
}
for (var method : cls.getMethods()) {
if (!method.hasModifier(ElementModifier.STATIC) && !method.hasModifier(ElementModifier.ABSTRACT)) {
if (method.getProgram() == null && !method.hasModifier(ElementModifier.NATIVE)) {
continue;
}
if (!isVirtual.test(method.getReference())) {
continue;
}
if (table.currentImplementors.get(method.getDescriptor()) == null) {
table.currentImplementors.put(method.getDescriptor(), method.getReference());
}
}
}
for (var superItf : cls.getInterfaces()) {
fillFromInterfaces(superItf, table);
}
} }
private void buildResult() { private void buildResult() {
@ -215,6 +246,7 @@ class WasmGCVirtualTableBuilder {
List<Entry> entries = new ArrayList<>(); List<Entry> entries = new ArrayList<>();
List<MethodReference> implementors = new ArrayList<>(); List<MethodReference> implementors = new ArrayList<>();
Map<MethodDescriptor, MethodReference> currentImplementors = new HashMap<>(); Map<MethodDescriptor, MethodReference> currentImplementors = new HashMap<>();
Set<String> interfaces = new HashSet<>();
private WasmGCVirtualTable buildResult; private WasmGCVirtualTable buildResult;
Table(ClassReader cls, int index) { Table(ClassReader cls, int index) {