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

C: fix virtual tables

Browse Source
This commit is contained in:
Alexey Andreev 2019-05-16 18:58:36 +03:00
parent f5c2cf0fa3
commit 816434500c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/teavm/model/classes/VirtualTableProvider.java
View File

@ -107,11 +107,14 @@ public class VirtualTableProvider {
private void copyEntriesFromSupertype(VirtualTable table, VirtualTable supertypeTable) { private void copyEntriesFromSupertype(VirtualTable table, VirtualTable supertypeTable) {
for (VirtualTableEntry parentEntry : supertypeTable.entries.values()) { for (VirtualTableEntry parentEntry : supertypeTable.entries.values()) {
VirtualTableEntry existingEntry = table.entries.get(parentEntry.getMethod());
if (existingEntry == null || existingEntry.getImplementor() == null) {
VirtualTableEntry entry = new VirtualTableEntry(table, parentEntry.getMethod(), VirtualTableEntry entry = new VirtualTableEntry(table, parentEntry.getMethod(),
parentEntry.getImplementor(), parentEntry.getIndex()); parentEntry.getImplementor(), parentEntry.getIndex());
table.entries.put(entry.getMethod(), entry); table.entries.put(entry.getMethod(), entry);
} }
} }
}
public VirtualTableEntry lookup(MethodReference method) { public VirtualTableEntry lookup(MethodReference method) {
VirtualTable vtable = virtualTables.get(interfaceMapping.mapClass(method.getClassName())); VirtualTable vtable = virtualTables.get(interfaceMapping.mapClass(method.getClassName()));