[WebAssembly,llvm] Fix buildbot problems with llvm.wasm.ref.test.func

[hoodmane]

PR #147486 broke the sanitizer and expensive-checks buildbot.

These captures were needed when toWasmValType emitted a diagnostic but are no longer needed since we changed it to an assertion failure. This removes the unneeded captures and should fix the sanitizer-buildbot.

I also fixed the codegen in the wasm64 target: table.get requires an i32 but in wasm64 the function pointer is an i64. We need an additional i32.wrap_i64 to convert it. I also added -verify-machineinstrs to the tests so that the test suite validates this fix.

Finally, I noticed that #150201 uses a feature of the intrinsic that is not covered by the tests, namely ptr arguments. So I added one additional test case to ensure that it works properly.

cc @dschuff

[llvmbot]

@llvm/pr-subscribers-backend-webassembly

Author: Hood Chatham (hoodmane)

Changes

PR #147486 broke the sanitizer buildbot. These captures were needed when toWasmValType emitted a diagnostic but are no longer needed since we changed it to an assertion failure.
This removes the unneeded captures and should fix the sanitizer-buildbot.

cc @dschuff

---

Full diff: https://github.com/llvm/llvm-project/pull/150116.diff

1 Files Affected:

• (modified) llvm/lib/Target/WebAssembly/WebAssemblyISelDAGToDAG.cpp (+1-1)

diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyISelDAGToDAG.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyISelDAGToDAG.cpp
index a7991319be8c7..dfc5a6d78756d 100644
--- a/llvm/lib/Target/WebAssembly/WebAssemblyISelDAGToDAG.cpp
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyISelDAGToDAG.cpp
@@ -123,7 +123,7 @@ static SDValue getTagSymNode(int Tag, SelectionDAG *DAG) {
 static APInt encodeFunctionSignature(SelectionDAG *DAG, SDLoc &DL,
                                      SmallVector<MVT, 4> &Returns,
                                      SmallVector<MVT, 4> &Params) {
-  auto toWasmValType = [&DAG, &DL](MVT VT) {
+  auto toWasmValType = [](MVT VT) {
     if (VT == MVT::i32) {
       return wasm::ValType::I32;
     }

[dschuff]

I'll wait for the tests to run and then merge.