From 205f70e04b5f57b54a97967c1e2c3f198519540d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Rylek?= Date: Wed, 9 Feb 2022 00:58:21 +0100 Subject: [PATCH] Fix System.Runtime reference versions and several test project names under JIT/Methodical (#64839) * Fix System.Runtime reference public key token in delegatetail.il * Three more IL sources needing explicit System.Runtime PKT * Clean up several project file names * Typo * Fix assembly name for sin_cs_il* tests --- src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il | 2 +- ...{sin_cs_cs_d.csproj => sin_cs_cs_sinlib_d.csproj} | 0 ...in_cs_cs_do.csproj => sin_cs_cs_sinlib_do.csproj} | 0 ...{sin_cs_cs_r.csproj => sin_cs_cs_sinlib_r.csproj} | 0 ...in_cs_cs_ro.csproj => sin_cs_cs_sinlib_ro.csproj} | 0 ...{sin_cs_il_d.csproj => sin_cs_il_sinlib_d.csproj} | 0 ...in_cs_il_do.csproj => sin_cs_il_sinlib_do.csproj} | 0 ...{sin_cs_il_r.csproj => sin_cs_il_sinlib_r.csproj} | 0 ...in_cs_il_ro.csproj => sin_cs_il_sinlib_ro.csproj} | 0 .../Coverage/copy_prop_byref_to_native_int.il | 2 +- ...Finallys_il.ilproj => twoEndFinallys_il_r.ilproj} | 0 src/tests/JIT/Methodical/int64/misc/longmul.il | 2 +- src/tests/JIT/Methodical/tailcall_v4/delegateTail.il | 12 ++---------- src/tests/JIT/Methodical/xxblk/dynblk_order.il | 2 +- ...ynblk_order_d.ilproj => dynblk_order_il_d.ilproj} | 0 ...nblk_order_ro.ilproj => dynblk_order_il_r.ilproj} | 0 16 files changed, 6 insertions(+), 14 deletions(-) rename src/tests/JIT/Methodical/Boxing/xlang/{sin_cs_cs_d.csproj => sin_cs_cs_sinlib_d.csproj} (100%) rename src/tests/JIT/Methodical/Boxing/xlang/{sin_cs_cs_do.csproj => sin_cs_cs_sinlib_do.csproj} (100%) rename src/tests/JIT/Methodical/Boxing/xlang/{sin_cs_cs_r.csproj => sin_cs_cs_sinlib_r.csproj} (100%) rename src/tests/JIT/Methodical/Boxing/xlang/{sin_cs_cs_ro.csproj => sin_cs_cs_sinlib_ro.csproj} (100%) rename src/tests/JIT/Methodical/Boxing/xlang/{sin_cs_il_d.csproj => sin_cs_il_sinlib_d.csproj} (100%) rename src/tests/JIT/Methodical/Boxing/xlang/{sin_cs_il_do.csproj => sin_cs_il_sinlib_do.csproj} (100%) rename src/tests/JIT/Methodical/Boxing/xlang/{sin_cs_il_r.csproj => sin_cs_il_sinlib_r.csproj} (100%) rename src/tests/JIT/Methodical/Boxing/xlang/{sin_cs_il_ro.csproj => sin_cs_il_sinlib_ro.csproj} (100%) rename src/tests/JIT/Methodical/flowgraph/bug619534/{twoEndFinallys_il.ilproj => twoEndFinallys_il_r.ilproj} (100%) rename src/tests/JIT/Methodical/xxblk/{dynblk_order_d.ilproj => dynblk_order_il_d.ilproj} (100%) rename src/tests/JIT/Methodical/xxblk/{dynblk_order_ro.ilproj => dynblk_order_il_r.ilproj} (100%) diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il index c1ec61fd48db2..7daf4196db5a6 100644 --- a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il +++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il @@ -7,7 +7,7 @@ .ver 4:0:0:0 } .assembly extern legacy library mscorlib { auto } -.assembly 'sin_cs' {} +.assembly 'sin_il_cs' {} .assembly extern xunit.core {} .assembly extern sinlib_cs { diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_d.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_d.csproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_d.csproj rename to src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_d.csproj diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_do.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_do.csproj rename to src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_do.csproj diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_r.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_r.csproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_r.csproj rename to src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_r.csproj diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_ro.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_ro.csproj rename to src/tests/JIT/Methodical/Boxing/xlang/sin_cs_cs_sinlib_ro.csproj diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_d.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_d.csproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_d.csproj rename to src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_d.csproj diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_do.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_do.csproj rename to src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_do.csproj diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_r.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_r.csproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_r.csproj rename to src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_r.csproj diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_ro.csproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_ro.csproj rename to src/tests/JIT/Methodical/Boxing/xlang/sin_cs_il_sinlib_ro.csproj diff --git a/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il b/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il index 4363e068a89aa..86f30f1a985fe 100644 --- a/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il +++ b/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern System.Console { auto } -.assembly extern System.Runtime { auto } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly 'copy_prop_byref_to_native_int' { } .assembly extern xunit.core {} diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il.ilproj b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il.ilproj rename to src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il_r.ilproj diff --git a/src/tests/JIT/Methodical/int64/misc/longmul.il b/src/tests/JIT/Methodical/int64/misc/longmul.il index 3b1ea525434a0..f73ebe95bf95b 100644 --- a/src/tests/JIT/Methodical/int64/misc/longmul.il +++ b/src/tests/JIT/Methodical/int64/misc/longmul.il @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern System.Console { auto } -.assembly extern System.Runtime { auto } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly 'longmul' { } .assembly extern xunit.core {} diff --git a/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il b/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il index 36e24c1ef8815..7984b5dff783c 100644 --- a/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il +++ b/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il @@ -3,16 +3,8 @@ -.assembly extern mscorlib -{ - .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) - .ver 4:0:0:0 -} -.assembly extern System.Runtime -{ - .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) - .ver 4:0:0:0 -} +.assembly extern mscorlib { auto } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly 'delegateTail' { .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order.il b/src/tests/JIT/Methodical/xxblk/dynblk_order.il index ebb24d49d1bdd..30f1f024eca2f 100644 --- a/src/tests/JIT/Methodical/xxblk/dynblk_order.il +++ b/src/tests/JIT/Methodical/xxblk/dynblk_order.il @@ -3,7 +3,7 @@ // Tests that cpblk/initblk importation sastifies ordering constraints. -.assembly extern System.Runtime { } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly extern System.Console { } .assembly extern xunit.core {} diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order_d.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_order_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/xxblk/dynblk_order_d.ilproj rename to src/tests/JIT/Methodical/xxblk/dynblk_order_il_d.ilproj diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order_ro.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_order_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/xxblk/dynblk_order_ro.ilproj rename to src/tests/JIT/Methodical/xxblk/dynblk_order_il_r.ilproj