Implemented codegen for UserDefinedValueType

Author: hrkrshnn

libsolidity/codegen/CompilerUtils.cpp

@@ -772,6 +772,33 @@ void CompilerUtils::convertType(
 	Type::Category stackTypeCategory = _typeOnStack.category();
 	Type::Category targetTypeCategory = _targetType.category();
 
+	if (stackTypeCategory == Type::Category::UserDefinedValueType)
+	{
+		solAssert(_typeOnStack.isExplicitlyConvertibleTo(_targetType), "");
+		solAssert(_targetType.isValueType(), "");
+		return
+			convertType(
+				_targetType,
+				dynamic_cast<UserDefinedValueTypeType const&>(_typeOnStack).actualType(),
+				_cleanupNeeded,
+				_chopSignBits,
+				_asPartOfArgumentDecoding
+			);
+	}
+	if (_targetType.category() == Type::Category::UserDefinedValueType)
+	{
+		solAssert(_typeOnStack.isExplicitlyConvertibleTo(_targetType), "");
+		solAssert(_typeOnStack.isValueType() || dynamic_cast<RationalNumberType const*>(&_typeOnStack), "");
+		return
+			convertType(
+				_typeOnStack,
+				dynamic_cast<UserDefinedValueTypeType const&>(_targetType).actualType(),
+				_cleanupNeeded,
+				_chopSignBits,
+				_asPartOfArgumentDecoding
+			);
+	}
+
 	if (auto contrType = dynamic_cast<ContractType const*>(&_typeOnStack))
 		solAssert(!contrType->isSuper(), "Cannot convert magic variable \"super\"");
 

libsolidity/codegen/YulUtilFunctions.cpp

@@ -3158,6 +3158,18 @@ string YulUtilFunctions::allocateAndInitializeMemoryStructFunction(StructType co
 
 string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 {
+	if (_from.category() == Type::Category::UserDefinedValueType)
+	{
+		solAssert(_from.isExplicitlyConvertibleTo(_to), "");
+		solAssert(_to.isValueType(), "");
+		return conversionFunction(dynamic_cast<UserDefinedValueTypeType const&>(_from).actualType(), _to);
+	}
+	if (_to.category() == Type::Category::UserDefinedValueType)
+	{
+		solAssert(_from.isExplicitlyConvertibleTo(_to), "");
+		solAssert(_from.isValueType() || dynamic_cast<RationalNumberType const*>(&_from), "");
+		return conversionFunction(_from, dynamic_cast<UserDefinedValueTypeType const&>(_to).actualType());
+	}
 	if (_from.category() == Type::Category::Function)
 	{
 		solAssert(_to.category() == Type::Category::Function, "");
@@ -3431,6 +3443,15 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 			body = "converted := value";
 			break;
 		}
+		case Type::Category::UserDefinedValueType:
+		{
+			auto& userDefinedValueTypeType = dynamic_cast<UserDefinedValueTypeType const&>(_from);
+			Type const* encodingType = userDefinedValueTypeType.encodingType();
+			solAssert(encodingType, "");
+			solAssert(_from == _to || *encodingType == _to, "");
+			body = "converted := value";
+			break;
+		}
 		default:
 			solAssert(false, "Invalid conversion from " + _from.canonicalName() + " to " + _to.canonicalName());
 		}
@@ -3783,6 +3804,14 @@ string YulUtilFunctions::cleanupFunction(Type const& _type)
 		case Type::Category::InaccessibleDynamic:
 			templ("body", "cleaned := 0");
 			break;
+		case Type::Category::UserDefinedValueType:
+			templ(
+				"body",
+				"cleaned := " +
+					cleanupFunction(dynamic_cast<UserDefinedValueTypeType const&>(_type).actualType()) +
+					"(value)"
+			);
+			break;
 		default:
 			solAssert(false, "Cleanup of type " + _type.identifier() + " requested.");
 		}
@@ -3816,6 +3845,7 @@ string YulUtilFunctions::validatorFunction(Type const& _type, bool _revertOnFail
 		case Type::Category::Mapping:
 		case Type::Category::FixedBytes:
 		case Type::Category::Contract:
+		case Type::Category::UserDefinedValueType:
 		{
 			templ("condition", "eq(value, " + cleanupFunction(_type) + "(value))");
 			break;

libsolidity/codegen/ir/IRGeneratorForStatements.cpp

@@ -869,8 +869,10 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 
 	if (functionCallKind == FunctionCallKind::TypeConversion)
 	{
+		Type::Category category = _functionCall.expression().annotation().type->category();
 		solAssert(
-			_functionCall.expression().annotation().type->category() == Type::Category::TypeType,
+			category == Type::Category::TypeType ||
+			category == Type::Category::UserDefinedValueType,
 			"Expected category to be TypeType"
 		);
 		solAssert(_functionCall.arguments().size() == 1, "Expected one argument for type conversion");
@@ -2300,6 +2302,10 @@ void IRGeneratorForStatements::endVisit(Identifier const& _identifier)
 	{
 		// no-op
 	}
+	else if (dynamic_cast<UserDefinedValueType const*>(declaration))
+	{
+		// no-op
+	}
 	else
 	{
 		solAssert(false, "Identifier type not expected in expression context.");