Files
Siegfried Pammer 4a0918cbe5 Look past comment placeholders when matching statement sequences
The decompiler emits comments - //IL_ warnings, "Could not convert
BlockContainer", "try-fault", a Nop's comment - as an EmptyStatement in the
middle of a statement sequence. Every transform that walks such a sequence
then stops recognizing its pattern the moment one of those lands in it:
constructor initializers stay in the body, `using var` and `for` are not
introduced, and a finalizer keeps its `override Finalize` shape, which does
not compile at all.

The destructor matcher moves the placeholders it skipped into the body that
replaces the old one, so the warning that caused the problem is not dropped
along with the statement carrying it.

Assisted-by: Claude:claude-opus-5:Claude Code
2026-09-10 20:01:19 +02:00

65 lines
2.4 KiB
C#

// Copyright (c) 2011 Artur Zgodziński
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#nullable enable
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.Decompiler.CSharp.Transforms
{
class FlattenSwitchBlocks : IAstTransform
{
public void Run(AstNode rootNode, TransformContext context)
{
foreach (var switchSection in rootNode.Descendants.OfType<SwitchSection>())
{
var onlyStatement = switchSection.Statements.GetFirstNonEmptyStatementOrDefault();
if (onlyStatement == null || onlyStatement.GetNextNonEmptyStatement() != null)
continue;
var blockStatement = onlyStatement as BlockStatement;
if (blockStatement == null || blockStatement.Statements.Any(ContainsLocalDeclaration))
continue;
context.Step("Flatten switch section block", blockStatement);
blockStatement.Remove();
blockStatement.Statements.MoveTo(switchSection.Statements);
}
bool ContainsLocalDeclaration(AstNode node)
{
if (node is VariableDeclarationStatement || node is LocalFunctionDeclarationStatement || node is OutVarDeclarationExpression)
return true;
if (node is BlockStatement)
return false;
foreach (var child in node.Children)
{
if (ContainsLocalDeclaration(child))
return true;
}
return false;
}
}
}
}