Files
Siegfried Pammer 3da129632e Fix #3624: decompile semi-auto properties with the C# 14 field keyword
Backing-field references inside a property's own get/set/init accessors
are emitted as the `field` keyword at IL-to-AST translation time
(ExpressionBuilder.ConvertField), so arbitrary accessor bodies become
expressible and no separate rewrite pass is needed. Compiler-generated
trivial accessors then collapse individually to `get;`/`set;`, which
also handles mixed shapes like `{ get; set { ... field ... } }`; the
backing-field declaration is removed with its remaining attributes
re-hosted as `field:` sections, and constructor stores become property
initializers (or property assignments, for setter-less properties).
Implicit zero-stores that auto-default struct constructors emit for
unassigned backing fields are dropped rather than lifted.

Recognition stays AST/metadata-based rather than mirroring the ILAst
analysis used for automatic events: events must prove compiler-generated
bodies before discarding them, while the field keyword discards nothing,
so name association plus the accessor context is sufficient.

Below C# 14 (or with the new FieldKeyword setting off), the field
declaration survives under its metadata name, so the UI keeps showing
the truth; EscapeInvalidIdentifiers - the transform the compilable-output
flows (project export, VS, tests) already add - now maps
`<P>k__BackingField` to the readable `P__BackingField` instead of the
generic character escape. A genuine field literally named "field" is
qualified as `this.field` inside accessors, and locals are not named
"field" there, since C# 14 rebinds the bare identifier. Bodiless
accessors mixed into multi-line properties get their own line in the
output.

The fixture covering the feature surface lands with the implementation rather
than as a separate xfailed commit. It is excluded from the test-assembly
compilation because its nullable annotations would trip warnings-as-errors
there.

Assisted-by: Claude:claude-fable-5:Claude Code
2026-08-13 13:15:21 +02:00

239 lines
8.4 KiB
C#

// Copyright (c) 2014 Daniel Grunwald
//
// 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 ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.Decompiler.CSharp.Transforms
{
/// <summary>
/// Escape invalid identifiers.
/// </summary>
/// <remarks>
/// This transform is not enabled by default.
/// </remarks>
public class EscapeInvalidIdentifiers : IAstTransform
{
bool IsValid(char ch)
{
if (char.IsLetterOrDigit(ch))
return true;
if (ch == '_')
return true;
return false;
}
string ReplaceInvalid(string s, ISet<string>? existingNames = null)
{
// A property backing field that stayed declared (the property is not an
// auto-property and the "field" keyword is unavailable or insufficient) gets a
// readable name instead of the generic escape of "<P>k__BackingField". The mapping
// is name-deterministic like the escape itself, so declarations and references
// stay consistent without symbol tracking.
if (s.StartsWith("<", System.StringComparison.Ordinal)
&& PatternStatementTransform.NameCouldBeBackingFieldOfAutomaticProperty(s, out string? propertyName))
{
var readable = ReplaceInvalid(propertyName) + "__BackingField";
// "P__BackingField" is a plausible identifier a human could have written, unlike
// the generic escape it replaces. If the tree already contains that name, the
// rename would produce two members with one name; fall back to the escape, which
// keeps the output compilable at the cost of readability.
if (existingNames?.Contains(readable) != true)
return readable;
}
string name = string.Concat(s.Select(ch => IsValid(ch) ? ch.ToString() : string.Format("_{0:X4}", (int)ch)));
if (name.Length >= 1 && !(char.IsLetter(name[0]) || name[0] == '_'))
name = "_" + name;
return name;
}
public void Run(AstNode rootNode, TransformContext context)
{
// Every name already in the tree, so the readable backing-field rename can detect
// that its target name is taken.
var existingNames = new HashSet<string>(
rootNode.DescendantsAndSelf.OfType<Identifier>().Select(i => i.Name), StringComparer.Ordinal);
foreach (var ident in rootNode.DescendantsAndSelf.OfType<Identifier>())
{
string newName = ReplaceInvalid(ident.Name, existingNames);
if (newName != ident.Name)
{
context.Step($"Escape identifier '{ident.Name}'", ident);
ident.Name = newName;
}
}
}
}
/// <summary>
/// This transform is used to remove assembly-attributes that are generated by the compiler,
/// thus don't need to be declared. (We have to remove them, in order to avoid conflicts while compiling.)
/// </summary>
/// <remarks>This transform is only enabled, when exporting a full assembly as project.</remarks>
public class RemoveCompilerGeneratedAssemblyAttributes : IAstTransform
{
public void Run(AstNode rootNode, TransformContext context)
{
foreach (var section in rootNode.Children.OfType<AttributeSection>())
{
if (section.AttributeTarget == "assembly")
{
foreach (var attribute in section.Attributes)
{
var trr = attribute.Type.Annotation<TypeResolveResult>();
if (trr == null)
continue;
string fullName = trr.Type.FullName;
var arguments = attribute.Arguments;
switch (fullName)
{
case "System.Diagnostics.DebuggableAttribute":
{
attribute.Remove();
break;
}
case "System.Runtime.CompilerServices.CompilationRelaxationsAttribute":
{
if (arguments.Count == 1 && arguments.First() is PrimitiveExpression expr && expr.Value is int value && value == 8)
attribute.Remove();
break;
}
case "System.Runtime.CompilerServices.RuntimeCompatibilityAttribute":
{
if (arguments.Count != 1)
break;
if (!(arguments.First() is NamedExpression expr1) || expr1.Name != "WrapNonExceptionThrows")
break;
if (!(expr1.Expression is PrimitiveExpression expr2) || !(expr2.Value is bool value) || value != true)
break;
attribute.Remove();
break;
}
case "System.Runtime.Versioning.TargetFrameworkAttribute":
{
attribute.Remove();
break;
}
case "System.Security.Permissions.SecurityPermissionAttribute":
{
if (arguments.Count != 2)
break;
if (!(arguments.First() is MemberReferenceExpression expr1) || expr1.MemberName != "RequestMinimum")
break;
if (!(expr1.NextSibling is NamedExpression expr2) || expr2.Name != "SkipVerification")
break;
if (!(expr2.Expression is PrimitiveExpression expr3) || !(expr3.Value is bool value2) || value2 != true)
break;
attribute.Remove();
break;
}
}
}
}
else if (section.AttributeTarget == "module")
{
foreach (var attribute in section.Attributes)
{
var trr = attribute.Type.Annotation<TypeResolveResult>();
if (trr == null)
continue;
switch (trr.Type.FullName)
{
case "System.Security.UnverifiableCodeAttribute":
case "System.Runtime.CompilerServices.RefSafetyRulesAttribute":
attribute.Remove();
break;
}
}
}
else
{
continue;
}
if (section.Attributes.Count == 0)
{
section.Remove();
}
}
}
}
/// <summary>
/// This transform is used to remove attributes that are embedded
/// </summary>
public class RemoveEmbeddedAttributes : DepthFirstAstVisitor, IAstTransform
{
internal static readonly HashSet<string> attributeNames = new HashSet<string>() {
"System.Runtime.CompilerServices.IsReadOnlyAttribute",
"System.Runtime.CompilerServices.IsByRefLikeAttribute",
"System.Runtime.CompilerServices.IsUnmanagedAttribute",
"System.Runtime.CompilerServices.NullableAttribute",
"System.Runtime.CompilerServices.NullableContextAttribute",
"System.Runtime.CompilerServices.NativeIntegerAttribute",
"System.Runtime.CompilerServices.ParamCollectionAttribute",
"System.Runtime.CompilerServices.RefSafetyRulesAttribute",
"System.Runtime.CompilerServices.ScopedRefAttribute",
"System.Runtime.CompilerServices.RequiresLocationAttribute",
"Microsoft.CodeAnalysis.EmbeddedAttribute",
};
internal static readonly HashSet<string> nonEmbeddedAttributeNames = new HashSet<string>() {
// non-embedded attributes, but we still want to remove them
"System.Runtime.CompilerServices.CompilerFeatureRequiredAttribute",
"System.Runtime.CompilerServices.RequiredMemberAttribute",
"System.Runtime.CompilerServices.IsExternalInit",
};
public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
{
var typeDefinition = typeDeclaration.GetSymbol() as ITypeDefinition;
if (typeDefinition == null)
return;
if (attributeNames.Contains(typeDefinition.FullName))
{
if (!typeDefinition.HasAttribute(KnownAttribute.Embedded))
return;
}
else if (!nonEmbeddedAttributeNames.Contains(typeDefinition.FullName))
return;
if (typeDeclaration.Parent is NamespaceDeclaration ns && ns.Members.Count == 1)
ns.Remove();
else
typeDeclaration.Remove();
}
public void Run(AstNode rootNode, TransformContext context)
{
rootNode.AcceptVisitor(this);
}
}
}