From a1e8bdc1d162f1f72e545960e552cf13b6c82be5 Mon Sep 17 00:00:00 2001 From: Ashley Nelson Date: Mon, 20 Nov 2023 21:55:47 -0800 Subject: [IRBuilder] Add visitCallIndirect and makeCallIndirect (#6127) Adds support for call_indirect to wasm-ir-builder. Tests this works by outlining a sequence including call_indirect. --- src/wasm-ir-builder.h | 1 + src/wasm/wasm-ir-builder.cpp | 14 ++++++++++++++ 2 files changed, 15 insertions(+) (limited to 'src') diff --git a/src/wasm-ir-builder.h b/src/wasm-ir-builder.h index 0089f547f..d9075952d 100644 --- a/src/wasm-ir-builder.h +++ b/src/wasm-ir-builder.h @@ -201,6 +201,7 @@ public: [[nodiscard]] Result<> visitSwitch(Switch*, std::optional defaultLabel = std::nullopt); [[nodiscard]] Result<> visitCall(Call*); + [[nodiscard]] Result<> visitCallIndirect(CallIndirect*); [[nodiscard]] Result<> visitCallRef(CallRef*); private: diff --git a/src/wasm/wasm-ir-builder.cpp b/src/wasm/wasm-ir-builder.cpp index a4a4ec5d0..964676ff9 100644 --- a/src/wasm/wasm-ir-builder.cpp +++ b/src/wasm/wasm-ir-builder.cpp @@ -419,6 +419,20 @@ Result<> IRBuilder::visitCall(Call* curr) { return Ok{}; } +Result<> IRBuilder::visitCallIndirect(CallIndirect* curr) { + auto target = pop(); + CHECK_ERR(target); + curr->target = *target; + auto numArgs = curr->heapType.getSignature().params.size(); + curr->operands.resize(numArgs); + for (size_t i = 0; i < numArgs; ++i) { + auto arg = pop(); + CHECK_ERR(arg); + curr->operands[numArgs - 1 - i] = *arg; + } + return Ok{}; +} + Result<> IRBuilder::visitCallRef(CallRef* curr) { auto target = pop(); CHECK_ERR(target); -- cgit v1.2.3