Fix getValue/setValue of pointer types (#17028)

This issue was introduced in #16874 but went unnoticed due to lack of
testing.

Author: sbc100

ChangeLog.md

@@ -20,6 +20,8 @@ See docs/process.md for more on how version tagging works.
 
 3.1.12
 ------
+- Fix crash, introduced in 3.1.11, which occurred when using pointer types
+  (types ending in `*`) with getValue/setValue library functions. (#17028)
 
 3.1.11 - 05/21/2022
 -------------------

src/library_getvalue.js

@@ -11,7 +11,7 @@ var LibraryMemOps = {
       @param {string} type
       @param {number|boolean=} noSafe */`,
   $setValue: function(ptr, value, type = 'i8', noSafe) {
-    if (type.endsWith('*')) type = '{{{ POINTER_TYPE }}}';
+    if (type.endsWith('*')) type = '{{{ POINTER_WASM_TYPE }}}';
 #if SAFE_HEAP
     if (noSafe) {
       switch (type) {
@@ -44,7 +44,7 @@ var LibraryMemOps = {
       @param {string} type
       @param {number|boolean=} noSafe */`,
   $getValue: function(ptr, type = 'i8', noSafe) {
-    if (type.endsWith('*')) type = '{{{ POINTER_TYPE }}}';
+    if (type.endsWith('*')) type = '{{{ POINTER_WASM_TYPE }}}';
 #if SAFE_HEAP
     if (noSafe) {
       switch (type) {

tests/core/getValue_setValue.cpp

@@ -0,0 +1,27 @@
+// Copyright 2017 The Emscripten Authors.  All rights reserved.
+// Emscripten is available under two separate licenses, the MIT license and the
+// University of Illinois/NCSA Open Source License.  Both these licenses can be
+// found in the LICENSE file.
+
+#include<emscripten.h>
+
+int main() {
+  char buffer_char[8] = { 'x' };
+  void* buffer_ptr[] = { (void*)0x12345678 };
+#ifdef DIRECT
+  EM_ASM({
+    out('i32: ' + getValue($0, 'i32'));
+    setValue($0, 1234, 'i32');
+    out('i32: ' + getValue($0, 'i32'));
+    out('ptr: 0x' + getValue($1, '*').toString(16));
+  }, buffer_char, buffer_ptr);
+#else
+  EM_ASM({
+    out('i32: ' + getValue($0, 'i32'));
+    Module['setValue']($0, 1234, 'i32');
+    out('i32: ' + Module['getValue']($0, 'i32'));
+    out('ptr: 0x' + Module['getValue']($1, 'i32').toString(16));
+  }, buffer_char, buffer_ptr);
+#endif
+}
+

tests/core/getValue_setValue.out

@@ -0,0 +1,3 @@
+i32: 120
+i32: 1234
+ptr: 0x12345678

tests/core/test_getValue_setValue.cpp

@@ -7006,8 +7006,8 @@ def test_dyncall_specific(self, *args):
   def test_getValue_setValue(self):
     # these used to be exported, but no longer are by default
     def test(output_prefix='', args=[], assert_returncode=0):
-      src = test_file('core/getValue_setValue.cpp')
-      expected = test_file('core/getValue_setValue' + output_prefix + '.out')
+      src = test_file('core/test_getValue_setValue.cpp')
+      expected = test_file('core/test_getValue_setValue' + output_prefix + '.out')
       self.do_run_from_file(src, expected, assert_returncode=assert_returncode, emcc_args=args)
 
     # see that direct usage (not on module) works. we don't export, but the use