Skip to content

Commit bff3d62

Browse files
vzarytovskiivzarytovskii
authored
Merge pull request #14733 from dotnet/merges/main-to-release/dev17.6
Merge main to release/dev17.6
2 parents f145033 + f8d722f commit bff3d62

22 files changed

+1318
-1604
lines changed

‎tests/FSharp.Compiler.ComponentTests/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.fs.il.net472.debug.bsl

+14-22
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
.assembly extern FSharp.Core
1313
{
1414
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....:
15-
.ver 6:0:0:0
15+
.ver 7:0:0:0
1616
}
1717
.assembly CompiledNameAttribute04
1818
{
@@ -21,29 +21,29 @@
2121
int32) = ( 01 00 02 00 00 00 00 00 00 00 00 00 00 00 00 00 )
2222

2323
// --- The following custom attribute is added automatically, do not uncomment -------
24-
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 03 01 00 00 00 00 )
24+
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 01 01 00 00 00 00 )
2525

2626
.hash algorithm 0x00008004
2727
.ver 0:0:0:0
2828
}
2929
.mresource public FSharpSignatureData.CompiledNameAttribute04
3030
{
31-
// Offset: 0x00000000 Length: 0x00000D2D
31+
// Offset: 0x00000000 Length: 0x00000D1B
3232
// WARNING: managed resource file FSharpSignatureData.CompiledNameAttribute04 created
3333
}
3434
.mresource public FSharpOptimizationData.CompiledNameAttribute04
3535
{
36-
// Offset: 0x00000D38 Length: 0x000002BB
36+
// Offset: 0x00000D20 Length: 0x000002BB
3737
// WARNING: managed resource file FSharpOptimizationData.CompiledNameAttribute04 created
3838
}
3939
.module CompiledNameAttribute04.exe
40-
// MVID: {623F5F36-34DF-584F-A745-0383365F3F62}
40+
// MVID: {63E6EA31-0A9C-B06D-A745-038331EAE663}
4141
.imagebase 0x00400000
4242
.file alignment 0x00000200
4343
.stackreserve 0x00100000
4444
.subsystem 0x0003 // WINDOWS_CUI
4545
.corflags 0x00000001 // ILONLY
46-
// Image base: 0x053F0000
46+
// Image base: 0x000002358DD80000
4747

4848

4949
// =============== CLASS MEMBERS DECLARATION ===================
@@ -142,8 +142,7 @@
142142
.method public hidebysig virtual final
143143
instance int32 CompareTo(valuetype Program/S obj) cil managed
144144
{
145-
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
146-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
145+
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
147146
// Code size 5 (0x5)
148147
.maxstack 3
149148
.locals init (valuetype Program/S& V_0)
@@ -156,8 +155,7 @@
156155
.method public hidebysig virtual final
157156
instance int32 CompareTo(object obj) cil managed
158157
{
159-
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
160-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
158+
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
161159
// Code size 13 (0xd)
162160
.maxstack 8
163161
IL_0000: ldarg.0
@@ -171,8 +169,7 @@
171169
instance int32 CompareTo(object obj,
172170
class [mscorlib]System.Collections.IComparer comp) cil managed
173171
{
174-
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
175-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
172+
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
176173
// Code size 12 (0xc)
177174
.maxstack 3
178175
.locals init (valuetype Program/S V_0,
@@ -189,8 +186,7 @@
189186
.method public hidebysig virtual final
190187
instance int32 GetHashCode(class [mscorlib]System.Collections.IEqualityComparer comp) cil managed
191188
{
192-
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
193-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
189+
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
194190
// Code size 2 (0x2)
195191
.maxstack 8
196192
IL_0000: ldc.i4.0
@@ -200,8 +196,7 @@
200196
.method public hidebysig virtual final
201197
instance int32 GetHashCode() cil managed
202198
{
203-
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
204-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
199+
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
205200
// Code size 12 (0xc)
206201
.maxstack 8
207202
IL_0000: ldarg.0
@@ -214,8 +209,7 @@
214209
instance bool Equals(object obj,
215210
class [mscorlib]System.Collections.IEqualityComparer comp) cil managed
216211
{
217-
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
218-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
212+
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
219213
// Code size 27 (0x1b)
220214
.maxstack 3
221215
.locals init (object V_0,
@@ -253,8 +247,7 @@
253247
.method public hidebysig virtual final
254248
instance bool Equals(valuetype Program/S obj) cil managed
255249
{
256-
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
257-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
250+
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
258251
// Code size 5 (0x5)
259252
.maxstack 3
260253
.locals init (valuetype Program/S& V_0)
@@ -267,8 +260,7 @@
267260
.method public hidebysig virtual final
268261
instance bool Equals(object obj) cil managed
269262
{
270-
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
271-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
263+
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
272264
// Code size 30 (0x1e)
273265
.maxstack 4
274266
.locals init (object V_0,

‎tests/FSharp.Compiler.ComponentTests/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.fs.il.netcore.debug.bsl

+17-25
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
.assembly extern System.Runtime
88
{
99
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....:
10-
.ver 6:0:0:0
10+
.ver 7:0:0:0
1111
}
1212
.assembly extern FSharp.Core
1313
{
1414
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....:
15-
.ver 6:0:0:0
15+
.ver 7:0:0:0
1616
}
1717
.assembly extern System.Runtime.InteropServices
1818
{
1919
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....:
20-
.ver 6:0:0:0
20+
.ver 7:0:0:0
2121
}
2222
.assembly CompiledNameAttribute04
2323
{
@@ -26,29 +26,29 @@
2626
int32) = ( 01 00 02 00 00 00 00 00 00 00 00 00 00 00 00 00 )
2727

2828
// --- The following custom attribute is added automatically, do not uncomment -------
29-
// .custom instance void [System.Runtime]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [System.Runtime]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 03 01 00 00 00 00 )
29+
// .custom instance void [System.Runtime]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [System.Runtime]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 01 01 00 00 00 00 )
3030

3131
.hash algorithm 0x00008004
3232
.ver 0:0:0:0
3333
}
3434
.mresource public FSharpSignatureData.CompiledNameAttribute04
3535
{
36-
// Offset: 0x00000000 Length: 0x00000D69
36+
// Offset: 0x00000000 Length: 0x00000D57
3737
// WARNING: managed resource file FSharpSignatureData.CompiledNameAttribute04 created
3838
}
3939
.mresource public FSharpOptimizationData.CompiledNameAttribute04
4040
{
41-
// Offset: 0x00000D70 Length: 0x000002C1
41+
// Offset: 0x00000D60 Length: 0x000002C1
4242
// WARNING: managed resource file FSharpOptimizationData.CompiledNameAttribute04 created
4343
}
4444
.module CompiledNameAttribute04.exe
45-
// MVID: {623F5E75-0386-3430-A745-0383755E3F62}
45+
// MVID: {63E6ED0E-F6F2-C3F7-A745-03830EEDE663}
4646
.imagebase 0x00400000
4747
.file alignment 0x00000200
4848
.stackreserve 0x00100000
4949
.subsystem 0x0003 // WINDOWS_CUI
5050
.corflags 0x00000001 // ILONLY
51-
// Image base: 0x0000023C6AAC0000
51+
// Image base: 0x0000027A45420000
5252

5353

5454
// =============== CLASS MEMBERS DECLARATION ===================
@@ -147,8 +147,7 @@
147147
.method public hidebysig virtual final
148148
instance int32 CompareTo(valuetype Program/S obj) cil managed
149149
{
150-
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
151-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
150+
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
152151
// Code size 5 (0x5)
153152
.maxstack 3
154153
.locals init (valuetype Program/S& V_0)
@@ -161,8 +160,7 @@
161160
.method public hidebysig virtual final
162161
instance int32 CompareTo(object obj) cil managed
163162
{
164-
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
165-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
163+
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
166164
// Code size 13 (0xd)
167165
.maxstack 8
168166
IL_0000: ldarg.0
@@ -176,8 +174,7 @@
176174
instance int32 CompareTo(object obj,
177175
class [System.Runtime]System.Collections.IComparer comp) cil managed
178176
{
179-
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
180-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
177+
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
181178
// Code size 12 (0xc)
182179
.maxstack 3
183180
.locals init (valuetype Program/S V_0,
@@ -194,8 +191,7 @@
194191
.method public hidebysig virtual final
195192
instance int32 GetHashCode(class [System.Runtime]System.Collections.IEqualityComparer comp) cil managed
196193
{
197-
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
198-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
194+
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
199195
// Code size 2 (0x2)
200196
.maxstack 8
201197
IL_0000: ldc.i4.0
@@ -205,8 +201,7 @@
205201
.method public hidebysig virtual final
206202
instance int32 GetHashCode() cil managed
207203
{
208-
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
209-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
204+
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
210205
// Code size 12 (0xc)
211206
.maxstack 8
212207
IL_0000: ldarg.0
@@ -219,8 +214,7 @@
219214
instance bool Equals(object obj,
220215
class [System.Runtime]System.Collections.IEqualityComparer comp) cil managed
221216
{
222-
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
223-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
217+
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
224218
// Code size 27 (0x1b)
225219
.maxstack 3
226220
.locals init (object V_0,
@@ -258,8 +252,7 @@
258252
.method public hidebysig virtual final
259253
instance bool Equals(valuetype Program/S obj) cil managed
260254
{
261-
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
262-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
255+
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
263256
// Code size 5 (0x5)
264257
.maxstack 3
265258
.locals init (valuetype Program/S& V_0)
@@ -272,8 +265,7 @@
272265
.method public hidebysig virtual final
273266
instance bool Equals(object obj) cil managed
274267
{
275-
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
276-
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
268+
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
277269
// Code size 30 (0x1e)
278270
.maxstack 4
279271
.locals init (object V_0,
@@ -406,4 +398,4 @@
406398
// =============================================================
407399

408400
// *********** DISASSEMBLY COMPLETE ***********************
409-
// WARNING: Created Win32 resource file C:\kevinransom\fsharp\artifacts\bin\FSharp.Compiler.ComponentTests\Debug\net6.0\tests\EmittedIL\CompiledNameAttribute\CompiledNameAttribute04_fs\CompiledNameAttribute04.res
401+
// WARNING: Created Win32 resource file C:\kevinransom\fsharp\artifacts\bin\FSharp.Compiler.ComponentTests\Debug\net7.0\tests\EmittedIL\CompiledNameAttribute\CompiledNameAttribute04_fs\CompiledNameAttribute04.res

0 commit comments

Comments
 (0)