summaryrefslogtreecommitdiff
path: root/src/wasm/wasm-ir-builder.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/wasm/wasm-ir-builder.cpp')
-rw-r--r--src/wasm/wasm-ir-builder.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/wasm/wasm-ir-builder.cpp b/src/wasm/wasm-ir-builder.cpp
index ffd0b8674..a7c743970 100644
--- a/src/wasm/wasm-ir-builder.cpp
+++ b/src/wasm/wasm-ir-builder.cpp
@@ -378,18 +378,10 @@ Result<> IRBuilder::visitReturn(Return* curr) {
size_t n = func->getResults().size();
if (n == 0) {
curr->value = nullptr;
- } else if (n == 1) {
- auto val = pop();
+ } else {
+ auto val = pop(n);
CHECK_ERR(val);
curr->value = *val;
- } else {
- std::vector<Expression*> vals(n);
- for (size_t i = 0; i < n; ++i) {
- auto val = pop();
- CHECK_ERR(val);
- vals[n - i - 1] = *val;
- }
- curr->value = builder.makeTupleMake(vals);
}
return Ok{};
}