Skip to content

Handle unresolved value-type call targets #4053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgrunwald merged 2 commits into from
Sep 3, 2026
+41 −4
Merged

Handle unresolved value-type call targets #4053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d730ec0
Handle unresolved value-type call targets
sonyps5201314 Aug 26, 2026
9377648
Merge branch 'master' into split/unresolved-value-type-call-targets
dgrunwald Sep 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue3729.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ public void TestRefTypeNewobj()
MyClass value = new MyClass();
Console.WriteLine(value);
}

public void TestUnresolvedStructMemberCalls()
{
MyEnumerator val = default;
val.MoveNext();
((IDisposable)val/*cast due to constrained. prefix*/).Dispose();
}
}
public class Issue3729_DerivedFromUnknown : MissingBase
{
Expand Down
17 changes: 17 additions & 0 deletions ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue3729.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,23 @@
IL_000c: ret
}

.method public hidebysig
instance void TestUnresolvedStructMemberCalls () cil managed
{
.maxstack 1
.locals init (
[0] valuetype [Library1]Library1.MyEnumerator
)

IL_0000: ldloca.s 0
IL_0002: call instance bool [Library1]Library1.MyEnumerator::MoveNext()
IL_0007: pop
IL_0008: ldloca.s 0
IL_000a: constrained. [Library1]Library1.MyEnumerator
IL_0010: callvirt instance void [System.Runtime]System.IDisposable::Dispose()
IL_0015: ret
}

.method public hidebysig specialname rtspecialname
instance void .ctor () cil managed
{
Expand Down
21 changes: 17 additions & 4 deletions ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2923,7 +2923,18 @@ internal TranslatedExpression TranslateTarget(ILInstruction? target, bool nonVir
else
{
IType targetTypeHint = constrainedTo ?? memberDeclaringType;
if (CallInstruction.ExpectedTypeForThisPointer(memberDeclaringType, constrainedTo) == StackType.Ref)
if (target is Conv {
Kind: ConversionKind.Invalid,
InputType: StackType.Ref,
TargetType: IL.PrimitiveType.Unknown
} && targetTypeHint.Kind == TypeKind.Unknown)
{
target = target.UnwrapConv(ConversionKind.Invalid);
}
StackType expectedThisPointerType = CallInstruction.ExpectedTypeForThisPointer(memberDeclaringType, constrainedTo);
bool requiresManagedReference = expectedThisPointerType == StackType.Ref
|| (expectedThisPointerType == StackType.Unknown && target.ResultType == StackType.Ref);
if (requiresManagedReference)
{
if (target.ResultType == StackType.Ref)
{
Expand All @@ -2935,13 +2946,15 @@ internal TranslatedExpression TranslateTarget(ILInstruction? target, bool nonVir
}
}
var translatedTarget = Translate(target, targetTypeHint);
if (CallInstruction.ExpectedTypeForThisPointer(memberDeclaringType, constrainedTo) == StackType.Ref)
if (requiresManagedReference)
{
// When accessing members on value types, ensure we use a reference of the correct type,
// and not a pointer or a reference to a different type (issue #1333)
if (!(translatedTarget.Type is ByReferenceType brt && NormalizeTypeVisitor.TypeErasure.EquivalentTypes(brt.ElementType, constrainedTo ?? memberDeclaringType)))
IType expectedTargetType = constrainedTo ?? memberDeclaringType;
if (!(translatedTarget.Type is ByReferenceType brt
&& NormalizeTypeVisitor.TypeErasure.EquivalentTypes(brt.ElementType, expectedTargetType)))
{
translatedTarget = translatedTarget.ConvertTo(new ByReferenceType(constrainedTo ?? memberDeclaringType), this);
translatedTarget = translatedTarget.ConvertTo(new ByReferenceType(expectedTargetType), this);
}
}
if (translatedTarget.Expression is DirectionExpression)
Expand Down
Loading