mirror of
https://github.com/icsharpcode/ILSpy.git
synced 2026-10-12 02:15:58 +00:00
Siegfried Pammer
468e3da92c
The debug-step node bracket (MarkNodeStart/try/finally/MarkNodeEnd) was copied into every hand-written WriteTo override and re-emitted by the T4 generator, so a newly added instruction could silently omit it and lose step highlighting with no compile error or test failure. Seal WriteTo on ILInstruction to apply the bracket once and delegate to a new abstract WriteToCore; move every override (hand-written and generated) to WriteToCore without the wrapper. Rendered output is unchanged -- the marks are no-ops unless the output tracks nodes. Assisted-by: Claude:claude-opus-4-8:Claude Code
99 lines
2.9 KiB
C#
99 lines
2.9 KiB
C#
#nullable enable
|
|
// 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.
|
|
|
|
namespace ICSharpCode.Decompiler.IL
|
|
{
|
|
interface ISupportsUnalignedPrefix
|
|
{
|
|
/// <summary>
|
|
/// Returns the alignment specified by the 'unaligned' prefix; or 0 if there was no 'unaligned' prefix.
|
|
/// </summary>
|
|
byte UnalignedPrefix { get; set; }
|
|
}
|
|
|
|
interface ISupportsVolatilePrefix
|
|
{
|
|
/// <summary>
|
|
/// Gets/Sets whether the memory access is volatile.
|
|
/// </summary>
|
|
bool IsVolatile { get; set; }
|
|
}
|
|
|
|
partial class LdObj
|
|
{
|
|
protected override void WriteToCore(ITextOutput output, ILAstWritingOptions options)
|
|
{
|
|
if (options.UseFieldSugar)
|
|
{
|
|
if (this.MatchLdFld(out var target, out var field))
|
|
{
|
|
WriteILRange(output, options);
|
|
output.Write("ldfld ");
|
|
field.WriteTo(output);
|
|
output.Write('(');
|
|
target.WriteTo(output, options);
|
|
output.Write(')');
|
|
return;
|
|
}
|
|
else if (this.MatchLdsFld(out field))
|
|
{
|
|
WriteILRange(output, options);
|
|
output.Write("ldsfld ");
|
|
field.WriteTo(output);
|
|
return;
|
|
}
|
|
}
|
|
OriginalWriteTo(output, options);
|
|
}
|
|
}
|
|
|
|
partial class StObj
|
|
{
|
|
protected override void WriteToCore(ITextOutput output, ILAstWritingOptions options)
|
|
{
|
|
if (options.UseFieldSugar)
|
|
{
|
|
if (this.MatchStFld(out var target, out var field, out var value))
|
|
{
|
|
WriteILRange(output, options);
|
|
output.Write("stfld ");
|
|
field.WriteTo(output);
|
|
output.Write('(');
|
|
target.WriteTo(output, options);
|
|
output.Write(", ");
|
|
value.WriteTo(output, options);
|
|
output.Write(')');
|
|
return;
|
|
}
|
|
else if (this.MatchStsFld(out field, out value))
|
|
{
|
|
WriteILRange(output, options);
|
|
output.Write("stsfld ");
|
|
field.WriteTo(output);
|
|
output.Write('(');
|
|
value.WriteTo(output, options);
|
|
output.Write(')');
|
|
return;
|
|
}
|
|
}
|
|
OriginalWriteTo(output, options);
|
|
}
|
|
}
|
|
}
|