[GR-33010] Updated WASM API to use instance_export method.

flohuemer · flohuemer · commit c43db7ca0569 · 2021-08-18T12:46:53.000Z
PullRequest: js/2098
diff --git a/graal-js/mx.graal-js/suite.py b/graal-js/mx.graal-js/suite.py
@@ -24,7 +24,7 @@
         {
            "name" : "regex",
            "subdir" : True,
-           "version" : "3ecf62bb01af00121fad8f9b7b13ef5740e0695e",
+           "version" : "5aa724e48260c9e03e579f940d300fc76f509b68",
            "urls" : [
                 {"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
                 {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
diff --git a/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSRealm.java b/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSRealm.java
@@ -385,6 +385,7 @@ public class JSRealm {
     private final Object wasmModuleExports;
     private final Object wasmModuleImports;
     private final Object wasmCustomSections;
+    private final Object wasmInstanceExport;
 
     private final DynamicObject webAssemblyObject;
     private final DynamicObject webAssemblyGlobalConstructor;
@@ -752,6 +753,7 @@ public JSRealm(JSContext context, TruffleLanguage.Env env) {
                 wasmModuleExports = wasmInterop.readMember(wasmObject, "module_exports");
                 wasmModuleImports = wasmInterop.readMember(wasmObject, "module_imports");
                 wasmCustomSections = wasmInterop.readMember(wasmObject, "custom_sections");
+                wasmInstanceExport = wasmInterop.readMember(wasmObject, "instance_export");
             } catch (InteropException ex) {
                 throw Errors.shouldNotReachHere(ex);
             }
@@ -790,6 +792,7 @@ public JSRealm(JSContext context, TruffleLanguage.Env env) {
             this.wasmModuleExports = null;
             this.wasmModuleImports = null;
             this.wasmCustomSections = null;
+            this.wasmInstanceExport = null;
 
             this.webAssemblyObject = null;
             this.webAssemblyGlobalConstructor = null;
@@ -2527,6 +2530,10 @@ public Object getWASMGlobalWrite() {
         return wasmGlobalWrite;
     }
 
+    public Object getWASMInstanceExport() {
+        return wasmInstanceExport;
+    }
+
     public DynamicObject getWebAssemblyModulePrototype() {
         return webAssemblyModulePrototype;
     }
diff --git a/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/builtins/wasm/JSWebAssemblyInstance.java b/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/builtins/wasm/JSWebAssemblyInstance.java
@@ -160,8 +160,7 @@ private static Object createExportsObject(JSContext context, JSRealm realm, Obje
         try {
             Object exportsFunction = realm.getWASMModuleExports();
             Object exportsInfo = InteropLibrary.getUncached(exportsFunction).execute(exportsFunction, wasmModule);
-            Object wasmExports = InteropLibrary.getUncached(wasmInstance).readMember(wasmInstance, "exports");
-            InteropLibrary wasmExportsInterop = InteropLibrary.getUncached(wasmExports);
+            Object instanceExport = realm.getWASMInstanceExport();
             InteropLibrary exportsInterop = InteropLibrary.getUncached(exportsInfo);
             long size = exportsInterop.getArraySize(exportsInfo);
 
@@ -170,7 +169,7 @@ private static Object createExportsObject(JSContext context, JSRealm realm, Obje
                 InteropLibrary exportInterop = InteropLibrary.getUncached(exportInfo);
                 String name = asString(exportInterop.readMember(exportInfo, "name"));
                 String externtype = asString(exportInterop.readMember(exportInfo, "kind"));
-                Object externval = wasmExportsInterop.readMember(wasmExports, name);
+                Object externval = InteropLibrary.getUncached().execute(instanceExport, wasmInstance, name);
                 Object value;
 
                 if ("function".equals(externtype)) {

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`{`
`25`	`25`	`"name" : "regex",`
`26`	`26`	`"subdir" : True,`
`27`		`- "version" : "3ecf62bb01af00121fad8f9b7b13ef5740e0695e",`
	`27`	`+ "version" : "5aa724e48260c9e03e579f940d300fc76f509b68",`
`28`	`28`	`"urls" : [`
`29`	`29`	`{"url" : "https://github.com/oracle/graal.git", "kind" : "git"},`
`30`	`30`	`{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},`