Skip to content

IL cleanup - remove .module and make .assembly match source name #62812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 15, 2021
Merged

IL cleanup - remove .module and make .assembly match source name #62812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/Convert/implicitConv.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}

.assembly ILGEN_0xc60e022c {}
.assembly 'implicitConv' {}
.assembly extern mscorlib{auto}

.class ILGEN_0xc60e022c {
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/Convert/ldind_conv.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.assembly extern System.Console { auto }
.assembly extern System.Runtime { auto }

.assembly test { }
.assembly 'ldind_conv' { }

.class auto Program extends [System.Runtime]System.Object
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/Convert/minopts_convu1.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}

.assembly ILGEN_0xb0847955 {}
.assembly 'minopts_convu1' {}
.assembly extern mscorlib{auto}

.class ILGEN_0xb0847955 {
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.assembly extern System.Console { auto }
.assembly extern xunit.core {}
.assembly extern System.Runtime { auto }
.assembly SignedOverflowConversionsAreNotTreatedAsUnsigned { }
.assembly 'signed_overflow_conversions_are_not_treated_as_unsigned' { }

.class auto SignedOverflowConversionsAreNotTreatedAsUnsigned extends [System.Runtime]System.Object
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/FaultHandlers/CallOrder/CallOrder.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly callorder
.assembly 'CallOrder'
{
}
//------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/FaultHandlers/Nesting/Nesting.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly nesting
.assembly 'Nesting'
{
}
.class public auto ansi X
Expand Down
3 changes: 1 addition & 2 deletions src/tests/JIT/Directed/IL/Tailcall/Jittailcall2.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@



.module 'aaa.exe'
.assembly extern legacy library mscorlib {}
.assembly extern xunit.core {}
.assembly extern System.Console
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly 'aaa'// as "aaa"
.assembly 'Jittailcall2'// as "aaa"
{


Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/RVAInit/extended.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
.assembly extended
{
}
.module extended.exe
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )

.file alignment 512
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/RVAInit/gcref1.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
.assembly gcref1
{
}
.module gcref1.exe
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )


Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/RVAInit/gcref2.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
.assembly gcref2
{
}
.module gcref1.exe
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )


Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/RVAInit/nested.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
.assembly 'nested'
{
}
.module nested.exe
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )

.file alignment 512
Expand Down
3 changes: 1 addition & 2 deletions src/tests/JIT/Directed/RVAInit/oddsize.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly test
.assembly 'oddsize'
{
}
.module test.exe
// MVID: {3DA3EDA0-F1A4-42F9-8E0B-F269420E91A5}

.file alignment 512
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/RVAInit/overlap.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
.assembly overlap
{
}
.module overlap.exe
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )

.file alignment 512
Expand Down
3 changes: 1 addition & 2 deletions src/tests/JIT/Directed/RVAInit/simplearg.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@
.ver 4:0:0:0
}
.assembly extern xunit.core {}
.assembly repro2
.assembly 'simplearg'
{
.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.
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module repro2.exe
// MVID: {07A1F03C-A750-4BCF-8997-C0AC2CBDB844}
.imagebase 0x00400000
.file alignment 0x00000200
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/UnrollLoop/loop3.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly loop2 {}
.assembly 'loop3' {}
.class private auto ansi beforefieldinit A
extends [mscorlib]System.Object
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

.assembly extern mscorlib {}
.assembly extern xunit.core {}
.assembly badldslfd { }
.assembly 'badldsfld' { }
.class Test_badldsfld extends [mscorlib]System.Object
{
.field int32 i
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
.assembly legacy library arrlen { }
.assembly legacy library 'nullsdarr' { }
.class private auto ansi beforefieldinit nullsdarr
extends [mscorlib]System.Object
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/coverage/importer/nullsdarr.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly legacy library arrlen {}
.assembly legacy library 'nullsdarr' {}
.class private auto ansi beforefieldinit nullsdarr
extends [mscorlib]System.Object
{
Expand Down
3 changes: 1 addition & 2 deletions src/tests/JIT/Directed/coverage/oldtests/ldfldstatic.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
.assembly ldflds {}
.module ldfldstatic.exe
.assembly 'ldfldstatic' {}
.class private auto ansi beforefieldinit ldfldstatic
extends [mscorlib]System.Object
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly switchdefaultonly1 {}
.assembly 'switchdefaultonly2' {}
.class private auto ansi beforefieldinit switchdefaultonly1
extends [mscorlib]System.Object
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly switchdefaultonly1 {}
.assembly 'switchdefaultonly3' {}
.class private auto ansi beforefieldinit switchdefaultonly1
extends [mscorlib]System.Object
{
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/forceinlining/AttributeConflict.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
{
}

.module AttributeConflict.exe

.class public auto ansi beforefieldinit P
extends [mscorlib]System.Object
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/forceinlining/NegativeCases.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
{
}

.module NegativeCases.exe

.class public auto ansi beforefieldinit P
extends [mscorlib]System.Object
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/forceinlining/PositiveCases.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
{
}

.module PositiveCases.exe

.class public sequential ansi sealed beforefieldinit S
extends [mscorlib]System.ValueType
Expand Down
3 changes: 1 addition & 2 deletions src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic1.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 )
.ver 4:0:0:0
}
.assembly o
.assembly 'rva_rvaStatic1'
{
.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
63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 )
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module o.exe
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
Expand Down
3 changes: 1 addition & 2 deletions src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic2.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 )
.ver 4:0:0:0
}
.assembly o
.assembly 'rva_rvaStatic2'
{
.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
63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 )
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module o.exe
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
Expand Down
3 changes: 1 addition & 2 deletions src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic3.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 )
.ver 4:0:0:0
}
.assembly o
.assembly 'rva_rvaStatic3'
{
.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
63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 )
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module o.exe
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
Expand Down
3 changes: 1 addition & 2 deletions src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic4.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 )
.ver 4:0:0:0
}
.assembly o
.assembly 'rva_rvaStatic4'
{
.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
63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 )
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module o.exe
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/leave/catch1.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
.assembly catch1
{
}
.module catch1.exe
.class private sealed VT
extends [mscorlib]System.ValueType
{
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/leave/catch2.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
.assembly catch2
{
}
.module catch2.exe
.class private sealed VT
extends [mscorlib]System.ValueType
{
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/leave/catch3.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
.assembly catch3
{
}
.module catch3.exe
.class private sealed VT
extends [mscorlib]System.ValueType
{
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/leave/filter1.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
.assembly filter1
{
}
.module filter1.exe
.class private sealed VT
extends [mscorlib]System.ValueType
{
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/leave/filter2.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
.assembly filter2
{
}
.module filter2.exe
.class private sealed VT
extends [mscorlib]System.ValueType
{
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/leave/filter3.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
.assembly filter3
{
}
.module filter3.exe
.class private sealed VT
extends [mscorlib]System.ValueType
{
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/leave/try1.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
.assembly try1
{
}
.module try1.exe
.class private sealed VT
extends [mscorlib]System.ValueType
{
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/leave/try2.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
.assembly try2
{
}
.module try2.exe
.class private sealed VT
extends [mscorlib]System.ValueType
{
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/leave/try3.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
.assembly try3
{
}
.module try3.exe
.class private sealed VT
extends [mscorlib]System.ValueType
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/pinning/object-pin/Object-Pin.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
.assembly objectpin
.assembly 'Object-Pin'
{
}

Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/pinvoke/preemptive_cooperative.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.


.module extern kernel32.dll
.assembly extern System.Console { auto }
.assembly extern xunit.core {}
.assembly extern System.Threading.Thread { auto }
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/pinvoke/sysinfo.il
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

.module extern kernel32
.assembly extern mscorlib { }
.assembly extern xunit.core {}
.assembly extern System.Console
Expand Down
Loading