Fix #3189: Support primitive types in Expression.Constant(object) pat…

…tern.
icsharpcode · Jun 6, 2024 · 401cb77 · 401cb77
1 parent c269b99
commit 401cb77
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/ICSharpCode.Decompiler/IL/Transforms/TransformExpressionTrees.cs b/ICSharpCode.Decompiler/IL/Transforms/TransformExpressionTrees.cs
@@ -20,7 +20,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 
 using ICSharpCode.Decompiler.CSharp.Resolver;
 using ICSharpCode.Decompiler.Semantics;
@@ -1423,7 +1422,15 @@ bool MatchConstantCall(ILInstruction inst, out ILInstruction value, out IType ty
  value = call.Arguments[0];
  if (call.Arguments.Count == 2)
  return MatchGetTypeFromHandle(call.Arguments[1], out type);
- type = value.InferType(context.TypeSystem);
+ type = value switch {
+ LdNull => SpecialType.NullType,
+ LdStr => context.TypeSystem.FindType(KnownTypeCode.String),
+ LdcF4 => context.TypeSystem.FindType(KnownTypeCode.Single),
+ LdcF8 => context.TypeSystem.FindType(KnownTypeCode.Double),
+ LdcI4 => context.TypeSystem.FindType(KnownTypeCode.Int32),
+ LdcI8 => context.TypeSystem.FindType(KnownTypeCode.Int64),
+ _ => value.InferType(context.TypeSystem),
+ };
  return true;
  }
  return false;