From 9a0f992cb3242108ddf64d65476097d8742f2204 Mon Sep 17 00:00:00 2001
From: Michael Mueller <mich@elmueller.net>
Date: Tue, 8 Dec 2020 17:24:59 +0100
Subject: [PATCH] Use results length as arity

---
 src/stack_height/max_height.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/stack_height/max_height.rs b/src/stack_height/max_height.rs
index f270bb5..260345e 100644
--- a/src/stack_height/max_height.rs
+++ b/src/stack_height/max_height.rs
@@ -173,11 +173,7 @@ pub(crate) fn compute(func_idx: u32, module: &elements::Module) -> Result<u32, E
 
 	// Add implicit frame for the function. Breaks to this frame and execution of
 	// the last end should deal with this frame.
-	let func_arity: u32 = if !func_signature.results().is_empty() {
-		1
-	} else {
-		0
-	};
+	let func_arity = func_signature.results().len() as u32;
 	stack.push_frame(Frame {
 		is_polymorphic: false,
 		end_arity: func_arity,
@@ -279,7 +275,7 @@ pub(crate) fn compute(func_idx: u32, module: &elements::Module) -> Result<u32, E
 				stack.pop_values(ty.params().len() as u32)?;
 
 				// Push result of the function execution to the stack.
-				let callee_arity = if !ty.results().is_empty() { 1 } else { 0 };
+				let callee_arity = ty.results().len() as u32;
 				stack.push_values(callee_arity)?;
 			}
 			CallIndirect(x, _) => {
@@ -295,7 +291,7 @@ pub(crate) fn compute(func_idx: u32, module: &elements::Module) -> Result<u32, E
 				stack.pop_values(ty.params().len() as u32)?;
 
 				// Push result of the function execution to the stack.
-				let callee_arity = if !ty.results().is_empty() { 1 } else { 0 };
+				let callee_arity = ty.results().len() as u32;
 				stack.push_values(callee_arity)?;
 			}
 			Drop => {