Check for interface types of members and cache recursion check.

libsolidity/ast/Types.cpp

@@ -1788,14 +1788,33 @@ MemberList::MemberMap StructType::nativeMembers(ContractDefinition const*) const
 
 TypePointer StructType::interfaceType(bool _inLibrary) const
 {
+	if (!canBeUsedExternally(_inLibrary))
+		return TypePointer();
+
+	// Has to fulfill canBeUsedExternally(_inLibrary) == !!interfaceType(_inLibrary)
 	if (_inLibrary && location() == DataLocation::Storage)
 		return shared_from_this();
-	else if (!recursive())
-		// TODO this might not be enough, we have to convert all members to
-		// their interfaceType
-		return copyForLocation(DataLocation::Memory, true);
 	else
-		return TypePointer();
+		return copyForLocation(DataLocation::Memory, true);
+}
+
+bool StructType::canBeUsedExternally(bool _inLibrary) const
+{
+	if (_inLibrary && location() == DataLocation::Storage)
+		return true;
+	else if (recursive())
+		return false;
+	else
+	{
+		// Check that all members have interface types.
+		// We pass "false" to canBeUsedExternally (_inLibrary), because this struct will be
+		// passed by value and thus the encoding does not differ, but it will disallow
+		// mappings.
+		for (auto const& var: m_struct.members())
+			if (!var->annotation().type->canBeUsedExternally(false))
+				return false;
+	}
+	return true;
 }
 
 TypePointer StructType::copyForLocation(DataLocation _location, bool _isPointer) const
@@ -1887,6 +1906,8 @@ set<string> StructType::membersMissingInMemory() const
 
 bool StructType::recursive() const
 {
+	if (!m_recursive.is_initialized())
+	{
 		set<StructDefinition const*> structsSeen;
 		function<bool(StructType const*)> check = [&](StructType const* t) -> bool
 		{
@@ -1905,7 +1926,9 @@ bool StructType::recursive() const
 			}
 			return false;
 		};
-	return check(this);
+		m_recursive = check(this);
+	}
+	return *m_recursive;
 }
 
 TypePointer EnumType::unaryOperatorResult(Token::Value _operator) const

libsolidity/ast/Types.h

@@ -32,6 +32,7 @@
 
 #include <boost/noncopyable.hpp>
 #include <boost/rational.hpp>
+#include <boost/optional.hpp>
 
 #include <memory>
 #include <string>
@@ -748,6 +749,7 @@ public:
 		return location() == DataLocation::Storage ? std::make_shared<IntegerType>(256) : shared_from_this();
 	}
 	virtual TypePointer interfaceType(bool _inLibrary) const override;
+	virtual bool canBeUsedExternally(bool _inLibrary) const override;
 
 	TypePointer copyForLocation(DataLocation _location, bool _isPointer) const override;
 
@@ -774,6 +776,8 @@ public:
 
 private:
 	StructDefinition const& m_struct;
+	/// Cache for the recursive() function.
+	mutable boost::optional<bool> m_recursive;
 };
 
 /**