From 7afffa2715b07114991e10620a34308edb9a9c6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Strehovsk=C3=BD?= Date: Tue, 30 Jan 2018 13:52:20 +0100 Subject: [PATCH] Default interface methods test fixes (#15995) * The diamondshape test should work now that #15979 and #15978 are merged. * Create debug and retail version of diamondshape and sharedgenerics tests so that we have retail coverage. These tests hit issues around devirtualization (that is only active when RyuJIT is optimizing). * Add license headers --- tests/issues.targets | 3 -- .../constrainedcall/constrainedcall.cs | 4 +++ .../constrainedcall/constrainedcall.il | 3 ++ .../diamondshape/diamondshape.cs | 4 +++ .../diamondshape/diamondshape.il | 3 ++ .../diamondshape/diamondshape_d.ilproj | 37 ++++++++++++++++++++++ .../{diamondshape.ilproj => diamondshape_r.ilproj} | 6 ++-- .../genericmethods/genericmethods.cs | 4 +++ .../genericmethods/genericmethods.il | 3 ++ .../methodimpl/methodimpl.cs | 4 +++ .../methodimpl/methodimpl.il | 3 ++ .../sharedgenerics/sharedgenerics.cs | 4 +++ .../sharedgenerics/sharedgenerics.il | 3 ++ .../sharedgenerics/sharedgenerics_d.ilproj | 37 ++++++++++++++++++++++ ...aredgenerics.ilproj => sharedgenerics_r.ilproj} | 6 ++-- .../DefaultInterfaceMethods/simple/simple.cs | 4 +++ .../DefaultInterfaceMethods/simple/simple.il | 3 ++ .../valuetypes/valuetypes.cs | 4 +++ .../valuetypes/valuetypes.il | 3 ++ tests/testsFailingOutsideWindows.txt | 1 - 20 files changed, 131 insertions(+), 8 deletions(-) create mode 100644 tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_d.ilproj rename tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/{diamondshape.ilproj => diamondshape_r.ilproj} (92%) create mode 100644 tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_d.ilproj rename tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/{sharedgenerics.ilproj => sharedgenerics_r.ilproj} (92%) diff --git a/tests/issues.targets b/tests/issues.targets index 1ebf4cd..e32cc95 100644 --- a/tests/issues.targets +++ b/tests/issues.targets @@ -166,9 +166,6 @@ 11408 - - 15591 - 15353 diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.cs b/tests/src/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.cs index decd7bd..3f3d115 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.cs +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.cs @@ -1,3 +1,7 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + using System; using System.Collections.Generic; diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.il b/tests/src/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.il index ef39ba5..6e2ca95 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.il +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.il @@ -1,3 +1,6 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. // Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0 // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.cs b/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.cs index 3ff3760..42aa780 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.cs +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.cs @@ -1,3 +1,7 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + using System; interface IFoo diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.il b/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.il index 4173bc6..8440b10 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.il +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.il @@ -1,3 +1,6 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. // Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0 // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_d.ilproj b/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_d.ilproj new file mode 100644 index 0000000..dd18212 --- /dev/null +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_d.ilproj @@ -0,0 +1,37 @@ + + + + + $(MSBuildProjectName) + Debug + AnyCPU + 2.0 + {95DFC527-4DC1-495E-97D7-E94EE1F7140D} + 512 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 7a9bfb7d + true + true + Exe + BuildAndRun + 0 + + + + + False + + + + Full + + + + + + + + + + + diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.ilproj b/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_r.ilproj similarity index 92% rename from tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.ilproj rename to tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_r.ilproj index df375eb..b8dbea7 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.ilproj +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_r.ilproj @@ -2,7 +2,7 @@ - diamondshape + $(MSBuildProjectName) Debug AnyCPU 2.0 @@ -22,12 +22,14 @@ False + + + - diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.cs b/tests/src/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.cs index ca4936b..452f18e 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.cs +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.cs @@ -1,3 +1,7 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + using System; using System.Collections.Generic; using System.Linq; diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.il b/tests/src/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.il index 3a3204d..8ec8509 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.il +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.il @@ -1,3 +1,6 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. // Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0 // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.cs b/tests/src/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.cs index 0d4c119..c427544 100755 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.cs +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.cs @@ -1,3 +1,7 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + using System; interface IFoo diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.il b/tests/src/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.il index 7f94442..914f9a4 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.il +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.il @@ -1,3 +1,6 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. // Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0 // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.cs b/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.cs index 93b214d..cbc51e0 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.cs +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.cs @@ -1,3 +1,7 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + using System; interface IFoo diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.il b/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.il index 8e9eaec..c844f99 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.il +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.il @@ -1,3 +1,6 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. // Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0 // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_d.ilproj b/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_d.ilproj new file mode 100644 index 0000000..2cdea3a --- /dev/null +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_d.ilproj @@ -0,0 +1,37 @@ + + + + + $(MSBuildProjectName) + Debug + AnyCPU + 2.0 + {95DFC527-4DC1-495E-97D7-E94EE1F7140D} + 512 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 7a9bfb7d + true + true + Exe + BuildAndRun + 0 + + + + + False + + + + Full + + + + + + + + + + + diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.ilproj b/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_r.ilproj similarity index 92% rename from tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.ilproj rename to tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_r.ilproj index a97596e..45d186c 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.ilproj +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_r.ilproj @@ -2,7 +2,7 @@ - sharedgenerics + $(MSBuildProjectName) Debug AnyCPU 2.0 @@ -22,12 +22,14 @@ False + + + - diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/simple/simple.cs b/tests/src/Loader/classloader/DefaultInterfaceMethods/simple/simple.cs index 21e5c8a..3a31bd5 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/simple/simple.cs +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/simple/simple.cs @@ -1,3 +1,7 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + using System; interface IBlah diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/simple/simple.il b/tests/src/Loader/classloader/DefaultInterfaceMethods/simple/simple.il index c53ed0f..629ee4f 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/simple/simple.il +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/simple/simple.il @@ -1,3 +1,6 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. // Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0 // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.cs b/tests/src/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.cs index 0cf1be9..e775bec 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.cs +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.cs @@ -1,3 +1,7 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + using System; interface IValue diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.il b/tests/src/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.il index 56c23f1..2c10179 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.il +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.il @@ -1,3 +1,6 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. // Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0 // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/tests/testsFailingOutsideWindows.txt b/tests/testsFailingOutsideWindows.txt index 4a10b2f..4be1aea 100644 --- a/tests/testsFailingOutsideWindows.txt +++ b/tests/testsFailingOutsideWindows.txt @@ -71,7 +71,6 @@ GC/Features/BackgroundGC/foregroundgc/foregroundgc.sh GC/Features/LOHFragmentation/lohfragmentation/lohfragmentation.sh GC/Features/SustainedLowLatency/scenario/scenario.sh GC/Regressions/dev10bugs/536168/536168/536168.sh -Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape/diamondshape.sh Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall/constrainedcall.sh Loader/classloader/TypeGeneratorTests/TypeGeneratorTest612/Generated612/Generated612.sh Loader/classloader/TypeGeneratorTests/TypeGeneratorTest613/Generated613/Generated613.sh -- 2.7.4