Skip to content

Fix SequencePointBuilder skipping moved member initializers #3712

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

Open
nikitalita wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −0
Open

Fix SequencePointBuilder skipping moved member initializers #3712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 28 additions & 0 deletions ICSharpCode.Decompiler/CSharp/SequencePointBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,28 @@ public override void VisitBlockStatement(BlockStatement blockStatement)
}
}

public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
{
foreach (var variable in fieldDeclaration.Variables)
{
if (!variable.AssignToken.IsNull || !variable.Initializer.IsNull)
Copy link
Copy Markdown
Member

@siegfriedpammer siegfriedpammer Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that there can be an initializer without an assign token?

Suggested change
if (!variable.AssignToken.IsNull || !variable.Initializer.IsNull)
if (!variable.Initializer.IsNull)

{
VisitAsSequencePoint(variable);
Copy link
Copy Markdown
Member

@siegfriedpammer siegfriedpammer Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
VisitAsSequencePoint(variable);
VisitAsSequencePoint(variable.Initializer);

is it on purpose that you pass the VariableInitializer instead of just the Expression?

}
}
base.VisitFieldDeclaration(fieldDeclaration);
}

public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
{
if (!propertyDeclaration.ExpressionBody.IsNull)
{
VisitAsSequencePoint(propertyDeclaration.ExpressionBody);
}
else if (!propertyDeclaration.Initializer.IsNull)
{
VisitAsSequencePoint(propertyDeclaration.Initializer);
}
else
{
base.VisitPropertyDeclaration(propertyDeclaration);
Expand Down Expand Up @@ -202,6 +218,18 @@ public override void VisitForStatement(ForStatement forStatement)
VisitAsSequencePoint(forStatement.EmbeddedStatement);
}

public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
{
foreach (var variable in eventDeclaration.Variables)
{
if (!variable.AssignToken.IsNull || !variable.Initializer.IsNull)
Copy link
Copy Markdown
Member

@siegfriedpammer siegfriedpammer Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (!variable.AssignToken.IsNull || !variable.Initializer.IsNull)
if (!variable.Initializer.IsNull)

{
VisitAsSequencePoint(variable);
Copy link
Copy Markdown
Member

@siegfriedpammer siegfriedpammer Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
VisitAsSequencePoint(variable);
VisitAsSequencePoint(variable.Initializer);

}
}
base.VisitEventDeclaration(eventDeclaration);
}

public override void VisitSwitchStatement(SwitchStatement switchStatement)
{
StartSequencePoint(switchStatement);
Expand Down
Loading