Stack height checks and fix.

1 files changed, 9 insertions, 2 deletions

diff --git a/Types.cpp b/Types.cpp
index 55dedd92..ce51336d 100644
--- a/Types.cpp
+++ b/Types.cpp
@@ -833,10 +833,17 @@ string FunctionType::toString() const
 
 unsigned FunctionType::getSizeOnStack() const
 {
+	Location location = m_location;
+	if (m_location == Location::SetGas || m_location == Location::SetValue)
+	{
+		solAssert(m_returnParameterTypes.size() == 1, "");
+		location = dynamic_cast<FunctionType const&>(*m_returnParameterTypes.front()).m_location;
+	}
+
 	unsigned size = 0;
-	if (m_location == Location::External)
+	if (location == Location::External)
 		size = 2;
-	else if (m_location == Location::Internal || m_location == Location::Bare)
+	else if (location == Location::Internal || location == Location::Bare)
 		size = 1;
 	if (m_gasSet)
 		size++;