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 issue in virtual table generator

Browse Source
This commit is contained in:
Alexey Andreev 2024-08-29 21:14:49 +02:00
parent a0224f60e6
commit cb1f3c6dfc
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,6 +161,7 @@ class WasmGCVirtualTableBuilder {
for (var entry : table.entries) { for (var entry : table.entries) {
indexes.put(entry.method, entry.index); indexes.put(entry.method, entry.index);
} }
table.currentImplementors.putAll(parent.currentImplementors);
} }
var group = groupedMethodsAtCallSites.get(table.cls.getName()); var group = groupedMethodsAtCallSites.get(table.cls.getName());
@ -170,7 +171,7 @@ class WasmGCVirtualTableBuilder {
var entry = new Entry(method, table, table.entries.size()); var entry = new Entry(method, table, table.entries.size());
table.entries.add(entry); table.entries.add(entry);
indexes.put(method, entry.index); indexes.put(method, entry.index);
table.implementors.add(null); table.implementors.add(table.currentImplementors.get(method));
} }
} }
} }
@ -187,6 +188,7 @@ class WasmGCVirtualTableBuilder {
if (index >= 0) { if (index >= 0) {
table.implementors.set(index, method.getReference()); table.implementors.set(index, method.getReference());
} }
table.currentImplementors.put(method.getDescriptor(), method.getReference());
} }
} }
} }
@ -210,6 +212,7 @@ class WasmGCVirtualTableBuilder {
Table parent; Table parent;
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<>();
private WasmGCVirtualTable buildResult; private WasmGCVirtualTable buildResult;
Table(ClassReader cls, int index) { Table(ClassReader cls, int index) {