#2156: Enforce string type of string.to.int argument.

5 years ago · 813cd1842f
2 changed files with 12 additions and 2 deletions
--- a/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs
+++ b/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs
@ -3461,7 +3461,12 @@ namespace ICSharpCode.Decompiler.CSharp
				@@ -3461,7 +3461,12 @@ namespace ICSharpCode.Decompiler.CSharp
 			TranslatedExpression value;
 			if (inst.Value is StringToInt strToInt)
 			{
-				value = Translate(strToInt.Argument);
+				value = Translate(strToInt.Argument)
+					.ConvertTo(
+						typeSystem.FindType(KnownTypeCode.String),
+						this,
+						allowImplicitConversion: true
+					);
 			}
 			else
 			{
--- a/ICSharpCode.Decompiler/CSharp/StatementBuilder.cs
+++ b/ICSharpCode.Decompiler/CSharp/StatementBuilder.cs
@ -198,7 +198,12 @@ namespace ICSharpCode.Decompiler.CSharp
				@@ -198,7 +198,12 @@ namespace ICSharpCode.Decompiler.CSharp
 			TranslatedExpression value;
 			if (inst.Value is StringToInt strToInt)
 			{
-				value = exprBuilder.Translate(strToInt.Argument);
+				value = exprBuilder.Translate(strToInt.Argument)
+					.ConvertTo(
+						typeSystem.FindType(KnownTypeCode.String),
+						exprBuilder,
+						allowImplicitConversion: true
+					);
 			}
 			else
 			{