Merge branch 'feature/tron_solidity_0.7.0' of https://github.com/tron…

…protocol/solidity into feature/tron_solidity_0.7.0
tronprotocol · May 18, 2021 · a37b7b9 · a37b7b9
2 parents e952dea + b99cca3
commit a37b7b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
@@ -3477,6 +3477,7 @@ TypePointer FunctionType::mobileType() const
 		m_declaration,
 		m_gasSet,
 		m_valueSet,
+		m_tokenSet,
 		m_bound,
 		m_saltSet
 	);
@@ -3716,6 +3717,7 @@ FunctionTypePointer FunctionType::asBoundFunction() const
 		m_declaration,
 		m_gasSet,
 		m_valueSet,
+		m_tokenSet,
 		m_saltSet,
 		true
 	);

diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -2083,6 +2083,11 @@ string YulUtilFunctions::validatorFunction(Type const& _type, bool _revertOnFail
 		switch (_type.category())
 		{
 		case Type::Category::Address:
+        case Type::Category::Contract:
+		{
+			templ("condition", "eq(value, " + cleanupFunction(IntegerType(168)) + "(value))");
+			break;
+		}
 		case Type::Category::Integer:
 		case Type::Category::RationalNumber:
 		case Type::Category::Bool:
@@ -2092,7 +2097,6 @@ string YulUtilFunctions::validatorFunction(Type const& _type, bool _revertOnFail
 		case Type::Category::Struct:
 		case Type::Category::Mapping:
 		case Type::Category::FixedBytes:
-		case Type::Category::Contract:
 		{
 			templ("condition", "eq(value, " + cleanupFunction(_type) + "(value))");
 			break;