Skip to content

Commit

Permalink
changes to tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@dsyme
dsyme committed Feb 7, 2016
1 parent 5467df3 commit df0f269
Show file tree
Hide file tree
Showing 9 changed files with 85 additions and 83 deletions.
12 changes: 6 additions & 6 deletions tests/fsharpqa/Source/Optimizations/GenericComparison/Compare06.il.netfx4.bsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,28 +504,28 @@
[1] class Compare06/CompareMicroPerfAndCodeGenerationTests/KeyR t1,
[2] class Compare06/CompareMicroPerfAndCodeGenerationTests/KeyR t2,
[3] int32 i)
.line 6,6 : 8,25
.line 6,6 : 8,25
IL_0000: nop
IL_0001: ldc.i4.1
IL_0002: stloc.0
.line 7,7 : 8,39
.line 7,7 : 8,39
IL_0003: ldc.i4.1
IL_0004: ldc.i4.2
IL_0005: newobj instance void Compare06/CompareMicroPerfAndCodeGenerationTests/KeyR::.ctor(int32,
int32)
IL_000a: stloc.1
.line 8,8 : 8,39
.line 8,8 : 8,39
IL_000b: ldc.i4.1
IL_000c: ldc.i4.3
IL_000d: newobj instance void Compare06/CompareMicroPerfAndCodeGenerationTests/KeyR::.ctor(int32,
int32)
IL_0012: stloc.2
.line 9,9 : 8,32
.line 9,9 : 8,32
IL_0013: ldc.i4.0
IL_0014: stloc.3
IL_0015: br.s IL_0023

.line 10,10 : 12,30
.line 10,10 : 12,30
IL_0017: ldloc.1
IL_0018: ldloc.2
IL_0019: callvirt instance int32 Compare06/CompareMicroPerfAndCodeGenerationTests/KeyR::CompareTo(class Compare06/CompareMicroPerfAndCodeGenerationTests/KeyR)
Expand All @@ -534,7 +534,7 @@
IL_0020: ldc.i4.1
IL_0021: add
IL_0022: stloc.3
.line 9,9 : 21,29
.line 9,9 : 21,29
IL_0023: ldloc.3
IL_0024: ldc.i4 0x989681
IL_0029: blt.s IL_0017
Expand Down
54 changes: 27 additions & 27 deletions tests/fsharpqa/Source/Optimizations/GenericComparison/Compare07.il.netfx4.bsl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

// Microsoft (R) .NET Framework IL Disassembler. Version 4.0.30319.17376
// Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0
// Copyright (c) Microsoft Corporation. All rights reserved.


Expand All @@ -13,7 +13,7 @@
.assembly extern FSharp.Core
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....:
.ver 4:3:0:0
.ver 4:4:1:9055
}
.assembly Compare07
{
Expand All @@ -29,20 +29,22 @@
}
.mresource public FSharpSignatureData.Compare07
{
// Offset: 0x00000000 Length: 0x000008B6
// Offset: 0x00000000 Length: 0x0000089A
// WARNING: managed resource file FSharpSignatureData.Compare07 created
}
.mresource public FSharpOptimizationData.Compare07
{
// Offset: 0x000008C0 Length: 0x000006A4
// Offset: 0x000008A0 Length: 0x00000694
// WARNING: managed resource file FSharpOptimizationData.Compare07 created
}
.module Compare07.dll
// MVID: {4F20E44D-05DE-F88E-A745-03834DE4204F}
// MVID: {56B7C20F-05DE-F88E-A745-03830FC2B756}
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// Image base: 0x000000ADDE9C0000
// Image base: 0x01310000


// =============== CLASS MEMBERS DECLARATION ===================
Expand Down Expand Up @@ -254,17 +256,16 @@
instance int32 CompareTo(object obj) cil managed
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 16 (0x10)
// Code size 14 (0xe)
.maxstack 8
.language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}'
.line 4,4 : 10,20
.line 4,4 : 10,20
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
IL_0003: unbox.any class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!a>
IL_0008: tail.
IL_000a: callvirt instance int32 class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!a>::CompareTo(class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!0>)
IL_000f: ret
IL_0008: callvirt instance int32 class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!a>::CompareTo(class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!0>)
IL_000d: ret
} // end of method GenericKey`1::CompareTo

.method public hidebysig virtual final
Expand All @@ -280,7 +281,7 @@
[3] int32 V_3,
[4] !a V_4,
[5] !a V_5)
.line 4,4 : 10,20
.line 4,4 : 10,20
IL_0000: nop
IL_0001: ldarg.1
IL_0002: unbox.any class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!a>
Expand Down Expand Up @@ -432,7 +433,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 4,4 : 10,20
.line 4,4 : 10,20
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
Expand Down Expand Up @@ -583,24 +584,23 @@
instance bool Equals(object obj) cil managed
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 23 (0x17)
// Code size 21 (0x15)
.maxstack 4
.locals init (class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!a> V_0)
IL_0000: nop
IL_0001: ldarg.1
IL_0002: isinst class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!a>
IL_0007: stloc.0
IL_0008: ldloc.0
IL_0009: brfalse.s IL_0015
IL_0009: brfalse.s IL_0013

IL_000b: ldarg.0
IL_000c: ldloc.0
IL_000d: tail.
IL_000f: callvirt instance bool class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!a>::Equals(class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!0>)
IL_0014: ret
IL_000d: callvirt instance bool class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!a>::Equals(class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!0>)
IL_0012: ret

IL_0015: ldc.i4.0
IL_0016: ret
IL_0013: ldc.i4.0
IL_0014: ret
} // end of method GenericKey`1::Equals

.property instance int32 Tag()
Expand Down Expand Up @@ -638,28 +638,28 @@
[1] class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<int32> t1,
[2] class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<int32> t2,
[3] int32 i)
.line 6,6 : 8,25
.line 6,6 : 8,25
IL_0000: nop
IL_0001: ldc.i4.1
IL_0002: stloc.0
.line 7,7 : 8,32
.line 7,7 : 8,32
IL_0003: ldc.i4.1
IL_0004: ldc.i4.2
IL_0005: call class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!0> class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<int32>::NewGenericKey(!0,
!0)
IL_000a: stloc.1
.line 8,8 : 8,32
.line 8,8 : 8,32
IL_000b: ldc.i4.1
IL_000c: ldc.i4.3
IL_000d: call class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!0> class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<int32>::NewGenericKey(!0,
!0)
IL_0012: stloc.2
.line 9,9 : 8,32
.line 9,9 : 8,32
IL_0013: ldc.i4.0
IL_0014: stloc.3
IL_0015: br.s IL_0023

.line 10,10 : 12,30
.line 10,10 : 12,30
IL_0017: ldloc.1
IL_0018: ldloc.2
IL_0019: callvirt instance int32 class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<int32>::CompareTo(class Compare07/CompareMicroPerfAndCodeGenerationTests/GenericKey`1<!0>)
Expand All @@ -668,12 +668,12 @@
IL_0020: ldc.i4.1
IL_0021: add
IL_0022: stloc.3
.line 9,9 : 21,29
.line 9,9 : 21,29
IL_0023: ldloc.3
IL_0024: ldc.i4 0x989681
IL_0029: blt.s IL_0017

.line 11,11 : 8,9
.line 11,11 : 8,9
IL_002b: ldloc.0
IL_002c: ret
} // end of method CompareMicroPerfAndCodeGenerationTests::f6
Expand Down
Binary file modified tests/fsharpqa/Source/Optimizations/GenericComparison/Compare10.il.netfx4.bsl
View file
Binary file not shown.
54 changes: 27 additions & 27 deletions tests/fsharpqa/Source/Optimizations/GenericComparison/Equals06.il.netfx4.bsl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

// Microsoft (R) .NET Framework IL Disassembler. Version 4.0.30319.17376
// Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0
// Copyright (c) Microsoft Corporation. All rights reserved.


Expand All @@ -13,7 +13,7 @@
.assembly extern FSharp.Core
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....:
.ver 4:3:0:0
.ver 4:4:1:9055
}
.assembly Equals06
{
Expand All @@ -29,20 +29,22 @@
}
.mresource public FSharpSignatureData.Equals06
{
// Offset: 0x00000000 Length: 0x000008B2
// Offset: 0x00000000 Length: 0x00000896
// WARNING: managed resource file FSharpSignatureData.Equals06 created
}
.mresource public FSharpOptimizationData.Equals06
{
// Offset: 0x000008B8 Length: 0x000006A0
// Offset: 0x000008A0 Length: 0x00000690
// WARNING: managed resource file FSharpOptimizationData.Equals06 created
}
.module Equals06.dll
// MVID: {4F20E45C-0759-31EC-A745-03835CE4204F}
// MVID: {56B7C2C7-0759-31EC-A745-0383C7C2B756}
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// Image base: 0x0000003652390000
// Image base: 0x00B20000


// =============== CLASS MEMBERS DECLARATION ===================
Expand Down Expand Up @@ -254,17 +256,16 @@
instance int32 CompareTo(object obj) cil managed
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 16 (0x10)
// Code size 14 (0xe)
.maxstack 8
.language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}'
.line 4,4 : 10,20
.line 4,4 : 10,20
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
IL_0003: unbox.any class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!a>
IL_0008: tail.
IL_000a: callvirt instance int32 class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!a>::CompareTo(class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!0>)
IL_000f: ret
IL_0008: callvirt instance int32 class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!a>::CompareTo(class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!0>)
IL_000d: ret
} // end of method GenericKey`1::CompareTo

.method public hidebysig virtual final
Expand All @@ -280,7 +281,7 @@
[3] int32 V_3,
[4] !a V_4,
[5] !a V_5)
.line 4,4 : 10,20
.line 4,4 : 10,20
IL_0000: nop
IL_0001: ldarg.1
IL_0002: unbox.any class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!a>
Expand Down Expand Up @@ -432,7 +433,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 4,4 : 10,20
.line 4,4 : 10,20
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
Expand Down Expand Up @@ -583,24 +584,23 @@
instance bool Equals(object obj) cil managed
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 23 (0x17)
// Code size 21 (0x15)
.maxstack 4
.locals init (class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!a> V_0)
IL_0000: nop
IL_0001: ldarg.1
IL_0002: isinst class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!a>
IL_0007: stloc.0
IL_0008: ldloc.0
IL_0009: brfalse.s IL_0015
IL_0009: brfalse.s IL_0013

IL_000b: ldarg.0
IL_000c: ldloc.0
IL_000d: tail.
IL_000f: callvirt instance bool class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!a>::Equals(class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!0>)
IL_0014: ret
IL_000d: callvirt instance bool class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!a>::Equals(class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!0>)
IL_0012: ret

IL_0015: ldc.i4.0
IL_0016: ret
IL_0013: ldc.i4.0
IL_0014: ret
} // end of method GenericKey`1::Equals

.property instance int32 Tag()
Expand Down Expand Up @@ -638,28 +638,28 @@
[1] class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<int32> t1,
[2] class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<int32> t2,
[3] int32 i)
.line 6,6 : 8,29
.line 6,6 : 8,29
IL_0000: nop
IL_0001: ldc.i4.0
IL_0002: stloc.0
.line 7,7 : 8,32
.line 7,7 : 8,32
IL_0003: ldc.i4.1
IL_0004: ldc.i4.2
IL_0005: call class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!0> class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<int32>::NewGenericKey(!0,
!0)
IL_000a: stloc.1
.line 8,8 : 8,32
.line 8,8 : 8,32
IL_000b: ldc.i4.1
IL_000c: ldc.i4.3
IL_000d: call class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<!0> class Equals06/EqualsMicroPerfAndCodeGenerationTests/GenericKey`1<int32>::NewGenericKey(!0,
!0)
IL_0012: stloc.2
.line 9,9 : 8,32
.line 9,9 : 8,32
IL_0013: ldc.i4.0
IL_0014: stloc.3
IL_0015: br.s IL_0028

.line 10,10 : 12,26
.line 10,10 : 12,26
IL_0017: ldloc.1
IL_0018: ldloc.2
IL_0019: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
Expand All @@ -670,12 +670,12 @@
IL_0025: ldc.i4.1
IL_0026: add
IL_0027: stloc.3
.line 9,9 : 21,29
.line 9,9 : 21,29
IL_0028: ldloc.3
IL_0029: ldc.i4 0x989681
IL_002e: blt.s IL_0017

.line 11,11 : 8,9
.line 11,11 : 8,9
IL_0030: ldloc.0
IL_0031: ret
} // end of method EqualsMicroPerfAndCodeGenerationTests::f6
Expand Down
Binary file modified tests/fsharpqa/Source/Optimizations/GenericComparison/Equals09.il.netfx4.bsl
View file
Binary file not shown.
Loading

0 comments on commit df0f269

Please sign in to comment.