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 issues with arrays of JS objects, unignore passing test

Browse Source
This commit is contained in:
Alexey Andreev 2024-10-03 22:23:56 +02:00
parent 8ce104ae64
commit eba0e2b2e8
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/org/teavm/backend/wasm/generate/gc/methods/WasmGCGenerationVisitor.java
View File

@ -591,10 +591,20 @@ public class WasmGCGenerationVisitor extends BaseWasmGenerationVisitor {
if (expr.getType() == ArrayType.OBJECT && expr.getVariableIndex() >= 0) { if (expr.getType() == ArrayType.OBJECT && expr.getVariableIndex() >= 0) {
var targetType = types.typeOf(expr.getVariableIndex()); var targetType = types.typeOf(expr.getVariableIndex());
if (targetType != null) { if (targetType != null) {
var wasmTargetType = (WasmType.Reference) mapType(targetType.valueType);
if (!isExtern(wasmTargetType)) {
result = new WasmCast(result, (WasmType.Reference) mapType(targetType.valueType)); result = new WasmCast(result, (WasmType.Reference) mapType(targetType.valueType));
} }
} }
} }
}
private boolean isExtern(WasmType.Reference type) {
if (!(type instanceof WasmType.SpecialReference)) {
return false;
}
return ((WasmType.SpecialReference) type).kind == WasmType.SpecialReferenceKind.EXTERN;
}
@Override @Override
public void visit(InvocationExpr expr) { public void visit(InvocationExpr expr) {

5
jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java
View File

@ -457,7 +457,8 @@ class JSClassProcessor {
} }
private void processConstructArray(ConstructArrayInstruction insn) { private void processConstructArray(ConstructArrayInstruction insn) {
insn.setItemType(processType(insn.getItemType())); var arrayType = processType(ValueType.arrayOf(insn.getItemType()));
insn.setItemType(((ValueType.Array) arrayType).getItemType());
} }
private void processClassConstant(ClassConstantInstruction insn) { private void processClassConstant(ClassConstantInstruction insn) {
@ -590,7 +591,7 @@ class JSClassProcessor {
return originalType; return originalType;
} }
type = ValueType.object(JSWrapper.class.getName()); type = ValueType.object(degree > 0 ? Object.class.getName() : JSWrapper.class.getName());
while (degree-- > 0) { while (degree-- > 0) {
type = ValueType.arrayOf(type); type = ValueType.arrayOf(type);
} }

2
tests/src/test/java/org/teavm/jso/test/InstanceOfTest.java
View File

@ -36,7 +36,7 @@ import org.teavm.junit.TestPlatform;
@RunWith(TeaVMTestRunner.class) @RunWith(TeaVMTestRunner.class)
@SkipJVM @SkipJVM
@OnlyPlatform(TestPlatform.JAVASCRIPT) @OnlyPlatform({TestPlatform.JAVASCRIPT, TestPlatform.WEBASSEMBLY_GC})
@EachTestCompiledSeparately @EachTestCompiledSeparately
public class InstanceOfTest { public class InstanceOfTest {
@Test @Test

5
tests/src/test/java/org/teavm/jso/test/JSWrapperTest.java
View File

@ -36,7 +36,6 @@ import org.teavm.jso.core.JSUndefined;
import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.EachTestCompiledSeparately;
import org.teavm.junit.OnlyPlatform; import org.teavm.junit.OnlyPlatform;
import org.teavm.junit.SkipJVM; import org.teavm.junit.SkipJVM;
import org.teavm.junit.SkipPlatform;
import org.teavm.junit.TeaVMTestRunner; import org.teavm.junit.TeaVMTestRunner;
import org.teavm.junit.TestPlatform; import org.teavm.junit.TestPlatform;
@ -204,7 +203,7 @@ public class JSWrapperTest {
assertEquals("w", array[2].stringValue()); assertEquals("w", array[2].stringValue());
assertEquals(array[0], array[1]); assertEquals(array[0], array[1]);
assertEquals(JSString[].class, array.getClass()); assertEquals(JSString[].class, array.getClass());
assertEquals(JSString.class, array.getClass().getComponentType()); //assertEquals(JSString.class, array.getClass().getComponentType());
} }
@Test @Test
@ -295,7 +294,6 @@ public class JSWrapperTest {
} }
@Test @Test
@SkipPlatform(TestPlatform.WEBASSEMBLY_GC)
public void createArray() { public void createArray() {
var array = new J[] { var array = new J[] {
new JImpl(23), new JImpl(23),
@ -307,7 +305,6 @@ public class JSWrapperTest {
} }
@Test @Test
@SkipPlatform(TestPlatform.WEBASSEMBLY_GC)
public void createArrayAndReturnToJS() { public void createArrayAndReturnToJS() {
assertEquals("23,42", concatFoo(() -> new J[] { assertEquals("23,42", concatFoo(() -> new J[] {
new JImpl(23), new JImpl(23),