wasm gc: fix support of cast/instanceof for JS types; fix accessing t…

…op-level declarations
konsoletyper · Oct 2, 2024 · 551f050 · 551f050
1 parent a291eb3
commit 551f050
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/core/src/main/resources/org/teavm/backend/wasm/wasm-gc-runtime.js b/core/src/main/resources/org/teavm/backend/wasm/wasm-gc-runtime.js
@@ -156,8 +156,8 @@ TeaVM.wasm = function() {
             appendToArray: (array, e) => array.push(e),
             unwrapBoolean: value => value ? 1 : 0,
             wrapBoolean: value => !!value,
-            getProperty: (obj, prop) => obj[prop],
-            getPropertyPure: (obj, prop) => obj[prop],
+            getProperty: (obj, prop) => obj !== null ? obj[prop] : getGlobalName(prop),
+            getPropertyPure: (obj, prop) => obj !== null ? obj[prop] : getGlobalName(prop),
             setProperty: (obj, prop, value) => obj[prop] = value,
             setPropertyPure: (obj, prop) => obj[prop] = value,
             global: getGlobalName,
@@ -265,6 +265,8 @@ TeaVM.wasm = function() {
                 }
             },
             isPrimitive: (value, type) => typeof value === type,
+            instanceOf: (value, type) => value instanceof type,
+            instanceOfOrNull: (value, type) => value === null || value instanceof type,
             sameRef: (a, b) => a === b,
             hashCode: (obj) => {
                 if (typeof obj === "object" || typeof obj === "function" || typeof obj === "symbol") {
@@ -293,7 +295,8 @@ TeaVM.wasm = function() {
         for (let i = 0; i < 32; ++i) {
             imports.teavmJso["createFunction" + i] = (...args) => new Function(...args);
             imports.teavmJso["callFunction" + i] = (fn, ...args) => fn(...args);
-            imports.teavmJso["callMethod" + i] = (instance, method, ...args) => instance[method](...args);
+            imports.teavmJso["callMethod" + i] = (instance, method, ...args) =>
+                instance !== null ? instance[method](...args) : getGlobalName(method)(...args);
             imports.teavmJso["construct" + i] = (constructor, ...args) => new constructor(...args);
         }
     }

diff --git a/jso/impl/src/main/java/org/teavm/jso/impl/JS.java b/jso/impl/src/main/java/org/teavm/jso/impl/JS.java
@@ -756,10 +756,12 @@ public static native JSObject construct(JSObject cls, JSObject a, JSObject b, JS
 
     @InjectedBy(JSNativeInjector.class)
     @NoSideEffects
+    @Import(name = "instanceOf", module = "teavmJso")
     public static native boolean instanceOf(JSObject obj, JSObject cls);
 
     @InjectedBy(JSNativeInjector.class)
     @NoSideEffects
+    @Import(name = "instanceOfOrNull", module = "teavmJso")
     public static native boolean instanceOfOrNull(JSObject obj, JSObject cls);
 
     @InjectedBy(JSNativeInjector.class)