pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add ununsed CustomAttributes test. 

Fix CalculatedGetterOnlyPropertyPattern for properties with attributes.
pull/1440/head
Siegfried Pammer 6 years ago
parent
9e1e367e04
commit
6f3230af48
10 changed files with 662 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
  2. 6
      ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs
  3. 4
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributeSamples.cs
  4. 4
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes.cs
  5. 43
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes2.cs
  6. 166
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes2.il
  7. 142
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes2.opt.il
  8. 146
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes2.opt.roslyn.il
  9. 163
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes2.roslyn.il
  10. 1
      ICSharpCode.Decompiler/CSharp/Transforms/NormalizeBlockStatements.cs

1
ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
Unescape View File

@ -76,6 +76,7 @@ @@ -76,6 +76,7 @@
<Compile Include="TestCases\Correctness\RefLocalsAndReturns.cs" />
<Compile Include="TestCases\ILPretty\Issue1256.cs" />
<Compile Include="TestCases\ILPretty\Issue1323.cs" />
<Compile Include="TestCases\Pretty\CustomAttributes2.cs" />
<None Include="TestCases\ILPretty\SequenceOfNestedIfs.cs" />
<Compile Include="TestCases\Pretty\ConstructorInitializers.cs" />
<None Include="TestCases\ILPretty\SequenceOfNestedIfs.il" />

6
ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs
Unescape View File

@ -359,6 +359,12 @@ namespace ICSharpCode.Decompiler.Tests @@ -359,6 +359,12 @@ namespace ICSharpCode.Decompiler.Tests
RunForLibrary(cscOptions: cscOptions);
}
[Test]
public void CustomAttributes2([ValueSource(nameof(defaultOptions))] CompilerOptions cscOptions)
{
RunForLibrary(cscOptions: cscOptions);
}
[Test]
public void CustomAttributeConflicts([ValueSource(nameof(defaultOptions))] CompilerOptions cscOptions)
{

4
ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributeSamples.cs
Unescape View File

@ -74,11 +74,15 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty.CustomAttributeSamples @@ -74,11 +74,15 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty.CustomAttributeSamples
public int Field;
[Obsolete("reason")]
#if ROSLYN
public int Property => 0;
#else
public int Property {
get {
return 0;
}
}
#endif
public int PropertyAttributeOnGetter {
[MyAttribute]

4
ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes.cs
Unescape View File

@ -91,11 +91,15 @@ namespace CustomAttributes @@ -91,11 +91,15 @@ namespace CustomAttributes
[My(EnumWithFlag.Item1 | EnumWithFlag.Item2)]
private static int field;
[My(EnumWithFlag.All)]
#if ROSLYN
public static string Property => "aa";
#else
public static string Property {
get {
return "aa";
}
}
#endif
[Obsolete("some message")]
public static void ObsoletedMethod()
{

43
ICSharpCode.Decompiler.Tests/CustomAttributes.code.cs → ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes2.cs
Unescape View File

@ -1,32 +1,47 @@ @@ -1,32 +1,47 @@
using System;
namespace aa
namespace CustomAttributes2
{
public static class CustomAtributes
{
[Flags]
public enum EnumWithFlag
{
All = 15,
None = 0,
Item1 = 1,
Item2 = 2,
Item3 = 4,
Item4 = 8
All = 0xF,
None = 0x0,
Item1 = 0x1,
Item2 = 0x2,
Item3 = 0x4,
Item4 = 0x8
}
[AttributeUsage(AttributeTargets.All)]
public class MyAttribute : Attribute
{
public MyAttribute(CustomAtributes.EnumWithFlag en)
public MyAttribute(EnumWithFlag en)
{
}
}
[CustomAtributes.MyAttribute(CustomAtributes.EnumWithFlag.Item1 | CustomAtributes.EnumWithFlag.Item2)]
[My(EnumWithFlag.Item1 | EnumWithFlag.Item2)]
private static int field;
[CustomAtributes.MyAttribute(CustomAtributes.EnumWithFlag.All)]
public static string Property
{
get
{
[My(EnumWithFlag.All)]
#if ROSLYN
public static string Property => "aa";
#else
public static string Property {
get {
return "aa";
}
}
#endif
public static string GetterOnlyPropertyWithAttributeOnGetter {
[My(EnumWithFlag.Item1)]
get {
return "aa";
}
}
[My(EnumWithFlag.All)]
public static string GetterOnlyPropertyWithAttributeOnGetter2 {
[My(EnumWithFlag.Item1)]
get {
return "aa";
}
}

166
ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes2.il
Unescape View File

@ -0,0 +1,166 @@ @@ -0,0 +1,166 @@
// Metadata version: v4.0.30319
.assembly extern mscorlib
{
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 4:0:0:0
}
.assembly CustomAttributes2
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows.
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.permissionset reqmin
= {[mscorlib]System.Security.Permissions.SecurityPermissionAttribute = {property bool 'SkipVerification' = bool(true)}}
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module CustomAttributes2.dll
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )
.imagebase 0x10000000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// =============== CLASS MEMBERS DECLARATION ===================
.class public abstract auto ansi sealed beforefieldinit CustomAttributes2.CustomAtributes
extends [mscorlib]System.Object
{
.class auto ansi sealed nested public EnumWithFlag
extends [mscorlib]System.Enum
{
.custom instance void [mscorlib]System.FlagsAttribute::.ctor() = ( 01 00 00 00 )
.field public specialname rtspecialname int32 value__
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag All = int32(0x0000000F)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag None = int32(0x00000000)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item1 = int32(0x00000001)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item2 = int32(0x00000002)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item3 = int32(0x00000004)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item4 = int32(0x00000008)
} // end of class EnumWithFlag
.class auto ansi nested public beforefieldinit MyAttribute
extends [mscorlib]System.Attribute
{
.custom instance void [mscorlib]System.AttributeUsageAttribute::.ctor(valuetype [mscorlib]System.AttributeTargets) = ( 01 00 FF 7F 00 00 00 00 )
.method public hidebysig specialname rtspecialname
instance void .ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag en) cil managed
{
// Code size 10 (0xa)
.maxstack 8
IL_0000: ldarg.0
IL_0001: call instance void [mscorlib]System.Attribute::.ctor()
IL_0006: nop
IL_0007: nop
IL_0008: nop
IL_0009: ret
} // end of method MyAttribute::.ctor
} // end of class MyAttribute
.field private static int32 'field'
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 03 00 00 00 00 00 )
.method public hidebysig specialname static
string get_Property() cil managed
{
// Code size 11 (0xb)
.maxstack 1
.locals init (string V_0)
IL_0000: nop
IL_0001: ldstr "aa"
IL_0006: stloc.0
IL_0007: br.s IL_0009
IL_0009: ldloc.0
IL_000a: ret
} // end of method CustomAtributes::get_Property
.method public hidebysig specialname static
string get_GetterOnlyPropertyWithAttributeOnGetter() cil managed
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 01 00 00 00 00 00 )
// Code size 11 (0xb)
.maxstack 1
.locals init (string V_0)
IL_0000: nop
IL_0001: ldstr "aa"
IL_0006: stloc.0
IL_0007: br.s IL_0009
IL_0009: ldloc.0
IL_000a: ret
} // end of method CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter
.method public hidebysig specialname static
string get_GetterOnlyPropertyWithAttributeOnGetter2() cil managed
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 01 00 00 00 00 00 )
// Code size 11 (0xb)
.maxstack 1
.locals init (string V_0)
IL_0000: nop
IL_0001: ldstr "aa"
IL_0006: stloc.0
IL_0007: br.s IL_0009
IL_0009: ldloc.0
IL_000a: ret
} // end of method CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter2
.method public hidebysig static void ObsoletedMethod() cil managed
{
.custom instance void [mscorlib]System.ObsoleteAttribute::.ctor(string) = ( 01 00 0C 73 6F 6D 65 20 6D 65 73 73 61 67 65 00 // ...some message.
00 )
// Code size 66 (0x42)
.maxstack 3
.locals init (valuetype [mscorlib]System.AttributeTargets V_0)
IL_0000: nop
IL_0001: ldstr "{0} $$$ {1}"
IL_0006: ldc.i4 0x400
IL_000b: box [mscorlib]System.AttributeTargets
IL_0010: ldc.i4 0x180
IL_0015: box [mscorlib]System.AttributeTargets
IL_001a: call void [mscorlib]System.Console::WriteLine(string,
object,
object)
IL_001f: nop
IL_0020: ldc.i4 0x180
IL_0025: stloc.0
IL_0026: ldstr "{0} $$$ {1}"
IL_002b: ldc.i4 0x400
IL_0030: box [mscorlib]System.AttributeTargets
IL_0035: ldloc.0
IL_0036: box [mscorlib]System.AttributeTargets
IL_003b: call void [mscorlib]System.Console::WriteLine(string,
object,
object)
IL_0040: nop
IL_0041: ret
} // end of method CustomAtributes::ObsoletedMethod
.property string Property()
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 0F 00 00 00 00 00 )
.get string CustomAttributes2.CustomAtributes::get_Property()
} // end of property CustomAtributes::Property
.property string GetterOnlyPropertyWithAttributeOnGetter()
{
.get string CustomAttributes2.CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter()
} // end of property CustomAtributes::GetterOnlyPropertyWithAttributeOnGetter
.property string GetterOnlyPropertyWithAttributeOnGetter2()
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 0F 00 00 00 00 00 )
.get string CustomAttributes2.CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter2()
} // end of property CustomAtributes::GetterOnlyPropertyWithAttributeOnGetter2
} // end of class CustomAttributes2.CustomAtributes
// =============================================================
// *********** DISASSEMBLY COMPLETE ***********************

142
ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes2.opt.il
Unescape View File

@ -0,0 +1,142 @@ @@ -0,0 +1,142 @@
// Metadata version: v4.0.30319
.assembly extern mscorlib
{
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 4:0:0:0
}
.assembly CustomAttributes2.opt
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows.
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.permissionset reqmin
= {[mscorlib]System.Security.Permissions.SecurityPermissionAttribute = {property bool 'SkipVerification' = bool(true)}}
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module CustomAttributes2.opt.dll
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )
.imagebase 0x10000000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// =============== CLASS MEMBERS DECLARATION ===================
.class public abstract auto ansi sealed beforefieldinit CustomAttributes2.CustomAtributes
extends [mscorlib]System.Object
{
.class auto ansi sealed nested public EnumWithFlag
extends [mscorlib]System.Enum
{
.custom instance void [mscorlib]System.FlagsAttribute::.ctor() = ( 01 00 00 00 )
.field public specialname rtspecialname int32 value__
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag All = int32(0x0000000F)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag None = int32(0x00000000)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item1 = int32(0x00000001)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item2 = int32(0x00000002)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item3 = int32(0x00000004)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item4 = int32(0x00000008)
} // end of class EnumWithFlag
.class auto ansi nested public beforefieldinit MyAttribute
extends [mscorlib]System.Attribute
{
.custom instance void [mscorlib]System.AttributeUsageAttribute::.ctor(valuetype [mscorlib]System.AttributeTargets) = ( 01 00 FF 7F 00 00 00 00 )
.method public hidebysig specialname rtspecialname
instance void .ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag en) cil managed
{
// Code size 7 (0x7)
.maxstack 8
IL_0000: ldarg.0
IL_0001: call instance void [mscorlib]System.Attribute::.ctor()
IL_0006: ret
} // end of method MyAttribute::.ctor
} // end of class MyAttribute
.field private static int32 'field'
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 03 00 00 00 00 00 )
.method public hidebysig specialname static
string get_Property() cil managed
{
// Code size 6 (0x6)
.maxstack 8
IL_0000: ldstr "aa"
IL_0005: ret
} // end of method CustomAtributes::get_Property
.method public hidebysig specialname static
string get_GetterOnlyPropertyWithAttributeOnGetter() cil managed
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 01 00 00 00 00 00 )
// Code size 6 (0x6)
.maxstack 8
IL_0000: ldstr "aa"
IL_0005: ret
} // end of method CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter
.method public hidebysig specialname static
string get_GetterOnlyPropertyWithAttributeOnGetter2() cil managed
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 01 00 00 00 00 00 )
// Code size 6 (0x6)
.maxstack 8
IL_0000: ldstr "aa"
IL_0005: ret
} // end of method CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter2
.method public hidebysig static void ObsoletedMethod() cil managed
{
.custom instance void [mscorlib]System.ObsoleteAttribute::.ctor(string) = ( 01 00 0C 73 6F 6D 65 20 6D 65 73 73 61 67 65 00 // ...some message.
00 )
// Code size 63 (0x3f)
.maxstack 3
.locals init (valuetype [mscorlib]System.AttributeTargets V_0)
IL_0000: ldstr "{0} $$$ {1}"
IL_0005: ldc.i4 0x400
IL_000a: box [mscorlib]System.AttributeTargets
IL_000f: ldc.i4 0x180
IL_0014: box [mscorlib]System.AttributeTargets
IL_0019: call void [mscorlib]System.Console::WriteLine(string,
object,
object)
IL_001e: ldc.i4 0x180
IL_0023: stloc.0
IL_0024: ldstr "{0} $$$ {1}"
IL_0029: ldc.i4 0x400
IL_002e: box [mscorlib]System.AttributeTargets
IL_0033: ldloc.0
IL_0034: box [mscorlib]System.AttributeTargets
IL_0039: call void [mscorlib]System.Console::WriteLine(string,
object,
object)
IL_003e: ret
} // end of method CustomAtributes::ObsoletedMethod
.property string Property()
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 0F 00 00 00 00 00 )
.get string CustomAttributes2.CustomAtributes::get_Property()
} // end of property CustomAtributes::Property
.property string GetterOnlyPropertyWithAttributeOnGetter()
{
.get string CustomAttributes2.CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter()
} // end of property CustomAtributes::GetterOnlyPropertyWithAttributeOnGetter
.property string GetterOnlyPropertyWithAttributeOnGetter2()
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 0F 00 00 00 00 00 )
.get string CustomAttributes2.CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter2()
} // end of property CustomAtributes::GetterOnlyPropertyWithAttributeOnGetter2
} // end of class CustomAttributes2.CustomAtributes
// =============================================================
// *********** DISASSEMBLY COMPLETE ***********************

146
ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes2.opt.roslyn.il
Unescape View File

@ -0,0 +1,146 @@ @@ -0,0 +1,146 @@
// Metadata version: v4.0.30319
.assembly extern mscorlib
{
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 4:0:0:0
}
.assembly CustomAttributes2
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows.
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 02 00 00 00 00 00 )
.permissionset reqmin
= {[mscorlib]System.Security.Permissions.SecurityPermissionAttribute = {property bool 'SkipVerification' = bool(true)}}
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module CustomAttributes2.dll
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )
.imagebase 0x10000000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// =============== CLASS MEMBERS DECLARATION ===================
.class public abstract auto ansi sealed beforefieldinit CustomAttributes2.CustomAtributes
extends [mscorlib]System.Object
{
.class auto ansi sealed nested public EnumWithFlag
extends [mscorlib]System.Enum
{
.custom instance void [mscorlib]System.FlagsAttribute::.ctor() = ( 01 00 00 00 )
.field public specialname rtspecialname int32 value__
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag All = int32(0x0000000F)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag None = int32(0x00000000)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item1 = int32(0x00000001)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item2 = int32(0x00000002)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item3 = int32(0x00000004)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item4 = int32(0x00000008)
} // end of class EnumWithFlag
.class auto ansi nested public beforefieldinit MyAttribute
extends [mscorlib]System.Attribute
{
.custom instance void [mscorlib]System.AttributeUsageAttribute::.ctor(valuetype [mscorlib]System.AttributeTargets) = ( 01 00 FF 7F 00 00 00 00 )
.method public hidebysig specialname rtspecialname
instance void .ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag en) cil managed
{
// Code size 7 (0x7)
.maxstack 8
IL_0000: ldarg.0
IL_0001: call instance void [mscorlib]System.Attribute::.ctor()
IL_0006: ret
} // end of method MyAttribute::.ctor
} // end of class MyAttribute
.field private static int32 'field'
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 03 00 00 00 00 00 )
.method public hidebysig specialname static
string get_Property() cil managed
{
// Code size 6 (0x6)
.maxstack 8
IL_0000: ldstr "aa"
IL_0005: ret
} // end of method CustomAtributes::get_Property
.method public hidebysig specialname static
string get_GetterOnlyPropertyWithAttributeOnGetter() cil managed
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 01 00 00 00 00 00 )
// Code size 6 (0x6)
.maxstack 8
IL_0000: ldstr "aa"
IL_0005: ret
} // end of method CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter
.method public hidebysig specialname static
string get_GetterOnlyPropertyWithAttributeOnGetter2() cil managed
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 01 00 00 00 00 00 )
// Code size 6 (0x6)
.maxstack 8
IL_0000: ldstr "aa"
IL_0005: ret
} // end of method CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter2
.method public hidebysig static void ObsoletedMethod() cil managed
{
.custom instance void [mscorlib]System.ObsoleteAttribute::.ctor(string) = ( 01 00 0C 73 6F 6D 65 20 6D 65 73 73 61 67 65 00 // ...some message.
00 )
// Code size 63 (0x3f)
.maxstack 3
.locals init (valuetype [mscorlib]System.AttributeTargets V_0)
IL_0000: ldstr "{0} $$$ {1}"
IL_0005: ldc.i4 0x400
IL_000a: box [mscorlib]System.AttributeTargets
IL_000f: ldc.i4 0x180
IL_0014: box [mscorlib]System.AttributeTargets
IL_0019: call void [mscorlib]System.Console::WriteLine(string,
object,
object)
IL_001e: ldc.i4 0x180
IL_0023: stloc.0
IL_0024: ldstr "{0} $$$ {1}"
IL_0029: ldc.i4 0x400
IL_002e: box [mscorlib]System.AttributeTargets
IL_0033: ldloc.0
IL_0034: box [mscorlib]System.AttributeTargets
IL_0039: call void [mscorlib]System.Console::WriteLine(string,
object,
object)
IL_003e: ret
} // end of method CustomAtributes::ObsoletedMethod
.property string Property()
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 0F 00 00 00 00 00 )
.get string CustomAttributes2.CustomAtributes::get_Property()
} // end of property CustomAtributes::Property
.property string GetterOnlyPropertyWithAttributeOnGetter()
{
.get string CustomAttributes2.CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter()
} // end of property CustomAtributes::GetterOnlyPropertyWithAttributeOnGetter
.property string GetterOnlyPropertyWithAttributeOnGetter2()
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 0F 00 00 00 00 00 )
.get string CustomAttributes2.CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter2()
} // end of property CustomAtributes::GetterOnlyPropertyWithAttributeOnGetter2
} // end of class CustomAttributes2.CustomAtributes
// =============================================================
// *********** DISASSEMBLY COMPLETE ***********************

163
ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes2.roslyn.il
Unescape View File

@ -0,0 +1,163 @@ @@ -0,0 +1,163 @@
// Metadata version: v4.0.30319
.assembly extern mscorlib
{
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 4:0:0:0
}
.assembly CustomAttributes2
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows.
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 07 01 00 00 00 00 )
.permissionset reqmin
= {[mscorlib]System.Security.Permissions.SecurityPermissionAttribute = {property bool 'SkipVerification' = bool(true)}}
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module CustomAttributes2.dll
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )
.imagebase 0x10000000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// =============== CLASS MEMBERS DECLARATION ===================
.class public abstract auto ansi sealed beforefieldinit CustomAttributes2.CustomAtributes
extends [mscorlib]System.Object
{
.class auto ansi sealed nested public EnumWithFlag
extends [mscorlib]System.Enum
{
.custom instance void [mscorlib]System.FlagsAttribute::.ctor() = ( 01 00 00 00 )
.field public specialname rtspecialname int32 value__
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag All = int32(0x0000000F)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag None = int32(0x00000000)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item1 = int32(0x00000001)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item2 = int32(0x00000002)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item3 = int32(0x00000004)
.field public static literal valuetype CustomAttributes2.CustomAtributes/EnumWithFlag Item4 = int32(0x00000008)
} // end of class EnumWithFlag
.class auto ansi nested public beforefieldinit MyAttribute
extends [mscorlib]System.Attribute
{
.custom instance void [mscorlib]System.AttributeUsageAttribute::.ctor(valuetype [mscorlib]System.AttributeTargets) = ( 01 00 FF 7F 00 00 00 00 )
.method public hidebysig specialname rtspecialname
instance void .ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag en) cil managed
{
// Code size 9 (0x9)
.maxstack 8
IL_0000: ldarg.0
IL_0001: call instance void [mscorlib]System.Attribute::.ctor()
IL_0006: nop
IL_0007: nop
IL_0008: ret
} // end of method MyAttribute::.ctor
} // end of class MyAttribute
.field private static int32 'field'
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 03 00 00 00 00 00 )
.method public hidebysig specialname static
string get_Property() cil managed
{
// Code size 6 (0x6)
.maxstack 8
IL_0000: ldstr "aa"
IL_0005: ret
} // end of method CustomAtributes::get_Property
.method public hidebysig specialname static
string get_GetterOnlyPropertyWithAttributeOnGetter() cil managed
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 01 00 00 00 00 00 )
// Code size 11 (0xb)
.maxstack 1
.locals init (string V_0)
IL_0000: nop
IL_0001: ldstr "aa"
IL_0006: stloc.0
IL_0007: br.s IL_0009
IL_0009: ldloc.0
IL_000a: ret
} // end of method CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter
.method public hidebysig specialname static
string get_GetterOnlyPropertyWithAttributeOnGetter2() cil managed
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 01 00 00 00 00 00 )
// Code size 11 (0xb)
.maxstack 1
.locals init (string V_0)
IL_0000: nop
IL_0001: ldstr "aa"
IL_0006: stloc.0
IL_0007: br.s IL_0009
IL_0009: ldloc.0
IL_000a: ret
} // end of method CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter2
.method public hidebysig static void ObsoletedMethod() cil managed
{
.custom instance void [mscorlib]System.ObsoleteAttribute::.ctor(string) = ( 01 00 0C 73 6F 6D 65 20 6D 65 73 73 61 67 65 00 // ...some message.
00 )
// Code size 66 (0x42)
.maxstack 3
.locals init (valuetype [mscorlib]System.AttributeTargets V_0)
IL_0000: nop
IL_0001: ldstr "{0} $$$ {1}"
IL_0006: ldc.i4 0x400
IL_000b: box [mscorlib]System.AttributeTargets
IL_0010: ldc.i4 0x180
IL_0015: box [mscorlib]System.AttributeTargets
IL_001a: call void [mscorlib]System.Console::WriteLine(string,
object,
object)
IL_001f: nop
IL_0020: ldc.i4 0x180
IL_0025: stloc.0
IL_0026: ldstr "{0} $$$ {1}"
IL_002b: ldc.i4 0x400
IL_0030: box [mscorlib]System.AttributeTargets
IL_0035: ldloc.0
IL_0036: box [mscorlib]System.AttributeTargets
IL_003b: call void [mscorlib]System.Console::WriteLine(string,
object,
object)
IL_0040: nop
IL_0041: ret
} // end of method CustomAtributes::ObsoletedMethod
.property string Property()
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 0F 00 00 00 00 00 )
.get string CustomAttributes2.CustomAtributes::get_Property()
} // end of property CustomAtributes::Property
.property string GetterOnlyPropertyWithAttributeOnGetter()
{
.get string CustomAttributes2.CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter()
} // end of property CustomAtributes::GetterOnlyPropertyWithAttributeOnGetter
.property string GetterOnlyPropertyWithAttributeOnGetter2()
{
.custom instance void CustomAttributes2.CustomAtributes/MyAttribute::.ctor(valuetype CustomAttributes2.CustomAtributes/EnumWithFlag) = ( 01 00 0F 00 00 00 00 00 )
.get string CustomAttributes2.CustomAtributes::get_GetterOnlyPropertyWithAttributeOnGetter2()
} // end of property CustomAtributes::GetterOnlyPropertyWithAttributeOnGetter2
} // end of class CustomAttributes2.CustomAtributes
// =============================================================
// *********** DISASSEMBLY COMPLETE ***********************

1
ICSharpCode.Decompiler/CSharp/Transforms/NormalizeBlockStatements.cs
Unescape View File

@ -131,6 +131,7 @@ namespace ICSharpCode.Decompiler.CSharp.Transforms @@ -131,6 +131,7 @@ namespace ICSharpCode.Decompiler.CSharp.Transforms
}
static readonly PropertyDeclaration CalculatedGetterOnlyPropertyPattern = new PropertyDeclaration() {
Attributes = { new Repeat(new AnyNode()) },
Modifiers = Modifiers.Any,
Name = Pattern.AnyString,
ReturnType = new AnyNode(),

Write Preview
Loading…
Cancel
Save