From e3450ca714ac14a94f86fa7a8e8f84f414da15a5 Mon Sep 17 00:00:00 2001
From: Ashley Nelson <nashley@google.com>
Date: Thu, 22 Feb 2024 19:23:53 -0800
Subject: [Parser] Condense redundant pop values (#6339)

A bit of clean-up, changes getBranchValue to use pop().
---
 src/wasm/wasm-ir-builder.cpp | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/wasm/wasm-ir-builder.cpp b/src/wasm/wasm-ir-builder.cpp
index 6676d1cb4..1df441dad 100644
--- a/src/wasm/wasm-ir-builder.cpp
+++ b/src/wasm/wasm-ir-builder.cpp
@@ -416,19 +416,7 @@ Result<Expression*> IRBuilder::getBranchValue(Name labelName,
   // Loops would receive their input type rather than their output type, if we
   // supported that.
   size_t numValues = (*scope)->getLoop() ? 0 : (*scope)->getResultType().size();
-  std::vector<Expression*> values(numValues);
-  for (size_t i = 0; i < numValues; ++i) {
-    auto val = pop();
-    CHECK_ERR(val);
-    values[numValues - 1 - i] = *val;
-  }
-  if (numValues == 0) {
-    return nullptr;
-  } else if (numValues == 1) {
-    return values[0];
-  } else {
-    return builder.makeTupleMake(values);
-  }
+  return numValues == 0 ? nullptr : pop(numValues);
 }
 
 Result<> IRBuilder::visitBreak(Break* curr, std::optional<Index> label) {
-- 
cgit v1.2.3