Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1051 from ashmind/feature/ugly-array-initializers
Support for ArrayInitializers=false (SharpLab)
- Loading branch information
Showing
10 changed files
with
441 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| /*.res | ||
| /*.dll | ||
| /*.exe | ||
| /*.pdb |
32 changes: 32 additions & 0 deletions
32
ICSharpCode.Decompiler.Tests/TestCases/Ugly/NoArrayInitializers.Expected.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| using System; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Runtime.InteropServices; | ||
| namespace ICSharpCode.Decompiler.Tests.TestCases.Ugly | ||
| { | ||
| public class NoArrayInitializers | ||
| { | ||
| public int[] LiteralArray() | ||
| { | ||
| int[] obj = new int[3]; | ||
| RuntimeHelpers.InitializeArray(obj, (RuntimeFieldHandle)/*OpCode not supported: LdMemberToken*/); | ||
| return obj; | ||
| } | ||
|
|
||
| public int[] VariableArray(int a, int b) | ||
| { | ||
| int[] obj = new int[2]; | ||
| obj[0] = a; | ||
| obj[1] = b; | ||
| return obj; | ||
| } | ||
| } | ||
| } | ||
| [CompilerGenerated] | ||
| internal sealed class _003CPrivateImplementationDetails_003E | ||
| { | ||
| [StructLayout(LayoutKind.Explicit, Pack = 1, Size = 12)] | ||
| private struct __StaticArrayInitTypeSize_003D12 | ||
| { | ||
| } | ||
| internal static readonly __StaticArrayInitTypeSize_003D12 E429CCA3F703A39CC5954A6572FEC9086135B34E/* Not supported: data(01 00 00 00 02 00 00 00 03 00 00 00) */; | ||
| } |
39 changes: 39 additions & 0 deletions
39
ICSharpCode.Decompiler.Tests/TestCases/Ugly/NoArrayInitializers.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // Copyright (c) AlphaSierraPapa for the SharpDevelop Team | ||
| // | ||
| // 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. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace ICSharpCode.Decompiler.Tests.TestCases.Ugly | ||
| { | ||
| public class NoArrayInitializers | ||
| { | ||
| public int[] LiteralArray() | ||
| { | ||
| return new[] { 1, 2, 3 }; | ||
| } | ||
|
|
||
| public int[] VariableArray(int a, int b) | ||
| { | ||
| return new[] { a, b }; | ||
| } | ||
| } | ||
| } |
107 changes: 107 additions & 0 deletions
107
ICSharpCode.Decompiler.Tests/TestCases/Ugly/NoArrayInitializers.opt.roslyn.il
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
|
|
||
| // Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0 | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
|
|
||
|
|
||
|
|
||
| // 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 NoArrayInitializers | ||
| { | ||
| .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 NoArrayInitializers.dll | ||
| // MVID: {C6AD59A2-7245-425B-A6BB-29F93FAB1116} | ||
| .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 | ||
| // Image base: 0x00FD0000 | ||
|
|
||
|
|
||
| // =============== CLASS MEMBERS DECLARATION =================== | ||
|
|
||
| .class public auto ansi beforefieldinit ICSharpCode.Decompiler.Tests.TestCases.Ugly.NoArrayInitializers | ||
| extends [mscorlib]System.Object | ||
| { | ||
| .method public hidebysig instance int32[] | ||
| LiteralArray() cil managed | ||
| { | ||
| // Code size 18 (0x12) | ||
| .maxstack 8 | ||
| IL_0000: ldc.i4.3 | ||
| IL_0001: newarr [mscorlib]System.Int32 | ||
| IL_0006: dup | ||
| IL_0007: ldtoken field valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=12' '<PrivateImplementationDetails>'::E429CCA3F703A39CC5954A6572FEC9086135B34E | ||
| IL_000c: call void [mscorlib]System.Runtime.CompilerServices.RuntimeHelpers::InitializeArray(class [mscorlib]System.Array, | ||
| valuetype [mscorlib]System.RuntimeFieldHandle) | ||
| IL_0011: ret | ||
| } // end of method NoArrayInitializers::LiteralArray | ||
|
|
||
| .method public hidebysig instance int32[] | ||
| VariableArray(int32 a, | ||
| int32 b) cil managed | ||
| { | ||
| // Code size 15 (0xf) | ||
| .maxstack 8 | ||
| IL_0000: ldc.i4.2 | ||
| IL_0001: newarr [mscorlib]System.Int32 | ||
| IL_0006: dup | ||
| IL_0007: ldc.i4.0 | ||
| IL_0008: ldarg.1 | ||
| IL_0009: stelem.i4 | ||
| IL_000a: dup | ||
| IL_000b: ldc.i4.1 | ||
| IL_000c: ldarg.2 | ||
| IL_000d: stelem.i4 | ||
| IL_000e: ret | ||
| } // end of method NoArrayInitializers::VariableArray | ||
|
|
||
| .method public hidebysig specialname rtspecialname | ||
| instance void .ctor() cil managed | ||
| { | ||
| // Code size 7 (0x7) | ||
| .maxstack 8 | ||
| IL_0000: ldarg.0 | ||
| IL_0001: call instance void [mscorlib]System.Object::.ctor() | ||
| IL_0006: ret | ||
| } // end of method NoArrayInitializers::.ctor | ||
|
|
||
| } // end of class ICSharpCode.Decompiler.Tests.TestCases.Ugly.NoArrayInitializers | ||
|
|
||
| .class private auto ansi sealed '<PrivateImplementationDetails>' | ||
| extends [mscorlib]System.Object | ||
| { | ||
| .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) | ||
| .class explicit ansi sealed nested private '__StaticArrayInitTypeSize=12' | ||
| extends [mscorlib]System.ValueType | ||
| { | ||
| .pack 1 | ||
| .size 12 | ||
| } // end of class '__StaticArrayInitTypeSize=12' | ||
|
|
||
| .field static assembly initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=12' E429CCA3F703A39CC5954A6572FEC9086135B34E at I_00002698 | ||
| } // end of class '<PrivateImplementationDetails>' | ||
|
|
||
|
|
||
| // ============================================================= | ||
|
|
||
| .data cil I_00002698 = bytearray ( | ||
| 01 00 00 00 02 00 00 00 03 00 00 00) | ||
| // *********** DISASSEMBLY COMPLETE *********************** |
120 changes: 120 additions & 0 deletions
120
ICSharpCode.Decompiler.Tests/TestCases/Ugly/NoArrayInitializers.roslyn.il
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
|
|
||
| // Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0 | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
|
|
||
|
|
||
|
|
||
| // 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 NoArrayInitializers | ||
| { | ||
| .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 NoArrayInitializers.dll | ||
| // MVID: {C1B38171-55C8-4DDA-ACC8-78EFA1168D40} | ||
| .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 | ||
| // Image base: 0x03D10000 | ||
|
|
||
|
|
||
| // =============== CLASS MEMBERS DECLARATION =================== | ||
|
|
||
| .class public auto ansi beforefieldinit ICSharpCode.Decompiler.Tests.TestCases.Ugly.NoArrayInitializers | ||
| extends [mscorlib]System.Object | ||
| { | ||
| .method public hidebysig instance int32[] | ||
| LiteralArray() cil managed | ||
| { | ||
| // Code size 23 (0x17) | ||
| .maxstack 3 | ||
| .locals init (int32[] V_0) | ||
| IL_0000: nop | ||
| IL_0001: ldc.i4.3 | ||
| IL_0002: newarr [mscorlib]System.Int32 | ||
| IL_0007: dup | ||
| IL_0008: ldtoken field valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=12' '<PrivateImplementationDetails>'::E429CCA3F703A39CC5954A6572FEC9086135B34E | ||
| IL_000d: call void [mscorlib]System.Runtime.CompilerServices.RuntimeHelpers::InitializeArray(class [mscorlib]System.Array, | ||
| valuetype [mscorlib]System.RuntimeFieldHandle) | ||
| IL_0012: stloc.0 | ||
| IL_0013: br.s IL_0015 | ||
|
|
||
| IL_0015: ldloc.0 | ||
| IL_0016: ret | ||
| } // end of method NoArrayInitializers::LiteralArray | ||
|
|
||
| .method public hidebysig instance int32[] | ||
| VariableArray(int32 a, | ||
| int32 b) cil managed | ||
| { | ||
| // Code size 20 (0x14) | ||
| .maxstack 4 | ||
| .locals init (int32[] V_0) | ||
| IL_0000: nop | ||
| IL_0001: ldc.i4.2 | ||
| IL_0002: newarr [mscorlib]System.Int32 | ||
| IL_0007: dup | ||
| IL_0008: ldc.i4.0 | ||
| IL_0009: ldarg.1 | ||
| IL_000a: stelem.i4 | ||
| IL_000b: dup | ||
| IL_000c: ldc.i4.1 | ||
| IL_000d: ldarg.2 | ||
| IL_000e: stelem.i4 | ||
| IL_000f: stloc.0 | ||
| IL_0010: br.s IL_0012 | ||
|
|
||
| IL_0012: ldloc.0 | ||
| IL_0013: ret | ||
| } // end of method NoArrayInitializers::VariableArray | ||
|
|
||
| .method public hidebysig specialname rtspecialname | ||
| instance void .ctor() cil managed | ||
| { | ||
| // Code size 8 (0x8) | ||
| .maxstack 8 | ||
| IL_0000: ldarg.0 | ||
| IL_0001: call instance void [mscorlib]System.Object::.ctor() | ||
| IL_0006: nop | ||
| IL_0007: ret | ||
| } // end of method NoArrayInitializers::.ctor | ||
|
|
||
| } // end of class ICSharpCode.Decompiler.Tests.TestCases.Ugly.NoArrayInitializers | ||
|
|
||
| .class private auto ansi sealed '<PrivateImplementationDetails>' | ||
| extends [mscorlib]System.Object | ||
| { | ||
| .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) | ||
| .class explicit ansi sealed nested private '__StaticArrayInitTypeSize=12' | ||
| extends [mscorlib]System.ValueType | ||
| { | ||
| .pack 1 | ||
| .size 12 | ||
| } // end of class '__StaticArrayInitTypeSize=12' | ||
|
|
||
| .field static assembly initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=12' E429CCA3F703A39CC5954A6572FEC9086135B34E at I_000026C8 | ||
| } // end of class '<PrivateImplementationDetails>' | ||
|
|
||
|
|
||
| // ============================================================= | ||
|
|
||
| .data cil I_000026C8 = bytearray ( | ||
| 01 00 00 00 02 00 00 00 03 00 00 00) | ||
| // *********** DISASSEMBLY COMPLETE *********************** |
Oops, something went wrong.