diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a8fe633290e14c..6d3f2efaf848ce 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21613.2", + "version": "1.0.0-prerelease.21622.1", "commands": [ "xharness" ] diff --git a/Directory.Build.props b/Directory.Build.props index f149734c7c81f4..0983ba4ae36f89 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -245,6 +245,7 @@ $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src')) $([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj')) $([MSBuild]::NormalizePath('$(MonoProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj')) + $([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'nativeaot', 'System.Private.CoreLib', 'src', 'System.Private.CoreLib.csproj')) true diff --git a/NuGet.config b/NuGet.config index 8d59f2744cf862..f74e0c4a70248a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,8 +22,6 @@ - - diff --git a/docs/design/coreclr/botr/ilc-architecture.md b/docs/design/coreclr/botr/ilc-architecture.md index 697f2b7a852e9e..6f277692411160 100644 --- a/docs/design/coreclr/botr/ilc-architecture.md +++ b/docs/design/coreclr/botr/ilc-architecture.md @@ -139,7 +139,7 @@ While the object file format is highly target specific, the compiler represents On a high level, the role of the object writer is to go over all the marked `ObjectNode`s in the graph, retrieve their data, defined symbols, and relocations to other symbols, and store them in the object file. NativeAOT compiler contains multiple object writers: -* Native object writer (`src/coreclr/tools/aot/ObjWriter`) based on LLVM that is capable of producing Windows PE, Linux ELF, and macOS Mach-O file formats +* Native object writer based on LLVM that is capable of producing Windows PE, Linux ELF, and macOS Mach-O file formats * Native object writer based on LLVM for WebAssembly * Ready to run object writer that generates mixed CIL/native executables in the ready to run format for CoreCLR diff --git a/docs/workflow/building/coreclr/nativeaot.md b/docs/workflow/building/coreclr/nativeaot.md index 576939fe9e3b70..968bb5fa892435 100644 --- a/docs/workflow/building/coreclr/nativeaot.md +++ b/docs/workflow/building/coreclr/nativeaot.md @@ -25,7 +25,7 @@ The executable looks like a native executable, in the sense that it can be debug - [NOT PORTED OVER YET] The build will place the toolchain packages at `artifacts\packages\[Debug|Release]\Shipping`. To publish your project using these packages: - [NOT PORTED OVER YET] Add the package directory to your `nuget.config` file. For example, replace `dotnet-experimental` line in `samples\HelloWorld\nuget.config` with `` - [NOT PORTED OVER YET] Run `dotnet publish --packages pkg -r [win-x64|linux-x64|osx-64] -c [Debug|Release]` to publish your project. `--packages pkg` option restores the package into a local directory that is easy to cleanup once you are done. It avoids polluting the global nuget cache with your locally built dev package. -- *Optional*. The ObjWriter component of the AOT compiler is not built by default. If you're working on ObjWriter or bringing up a new platform that doesn't have ObjWriter packages yet, as additional pre-requiresites you need to run `build[.cmd|.sh] clr.objwriter` from the repo root before building the product. +- The component that writes out object files (objwriter.dll/libobjwriter.so/libobjwriter.dylib) is based on LLVM and doesn't build in the runtime repo. It gets published as a NuGet package out of the dotnet/llvm-project repo (branch objwriter/12.x). If you're working on ObjWriter or bringing up a new platform that doesn't have ObjWriter packages yet, as additional pre-requiresites you need to build objwriter out of that repo and replace the file in the output. ## Visual Studio Solutions diff --git a/docs/workflow/building/libraries/webassembly-instructions.md b/docs/workflow/building/libraries/webassembly-instructions.md index fdc5dc31d22267..3ae2d2f808abfe 100644 --- a/docs/workflow/building/libraries/webassembly-instructions.md +++ b/docs/workflow/building/libraries/webassembly-instructions.md @@ -152,7 +152,7 @@ Submit a PR request with the updated version, wait for all checks to pass and fo { "dockerfile": "src/ubuntu/18.04/webassembly/Dockerfile", "simpleTags": [ - "ubuntu-18.04-webassembly-20200529220811-6a6da63" + "ubuntu-18.04-webassembly-20210707133424-12f133e" ], "digest": "sha256:1f2d920a70bd8d55bbb329e87c3bd732ef930d64ff288dab4af0aa700c25cfaf", "osType": "Linux", @@ -169,7 +169,7 @@ Copy the docker image tag and replace it in [platform-matrix.yml](https://github ``` container: - image: ubuntu-18.04-webassembly-20200409132031-f70ea41 + image: ubuntu-18.04-webassembly-20210707133424-12f133e registry: mcr ``` diff --git a/docs/workflow/debugging/coreclr/debugging-aot-compilers.md b/docs/workflow/debugging/coreclr/debugging-aot-compilers.md index e2fd7f7e3bb905..048d571df45f21 100644 --- a/docs/workflow/debugging/coreclr/debugging-aot-compilers.md +++ b/docs/workflow/debugging/coreclr/debugging-aot-compilers.md @@ -81,7 +81,7 @@ At the time of writing the current supported sets of valid arguments are: - The ILC compiler typically compiles the whole program - it loosely corresponds to the composite mode of crossgen2. There is a multifile mode, where each managed assembly corresponds to a single object file, but this mode is not shipping. -- The object files generated by the ILC compiler are written out using an LLVM-based object writer (src\coreclr\tools\aot\ObjWriter). The object writer uses the LLVM assembler APIs (APIs meant to be used by tools that convert textual assembly into machine code) to emit object files in PE/ELF/Mach-O formats. Normally the object writer is not built as part of the repo, but gets downloaded through NuGet. If you need to debug the object writer, you can build it by specifying `clr.objwriter` subset to the root build script. It takes about 5 minutes to compile the object writer. +- The object files generated by the ILC compiler are written out using an LLVM-based object writer (consumed as a NuGet package built out of the dotnet/llvm-project repo, branch objwriter/12.x). The object writer uses the LLVM assembler APIs (APIs meant to be used by tools that convert textual assembly into machine code) to emit object files in PE/ELF/Mach-O formats. Example of debugging a test application in Crossgen2 ================================================ diff --git a/docs/workflow/testing/libraries/testing-apple.md b/docs/workflow/testing/libraries/testing-apple.md index 0ce42742e9c710..2727fb4b28cd9c 100644 --- a/docs/workflow/testing/libraries/testing-apple.md +++ b/docs/workflow/testing/libraries/testing-apple.md @@ -48,6 +48,10 @@ For example: ``` ./build.sh libs.tests -os iOS -arch x64 -test /p:DevTeamProvisioning=H1A2B3C4D5 ``` +Other possible options are: +- to sign with an adhoc key by setting `/p:DevTeamProvisioning=adhoc` +- to skip signing all together by setting `/p:DevTeamProvisioning=-` . + [AppleAppBuilder](https://github.com/dotnet/runtime/blob/main/src/tasks/AppleAppBuilder/AppleAppBuilder.cs) generates temp Xcode projects you can manually open and resolve provisioning issues there using native UI and deploy to your devices. ### Running individual test suites diff --git a/eng/ApiCompatExcludeAttributes.txt b/eng/ApiCompatExcludeAttributes.txt index 19475f50297f8a..5ea702ad6f3d4a 100644 --- a/eng/ApiCompatExcludeAttributes.txt +++ b/eng/ApiCompatExcludeAttributes.txt @@ -1,3 +1,5 @@ T:System.CLSCompliantAttribute T:System.Diagnostics.CodeAnalysis.MemberNotNullAttribute T:System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute +T:System.Diagnostics.DebuggerGuidedStepThroughAttribute +T:System.Runtime.CompilerServices.EagerStaticClassConstructionAttribute diff --git a/eng/Subsets.props b/eng/Subsets.props index 22714ffc7d0a88..f0bb31a28aea72 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -49,9 +49,12 @@ $(PrimaryRuntimeFlavor) - - true + + true + + + true @@ -104,7 +107,6 @@ - @@ -242,7 +244,9 @@ + Test="true" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/> + @@ -261,10 +265,6 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83ad7ff90ed386..e3a571f451cdea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - d483c01eb69a904062475e49d6b20b8bbbefe64b + d9371f17932fbf828f1d1e2f21a99b64ba40eba5 https://github.com/dotnet/msquic @@ -16,127 +16,159 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 + + https://github.com/dotnet/llvm-project + ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + + + https://github.com/dotnet/llvm-project + ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + + + https://github.com/dotnet/llvm-project + ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + + + https://github.com/dotnet/llvm-project + ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + + + https://github.com/dotnet/llvm-project + ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + + + https://github.com/dotnet/llvm-project + ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + + + https://github.com/dotnet/llvm-project + ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + + + https://github.com/dotnet/llvm-project + ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b https://github.com/dotnet/llvm-project @@ -170,53 +202,53 @@ https://github.com/dotnet/llvm-project 662aff66999c435aec09c58643e9fd703eadc3e0 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/linker - 25323570686848f192bd05e726aff5c91eb0b2f0 + 41467d340a3345f08cb8ba67c20c1ea40c57682f - + https://github.com/dotnet/xharness - d5affc0d0361de14aa1ccbf5cad268d5873e3113 + 7ad8d01a879af9437a7c33d01409bd761700cdad - + https://github.com/dotnet/xharness - d5affc0d0361de14aa1ccbf5cad268d5873e3113 + 7ad8d01a879af9437a7c33d01409bd761700cdad - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 0cd94b1d02c03377d99f3739beb191591f6abee5 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -234,13 +266,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 91d6b3c1f51888d166701510189505f35714665c - + https://github.com/dotnet/hotreload-utils - 4782fa39c0fb1651890b6b03aef11f7129884eae + f0d838421286fed81005fd4ddf6562555b641b3b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 22c9796bed7290..47d31b37c8e334 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,30 +54,38 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21615.1 - 7.0.0-beta.21615.1 - 7.0.0-beta.21615.1 - 7.0.0-beta.21615.1 - 7.0.0-beta.21615.1 - 7.0.0-beta.21615.1 - 2.5.1-beta.21615.1 - 7.0.0-beta.21615.1 - 7.0.0-beta.21615.1 - 7.0.0-beta.21615.1 - 7.0.0-beta.21615.1 - 7.0.0-beta.21615.1 - 7.0.0-beta.21615.1 - 7.0.0-beta.21615.1 - 7.0.0-beta.21615.1 + 7.0.0-beta.21621.3 + 7.0.0-beta.21621.3 + 7.0.0-beta.21621.3 + 7.0.0-beta.21621.3 + 7.0.0-beta.21621.3 + 7.0.0-beta.21621.3 + 2.5.1-beta.21621.3 + 7.0.0-beta.21621.3 + 7.0.0-beta.21621.3 + 7.0.0-beta.21621.3 + 7.0.0-beta.21621.3 + 7.0.0-beta.21621.3 + 7.0.0-beta.21621.3 + 7.0.0-beta.21621.3 + 7.0.0-beta.21621.3 6.0.0-preview.1.102 - 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21612.5 + 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.21620.1 3.1.0 - 7.0.0-alpha.1.21612.5 + 7.0.0-alpha.1.21620.1 + 1.0.0-alpha.1.21630.1 + 1.0.0-alpha.1.21630.1 + 1.0.0-alpha.1.21630.1 + 1.0.0-alpha.1.21630.1 + 1.0.0-alpha.1.21630.1 + 1.0.0-alpha.1.21630.1 + 1.0.0-alpha.1.21630.1 + 1.0.0-alpha.1.21630.1 5.0.0 4.3.0 @@ -112,24 +120,24 @@ 5.0.0 5.0.0 4.9.0-rc2.21473.1 - 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21612.5 + 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.21620.1 4.5.4 4.5.0 - 7.0.0-alpha.1.21612.5 + 7.0.0-alpha.1.21620.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 1.0.0-prerelease.21577.2 1.0.0-prerelease.21577.2 @@ -152,9 +160,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21613.2 - 1.0.0-prerelease.21613.2 - 1.0.2-alpha.0.21613.2 + 1.0.0-prerelease.21622.1 + 1.0.0-prerelease.21622.1 + 1.0.2-alpha.0.21620.2 2.4.2-pre.9 2.4.2 1.3.0 @@ -167,10 +175,10 @@ 6.0.0-preview-20211019.1 - 7.0.100-1.21610.1 + 7.0.100-1.21620.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-alpha.1.21613.1 + 7.0.0-alpha.1.21620.1 7.0.0-alpha.1.21529.3 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 6501c3a955f782..9d22fc92693031 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -3,18 +3,26 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) + set(FREEBSD 1) elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc) set(CMAKE_SYSTEM_NAME SunOS) set(ILLUMOS 1) else() set(CMAKE_SYSTEM_NAME Linux) + set(LINUX 1) endif() set(CMAKE_SYSTEM_VERSION 1) +if(EXISTS ${CROSS_ROOTFS}/etc/tizen-release) + set(TIZEN 1) +elseif(EXISTS ${CROSS_ROOTFS}/android_platform) + set(ANDROID 1) +endif() + if(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") - if("$ENV{__DistroRid}" MATCHES "tizen.*") + if(TIZEN) set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm") @@ -33,7 +41,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") else() set(TOOLCHAIN "aarch64-linux-gnu") endif() - if("$ENV{__DistroRid}" MATCHES "tizen.*") + if(TIZEN) set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") @@ -42,7 +50,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x") elseif(TARGET_ARCH_NAME STREQUAL "x86") set(CMAKE_SYSTEM_PROCESSOR i686) set(TOOLCHAIN "i686-linux-gnu") -elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") +elseif (FREEBSD) set(CMAKE_SYSTEM_PROCESSOR "x86_64") set(triple "x86_64-unknown-freebsd12") elseif (ILLUMOS) @@ -57,7 +65,7 @@ if(DEFINED ENV{TOOLCHAIN}) endif() # Specify include paths -if(DEFINED TIZEN_TOOLCHAIN) +if(TIZEN) if(TARGET_ARCH_NAME STREQUAL "armel") include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) @@ -68,7 +76,7 @@ if(DEFINED TIZEN_TOOLCHAIN) endif() endif() -if("$ENV{__DistroRid}" MATCHES "android.*") +if(ANDROID) if(TARGET_ARCH_NAME STREQUAL "arm") set(ANDROID_ABI armeabi-v7a) elseif(TARGET_ARCH_NAME STREQUAL "arm64") @@ -76,7 +84,9 @@ if("$ENV{__DistroRid}" MATCHES "android.*") endif() # extract platform number required by the NDK's toolchain - string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "$ENV{__DistroRid}") + file(READ "${CROSS_ROOTFS}/android_platform" RID_FILE_CONTENTS) + string(REPLACE "RID=" "" ANDROID_RID "${RID_FILE_CONTENTS}") + string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "${ANDROID_RID}") set(ANDROID_TOOLCHAIN clang) set(FEATURE_EVENT_TRACE 0) # disable event trace as there is no lttng-ust package in termux repository @@ -85,7 +95,7 @@ if("$ENV{__DistroRid}" MATCHES "android.*") # include official NDK toolchain script include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake) -elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") +elseif(FREEBSD) # we cross-compile by instructing clang set(CMAKE_C_COMPILER_TARGET ${triple}) set(CMAKE_CXX_COMPILER_TARGET ${triple}) @@ -145,20 +155,20 @@ function(add_toolchain_linker_flag Flag) set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE) endfunction() -if(CMAKE_SYSTEM_NAME STREQUAL "Linux") +if(LINUX) add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib/${TOOLCHAIN}") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}") endif() if(TARGET_ARCH_NAME STREQUAL "armel") - if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only + if(TIZEN) add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") - if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only + if(TIZEN) add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64") @@ -177,7 +187,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") OR ILLUMOS) +if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT ANDROID) OR ILLUMOS) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) @@ -204,7 +214,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") add_compile_options(-Wno-error=unused-command-line-argument) endif() -if(DEFINED TIZEN_TOOLCHAIN) +if(TIZEN) if(TARGET_ARCH_NAME MATCHES "^(armel|arm64)$") add_compile_options(-Wno-deprecated-declarations) # compile-time option add_compile_options(-D__extern_always_inline=inline) # compile-time option diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e7d43f..5c94e98632a0a7 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -55,6 +55,9 @@ case $cpuname in aarch64) buildarch=arm64 ;; + loongarch64) + buildarch=loongarch64 + ;; amd64|x86_64) buildarch=x64 ;; diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1 index adf707c8fe7008..ca38268c44d832 100644 --- a/eng/common/native/CommonLibrary.psm1 +++ b/eng/common/native/CommonLibrary.psm1 @@ -276,7 +276,8 @@ function Get-MachineArchitecture { } if (($ProcessorArchitecture -Eq "AMD64") -Or ($ProcessorArchitecture -Eq "IA64") -Or - ($ProcessorArchitecture -Eq "ARM64")) { + ($ProcessorArchitecture -Eq "ARM64") -Or + ($ProcessorArchitecture -Eq "LOONGARCH64")) { return "x64" } return "x86" diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index e361e03fabdd2e..6d7ba15e5f2b5d 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -2,25 +2,45 @@ # # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables # -# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! +# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! if [[ "$#" -lt 3 ]]; then echo "Usage..." - echo "init-compiler.sh - + - + diff --git a/src/mono/sample/wasm/browser/Makefile b/src/mono/sample/wasm/browser/Makefile index 7ae388cce865d3..7a6b17c4787bc4 100644 --- a/src/mono/sample/wasm/browser/Makefile +++ b/src/mono/sample/wasm/browser/Makefile @@ -6,6 +6,6 @@ ifneq ($(AOT),) override MSBUILD_ARGS+=/p:RunAOTCompilation=true endif -PROJECT_NAME=Wasm.Browser.Sample.csproj +PROJECT_NAME=Wasm.Browser.CJS.Sample.csproj run: run-browser diff --git a/src/mono/sample/wasm/browser/Wasm.Browser.Sample.csproj b/src/mono/sample/wasm/browser/Wasm.Browser.CJS.Sample.csproj similarity index 83% rename from src/mono/sample/wasm/browser/Wasm.Browser.Sample.csproj rename to src/mono/sample/wasm/browser/Wasm.Browser.CJS.Sample.csproj index eb9934dc662ca6..3cfd138946d40a 100644 --- a/src/mono/sample/wasm/browser/Wasm.Browser.Sample.csproj +++ b/src/mono/sample/wasm/browser/Wasm.Browser.CJS.Sample.csproj @@ -1,11 +1,11 @@ - Debug true main.js true embedded 1 + false @@ -13,7 +13,7 @@ - <_SampleProject>Wasm.Browser.Sample.csproj + <_SampleProject>Wasm.Browser.CJS.Sample.csproj diff --git a/src/mono/sample/wasm/browser/index.html b/src/mono/sample/wasm/browser/index.html index 340b67d645a756..765d8ccede0849 100644 --- a/src/mono/sample/wasm/browser/index.html +++ b/src/mono/sample/wasm/browser/index.html @@ -4,40 +4,16 @@ - Sample + Sample CJS - - Result from Sample.Test.TestMeaning: - - - - + + Answer to the Ultimate Question of Life, the Universe, and Everything is : + + \ No newline at end of file diff --git a/src/mono/sample/wasm/browser/main.js b/src/mono/sample/wasm/browser/main.js index 0c865b3f02719d..661af63b64ba8a 100644 --- a/src/mono/sample/wasm/browser/main.js +++ b/src/mono/sample/wasm/browser/main.js @@ -1,20 +1,38 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. +function wasm_exit(exit_code) { + /* Set result in a tests_done element, to be read by xharness in runonly CI test */ + const tests_done_elem = document.createElement("label"); + tests_done_elem.id = "tests_done"; + tests_done_elem.innerHTML = exit_code.toString(); + document.body.appendChild(tests_done_elem); -"use strict"; + console.log(`WASM EXIT ${exit_code}`); +} -createDotnetRuntime(({ MONO, BINDING, Module }) => ({ - disableDotnet6Compatibility: true, - configSrc: "./mono-config.json", - onDotnetReady: () => { - try { - App.init({ MONO, BINDING, Module }); - } catch (error) { - set_exit_code(1, error); - throw (error); - } - }, - onAbort: (error) => { - set_exit_code(1, error); - }, -})); +async function loadRuntime() { + globalThis.exports = {}; + await import("./dotnet.js"); + return globalThis.exports.createDotnetRuntime; +} + +async function main() { + try { + const createDotnetRuntime = await loadRuntime(); + const { MONO, BINDING, Module, RuntimeBuildInfo } = await createDotnetRuntime(() => ({ + disableDotnet6Compatibility: true, + configSrc: "./mono-config.json", + })); + + const testMeaning = BINDING.bind_static_method("[Wasm.Browser.CJS.Sample] Sample.Test:TestMeaning"); + const ret = testMeaning(); + document.getElementById("out").innerHTML = `${ret} as computed on dotnet ver ${RuntimeBuildInfo.ProductVersion}`; + + console.debug(`ret: ${ret}`); + let exit_code = ret == 42 ? 0 : 1; + wasm_exit(exit_code); + } catch (err) { + console.log(`WASM ERROR ${err}`); + wasm_exit(2) + } +} + +main(); \ No newline at end of file diff --git a/src/mono/sample/wasm/console-node-cjs/Makefile b/src/mono/sample/wasm/console-node-cjs/Makefile new file mode 100644 index 00000000000000..5d6de5e730358b --- /dev/null +++ b/src/mono/sample/wasm/console-node-cjs/Makefile @@ -0,0 +1,17 @@ +TOP=../../../../.. + +include ../wasm.mk + +ifneq ($(AOT),) +override MSBUILD_ARGS+=/p:RunAOTCompilation=true +endif + +ifneq ($(V),) +DOTNET_MONO_LOG_LEVEL=--setenv=MONO_LOG_LEVEL=debug +endif + +PROJECT_NAME=Wasm.Console.Node.CJS.Sample.csproj +CONSOLE_DLL=Wasm.Console.Node.CJS.Sample.dll +MAIN_JS=main.cjs + +run: run-console-node diff --git a/src/mono/sample/wasm/console-node-cjs/Program.cs b/src/mono/sample/wasm/console-node-cjs/Program.cs new file mode 100644 index 00000000000000..f65bd654e98863 --- /dev/null +++ b/src/mono/sample/wasm/console-node-cjs/Program.cs @@ -0,0 +1,15 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Threading.Tasks; + +public class Test +{ + public static async Task Main(string[] args) + { + await Task.Delay(1); + Console.WriteLine("Hello World!"); + return 42; + } +} diff --git a/src/mono/sample/wasm/console-node-cjs/README.md b/src/mono/sample/wasm/console-node-cjs/README.md new file mode 100644 index 00000000000000..14ccf622c842e4 --- /dev/null +++ b/src/mono/sample/wasm/console-node-cjs/README.md @@ -0,0 +1 @@ +This sample uses CommonJS version of `dotnet.js` running on NodeJS \ No newline at end of file diff --git a/src/mono/sample/wasm/console-node-cjs/Wasm.Console.Node.CJS.Sample.csproj b/src/mono/sample/wasm/console-node-cjs/Wasm.Console.Node.CJS.Sample.csproj new file mode 100644 index 00000000000000..0d0a52d2ff0247 --- /dev/null +++ b/src/mono/sample/wasm/console-node-cjs/Wasm.Console.Node.CJS.Sample.csproj @@ -0,0 +1,18 @@ + + + true + main.cjs + true + embedded + 1 + false + false + + + + <_SampleProject>Wasm.Console.Node.CJS.Sample.csproj + <_SampleAssembly>Wasm.Console.Node.CJS.Sample.dll + + + + diff --git a/src/mono/sample/wasm/console-node-cjs/main.cjs b/src/mono/sample/wasm/console-node-cjs/main.cjs new file mode 100644 index 00000000000000..4e985076e1b56b --- /dev/null +++ b/src/mono/sample/wasm/console-node-cjs/main.cjs @@ -0,0 +1,9 @@ +const createDotnetRuntime = require("./dotnet.js"); + +async function main() { + const { MONO } = await createDotnetRuntime(); + const app_args = process.argv.slice(2); + const dllName = "Wasm.Console.Node.CJS.Sample.dll"; + await MONO.mono_run_main_and_exit(dllName, app_args); +}; +main(); diff --git a/src/mono/sample/wasm/console-node-es6/Makefile b/src/mono/sample/wasm/console-node-es6/Makefile new file mode 100644 index 00000000000000..a97fd6232158cf --- /dev/null +++ b/src/mono/sample/wasm/console-node-es6/Makefile @@ -0,0 +1,17 @@ +TOP=../../../../.. + +include ../wasm.mk + +ifneq ($(AOT),) +override MSBUILD_ARGS+=/p:RunAOTCompilation=true +endif + +ifneq ($(V),) +DOTNET_MONO_LOG_LEVEL=--setenv=MONO_LOG_LEVEL=debug +endif + +PROJECT_NAME=Wasm.Console.Node.ES6.Sample.csproj +CONSOLE_DLL=Wasm.Console.Node.ES6.Sample.dll +MAIN_JS=main.mjs + +run: run-console-node diff --git a/src/mono/sample/wasm/console/Program.cs b/src/mono/sample/wasm/console-node-es6/Program.cs similarity index 100% rename from src/mono/sample/wasm/console/Program.cs rename to src/mono/sample/wasm/console-node-es6/Program.cs diff --git a/src/mono/sample/wasm/console-node-es6/Wasm.Console.Node.ES6.Sample.csproj b/src/mono/sample/wasm/console-node-es6/Wasm.Console.Node.ES6.Sample.csproj new file mode 100644 index 00000000000000..2ea291ea047a75 --- /dev/null +++ b/src/mono/sample/wasm/console-node-es6/Wasm.Console.Node.ES6.Sample.csproj @@ -0,0 +1,20 @@ + + + true + main.mjs + true + true + + + + + + + + + <_SampleProject>Wasm.Console.Node.ES6.Sample.csproj + <_SampleAssembly>Wasm.Console.Node.ES6.Sample.dll + + + + diff --git a/src/mono/sample/wasm/console-node-es6/main.mjs b/src/mono/sample/wasm/console-node-es6/main.mjs new file mode 100644 index 00000000000000..2325a97eb35f3b --- /dev/null +++ b/src/mono/sample/wasm/console-node-es6/main.mjs @@ -0,0 +1,19 @@ +import { createRequire } from 'module'; +import { dirname } from 'path'; +import { fileURLToPath } from 'url'; +import createDotnetRuntime from './dotnet.js' + +const { MONO } = await createDotnetRuntime(() => ({ + imports: { + //TODO internalize into dotnet.js if possible + require: createRequire(import.meta.url) + }, + //TODO internalize into dotnet.js if possible + scriptDirectory: dirname(fileURLToPath(import.meta.url)) + '/', + disableDotnet6Compatibility: true, + configSrc: "./mono-config.json", +})); + +const app_args = process.argv.slice(2); +const dllName = "Wasm.Console.Node.ES6.Sample.dll"; +await MONO.mono_run_main_and_exit(dllName, app_args); diff --git a/src/mono/sample/wasm/console-node-es6/package.json b/src/mono/sample/wasm/console-node-es6/package.json new file mode 100644 index 00000000000000..fd2cb753e7d8b5 --- /dev/null +++ b/src/mono/sample/wasm/console-node-es6/package.json @@ -0,0 +1,3 @@ +{ + "type":"module" +} \ No newline at end of file diff --git a/src/mono/sample/wasm/console/Makefile b/src/mono/sample/wasm/console-v8-cjs/Makefile similarity index 65% rename from src/mono/sample/wasm/console/Makefile rename to src/mono/sample/wasm/console-v8-cjs/Makefile index 20c9da20ad0be5..b2683b63c6847b 100644 --- a/src/mono/sample/wasm/console/Makefile +++ b/src/mono/sample/wasm/console-v8-cjs/Makefile @@ -10,7 +10,8 @@ ifneq ($(V),) DOTNET_MONO_LOG_LEVEL=--setenv=MONO_LOG_LEVEL=debug endif -PROJECT_NAME=Wasm.Console.Sample.csproj -CONSOLE_DLL=Wasm.Console.Sample.dll +PROJECT_NAME=Wasm.Console.V8.CJS.Sample.csproj +CONSOLE_DLL=Wasm.Console.V8.CJS.Sample.dll +MAIN_JS=main.cjs run: run-console diff --git a/src/mono/sample/wasm/console-v8-cjs/Program.cs b/src/mono/sample/wasm/console-v8-cjs/Program.cs index d5ea012a33c792..7d959dedae34d6 100644 --- a/src/mono/sample/wasm/console-v8-cjs/Program.cs +++ b/src/mono/sample/wasm/console-v8-cjs/Program.cs @@ -13,6 +13,6 @@ public static async Task Main(string[] args) for (int i = 0; i < args.Length; i++) { Console.WriteLine($"args[{i}] = {args[i]}"); } - return args.Length; + return 0; } } diff --git a/src/mono/sample/wasm/console-v8-cjs/Wasm.Console.V8.CJS.Sample.csproj b/src/mono/sample/wasm/console-v8-cjs/Wasm.Console.V8.CJS.Sample.csproj index 0b28f10d49c3a9..81de63e08cd5b7 100644 --- a/src/mono/sample/wasm/console-v8-cjs/Wasm.Console.V8.CJS.Sample.csproj +++ b/src/mono/sample/wasm/console-v8-cjs/Wasm.Console.V8.CJS.Sample.csproj @@ -1,7 +1,7 @@ true - main.js + main.cjs true false diff --git a/src/mono/sample/wasm/console-v8-cjs/main.js b/src/mono/sample/wasm/console-v8-cjs/main.cjs similarity index 100% rename from src/mono/sample/wasm/console-v8-cjs/main.js rename to src/mono/sample/wasm/console-v8-cjs/main.cjs diff --git a/src/mono/sample/wasm/console-v8-es6/Makefile b/src/mono/sample/wasm/console-v8-es6/Makefile new file mode 100644 index 00000000000000..7ceb7d3a72d0a4 --- /dev/null +++ b/src/mono/sample/wasm/console-v8-es6/Makefile @@ -0,0 +1,17 @@ +TOP=../../../../.. + +include ../wasm.mk + +ifneq ($(AOT),) +override MSBUILD_ARGS+=/p:RunAOTCompilation=true +endif + +ifneq ($(V),) +DOTNET_MONO_LOG_LEVEL=--setenv=MONO_LOG_LEVEL=debug +endif + +PROJECT_NAME=Wasm.Console.V8.ES6.Sample.csproj +CONSOLE_DLL=Wasm.Console.V8.ES6.Sample.dll +MAIN_JS=v8shim.cjs + +run: run-console diff --git a/src/mono/sample/wasm/console-v8-es6/Program.cs b/src/mono/sample/wasm/console-v8-es6/Program.cs new file mode 100644 index 00000000000000..7d959dedae34d6 --- /dev/null +++ b/src/mono/sample/wasm/console-v8-es6/Program.cs @@ -0,0 +1,18 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Threading.Tasks; + +public class Test +{ + public static async Task Main(string[] args) + { + await Task.Delay(1); + Console.WriteLine("Hello World!"); + for (int i = 0; i < args.Length; i++) { + Console.WriteLine($"args[{i}] = {args[i]}"); + } + return 0; + } +} diff --git a/src/mono/sample/wasm/console/Wasm.Console.Sample.csproj b/src/mono/sample/wasm/console-v8-es6/Wasm.Console.V8.ES6.Sample.csproj similarity index 53% rename from src/mono/sample/wasm/console/Wasm.Console.Sample.csproj rename to src/mono/sample/wasm/console-v8-es6/Wasm.Console.V8.ES6.Sample.csproj index 1dabb4aa0c787f..897e9e72482008 100644 --- a/src/mono/sample/wasm/console/Wasm.Console.Sample.csproj +++ b/src/mono/sample/wasm/console-v8-es6/Wasm.Console.V8.ES6.Sample.csproj @@ -1,13 +1,18 @@ true - $(MonoProjectRoot)\wasm\test-main.js + v8shim.cjs true + true + + + + - <_SampleProject>Wasm.Console.Sample.csproj - <_SampleAssembly>Wasm.Console.Sample.dll + <_SampleProject>Wasm.Console.V8.ES6.Sample.csproj + <_SampleAssembly>Wasm.Console.V8.ES6.Sample.dll diff --git a/src/mono/sample/wasm/console-v8-es6/main.mjs b/src/mono/sample/wasm/console-v8-es6/main.mjs new file mode 100644 index 00000000000000..f6bfd7ba8e97dd --- /dev/null +++ b/src/mono/sample/wasm/console-v8-es6/main.mjs @@ -0,0 +1,11 @@ +import createDotnetRuntime from './dotnet.js' + +const dllName = "Wasm.Console.V8.ES6.Sample.dll"; +const app_args = Array.from(arguments); + +async function main() { + const { MONO } = await createDotnetRuntime(); + await MONO.mono_run_main_and_exit(dllName, app_args); +} + +main(); \ No newline at end of file diff --git a/src/mono/sample/wasm/console-v8-es6/v8shim.cjs b/src/mono/sample/wasm/console-v8-es6/v8shim.cjs new file mode 100644 index 00000000000000..f8c2a61fe87fed --- /dev/null +++ b/src/mono/sample/wasm/console-v8-es6/v8shim.cjs @@ -0,0 +1,15 @@ +if (typeof globalThis.URL === 'undefined') { + globalThis.URL = class URL { + constructor(url) { + this.url = url; + } + toString() { + return this.url; + } + }; +} + +import('./main.mjs').catch(err => { + console.log(err); + console.log(err.stack); +}); \ No newline at end of file diff --git a/src/mono/sample/wasm/wasm.mk b/src/mono/sample/wasm/wasm.mk index 624722c2169454..89759c3c7745ca 100644 --- a/src/mono/sample/wasm/wasm.mk +++ b/src/mono/sample/wasm/wasm.mk @@ -30,4 +30,7 @@ run-browser: fi run-console: - cd bin/$(CONFIG)/AppBundle && ~/.jsvu/v8 --stack-trace-limit=1000 --single-threaded --expose_wasm test-main.js -- $(DOTNET_MONO_LOG_LEVEL) --run $(CONSOLE_DLL) $(ARGS) + cd bin/$(CONFIG)/AppBundle && ~/.jsvu/v8 --stack-trace-limit=1000 --single-threaded --expose_wasm $(MAIN_JS) -- $(DOTNET_MONO_LOG_LEVEL) --run $(CONSOLE_DLL) $(ARGS) + +run-console-node: + cd bin/$(CONFIG)/AppBundle && node --stack-trace-limit=1000 --single-threaded --expose_wasm $(MAIN_JS) -- $(DOTNET_MONO_LOG_LEVEL) --run $(CONSOLE_DLL) $(ARGS) diff --git a/src/mono/wasm/Makefile b/src/mono/wasm/Makefile index d3f9b3bf08cb2a..d171b9395a716a 100644 --- a/src/mono/wasm/Makefile +++ b/src/mono/wasm/Makefile @@ -3,6 +3,10 @@ TOP=$(realpath $(CURDIR)/../../..) escape_quote = $(subst ",\",$(1)) +ifneq ($(V),) +MSBUILD_ARGS+=/p:MonoVerboseBuild=true +endif + DOTNET=$(TOP)/dotnet.sh JSVU=$(HOME)/.jsvu CHROMEDRIVER?=$(HOME)/.chromedriver diff --git a/src/mono/wasm/README.md b/src/mono/wasm/README.md index b68aeb2d54c99a..37d5fa29643445 100644 --- a/src/mono/wasm/README.md +++ b/src/mono/wasm/README.md @@ -149,11 +149,11 @@ The samples in `src/mono/sample/wasm` can be build and run like this: * console Hello world sample -`dotnet build /t:RunSample console/Wasm.Console.Sample.csproj` +`dotnet build /t:RunSample console-v8-cjs/Wasm.Console.V8.CJS.Sample.csproj` * browser TestMeaning sample -`dotnet build /t:RunSample browser/Wasm.Browser.Sample.csproj` +`dotnet build /t:RunSample browser/Wasm.Browser.CJS.Sample.csproj` To build and run the samples with AOT, add `/p:RunAOTCompilation=true` to the above command lines. diff --git a/src/mono/wasm/build/WasmApp.InTree.props b/src/mono/wasm/build/WasmApp.InTree.props index e5968f1320a949..ab70ccd739d44a 100644 --- a/src/mono/wasm/build/WasmApp.InTree.props +++ b/src/mono/wasm/build/WasmApp.InTree.props @@ -12,4 +12,10 @@ link false + + + <_MonoRuntimeComponentDontLink Include="libmono-component-debugger-stub-static.a" /> + <_MonoRuntimeComponentDontLink Include="libmono-component-diagnostics_tracing-static.a" /> + <_MonoRuntimeComponentDontLink Include="libmono-component-hot_reload-stub-static.a" /> + diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets index ea282f9638cf1e..6fb3e5beda18a7 100644 --- a/src/mono/wasm/build/WasmApp.Native.targets +++ b/src/mono/wasm/build/WasmApp.Native.targets @@ -502,6 +502,7 @@ EMSCRIPTEN_KEEPALIVE void mono_wasm_load_profiler_aot (const char *desc) { mono_ + <_AotInputAssemblies Include="@(_WasmAssembliesInternal)"> @@ -561,7 +562,8 @@ EMSCRIPTEN_KEEPALIVE void mono_wasm_load_profiler_aot (const char *desc) { mono_ CacheFilePath="$(_AOTCompilerCacheFile)" LLVMDebug="dwarfdebug" LLVMPath="$(EmscriptenUpstreamBinPath)" - IntermediateOutputPath="$(_WasmIntermediateOutputPath)"> + IntermediateOutputPath="$(_WasmIntermediateOutputPath)" + AotProfilePath="@(AotProfilePath)"> diff --git a/src/mono/wasm/build/WasmApp.targets b/src/mono/wasm/build/WasmApp.targets index 1df620145bea36..145e5c8f7ee909 100644 --- a/src/mono/wasm/build/WasmApp.targets +++ b/src/mono/wasm/build/WasmApp.targets @@ -61,6 +61,7 @@ - $(WasmBuildOnlyAfterPublish) - Causes relinking to be done only for Publish. Defaults to false. - $(RunAOTCompilationAfterBuild) - Run AOT compilation even after Build. By default, it is run only for publish. Defaults to false. + - $(WasmAotProfilePath) - Path to an AOT profile file. Public items: - @(WasmExtraFilesToDeploy) - Files to copy to $(WasmAppDir). diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs b/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs index ee7def9514c54c..e948c6abe0ebf7 100644 --- a/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs +++ b/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs @@ -60,36 +60,59 @@ public MessageId(string sessionId, int id) internal class DotnetObjectId { public string Scheme { get; } - public string Value { get; } + public int Value { get; } + public int SubValue { get; set; } public static bool TryParse(JToken jToken, out DotnetObjectId objectId) => TryParse(jToken?.Value(), out objectId); public static bool TryParse(string id, out DotnetObjectId objectId) { objectId = null; - if (id == null) - return false; - - if (!id.StartsWith("dotnet:")) - return false; + try { + if (id == null) + return false; - string[] parts = id.Split(":", 3); + if (!id.StartsWith("dotnet:")) + return false; - if (parts.Length < 3) - return false; + string[] parts = id.Split(":"); - objectId = new DotnetObjectId(parts[1], parts[2]); + if (parts.Length < 3) + return false; - return true; + objectId = new DotnetObjectId(parts[1], int.Parse(parts[2])); + switch (objectId.Scheme) + { + case "methodId": + { + parts = id.Split(":"); + objectId.SubValue = int.Parse(parts[3]); + break; + } + } + return true; + } + catch (Exception) + { + return false; + } } - public DotnetObjectId(string scheme, string value) + public DotnetObjectId(string scheme, int value) { Scheme = scheme; Value = value; } - public override string ToString() => $"dotnet:{Scheme}:{Value}"; + public override string ToString() + { + switch (Scheme) + { + case "methodId": + return $"dotnet:{Scheme}:{Value}:{SubValue}"; + } + return $"dotnet:{Scheme}:{Value}"; + } } public struct Result diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/MemberReferenceResolver.cs b/src/mono/wasm/debugger/BrowserDebugProxy/MemberReferenceResolver.cs index 8516b349f4cf23..bcef7dbed5272d 100644 --- a/src/mono/wasm/debugger/BrowserDebugProxy/MemberReferenceResolver.cs +++ b/src/mono/wasm/debugger/BrowserDebugProxy/MemberReferenceResolver.cs @@ -53,7 +53,7 @@ public async Task GetValueFromObject(JToken objRet, CancellationToken t { if (DotnetObjectId.TryParse(objRet?["value"]?["objectId"]?.Value(), out DotnetObjectId objectId)) { - var exceptionObject = await context.SdbAgent.GetObjectValues(int.Parse(objectId.Value), GetObjectCommandOptions.WithProperties | GetObjectCommandOptions.OwnProperties, token); + var exceptionObject = await context.SdbAgent.GetObjectValues(objectId.Value, GetObjectCommandOptions.WithProperties | GetObjectCommandOptions.OwnProperties, token); var exceptionObjectMessage = exceptionObject.FirstOrDefault(attr => attr["name"].Value().Equals("_message")); exceptionObjectMessage["value"]["value"] = objRet["value"]?["className"]?.Value() + ": " + exceptionObjectMessage["value"]?["value"]?.Value(); return exceptionObjectMessage["value"]?.Value(); @@ -342,17 +342,15 @@ public async Task Resolve(ElementAccessExpressionSyntax elementAccess, switch (objectId.Scheme) { case "array": - rootObject["value"] = await context.SdbAgent.GetArrayValues(int.Parse(objectId.Value), token); + rootObject["value"] = await context.SdbAgent.GetArrayValues(objectId.Value, token); return (JObject)rootObject["value"][elementIdx]["value"]; case "object": - var typeIds = await context.SdbAgent.GetTypeIdFromObject(int.Parse(objectId.Value), true, token); + var typeIds = await context.SdbAgent.GetTypeIdFromObject(objectId.Value, true, token); int methodId = await context.SdbAgent.GetMethodIdByName(typeIds[0], "ToArray", token); - var commandParamsObjWriter = new MonoBinaryWriter(); - commandParamsObjWriter.WriteObj(objectId, context.SdbAgent); - var toArrayRetMethod = await context.SdbAgent.InvokeMethod(commandParamsObjWriter.GetParameterBuffer(), methodId, elementAccess.Expression.ToString(), token); + var toArrayRetMethod = await context.SdbAgent.InvokeMethodInObject(objectId.Value, methodId, elementAccess.Expression.ToString(), token); rootObject = await GetValueFromObject(toArrayRetMethod, token); DotnetObjectId.TryParse(rootObject?["objectId"]?.Value(), out DotnetObjectId arrayObjectId); - rootObject["value"] = await context.SdbAgent.GetArrayValues(int.Parse(arrayObjectId.Value), token); + rootObject["value"] = await context.SdbAgent.GetArrayValues(arrayObjectId.Value, token); return (JObject)rootObject["value"][elementIdx]["value"]; default: throw new InvalidOperationException($"Cannot apply indexing with [] to an expression of type '{objectId.Scheme}'"); @@ -391,7 +389,7 @@ public async Task Resolve(InvocationExpressionSyntax method, Dictionary if (rootObject != null) { DotnetObjectId.TryParse(rootObject?["objectId"]?.Value(), out DotnetObjectId objectId); - var typeIds = await context.SdbAgent.GetTypeIdFromObject(int.Parse(objectId.Value), true, token); + var typeIds = await context.SdbAgent.GetTypeIdFromObject(objectId.Value, true, token); int methodId = await context.SdbAgent.GetMethodIdByName(typeIds[0], methodName, token); var className = await context.SdbAgent.GetTypeNameOriginal(typeIds[0], token); if (methodId == 0) //try to search on System.Linq.Enumerable diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs index e0f796e09c5ad2..b12de2655f70fd 100644 --- a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs +++ b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs @@ -411,7 +411,7 @@ protected override async Task AcceptCommand(MessageId id, string method, J { case "scope": return await OnSetVariableValue(id, - int.Parse(objectId.Value), + objectId.Value, args?["variableName"]?.Value(), args?["newValue"], token); @@ -449,7 +449,7 @@ protected override async Task AcceptCommand(MessageId id, string method, J { case "scope": return await OnEvaluateOnCallFrame(id, - int.Parse(objectId.Value), + objectId.Value, args?["expression"]?.Value(), token); default: return false; @@ -586,16 +586,17 @@ private async Task CallOnFunction(MessageId id, JObject args, Cancellation switch (objectId.Scheme) { case "object": - args["details"] = await context.SdbAgent.GetObjectProxy(int.Parse(objectId.Value), token); + case "methodId": + args["details"] = await context.SdbAgent.GetObjectProxy(objectId.Value, token); break; case "valuetype": - args["details"] = await context.SdbAgent.GetValueTypeProxy(int.Parse(objectId.Value), token); + args["details"] = await context.SdbAgent.GetValueTypeProxy(objectId.Value, token); break; case "pointer": - args["details"] = await context.SdbAgent.GetPointerContent(int.Parse(objectId.Value), token); + args["details"] = await context.SdbAgent.GetPointerContent(objectId.Value, token); break; case "array": - args["details"] = await context.SdbAgent.GetArrayValuesProxy(int.Parse(objectId.Value), token); + args["details"] = await context.SdbAgent.GetArrayValuesProxy(objectId.Value, token); break; case "cfo_res": { @@ -680,20 +681,25 @@ internal async Task RuntimeGetPropertiesInternal(SessionId id, DotnetObj { case "scope": { - var res = await GetScopeProperties(id, int.Parse(objectId.Value), token); + var res = await GetScopeProperties(id, objectId.Value, token); return res.Value?["result"]; } case "valuetype": - return await context.SdbAgent.GetValueTypeValues(int.Parse(objectId.Value), accessorPropertiesOnly, token); + return await context.SdbAgent.GetValueTypeValues(objectId.Value, accessorPropertiesOnly, token); case "array": - return await context.SdbAgent.GetArrayValues(int.Parse(objectId.Value), token); + return await context.SdbAgent.GetArrayValues(objectId.Value, token); + case "methodId": + { + var objRet = await context.SdbAgent.InvokeMethodInObject(objectId.Value, objectId.SubValue, "", token); + return new JArray(objRet); + } case "object": - return await context.SdbAgent.GetObjectValues(int.Parse(objectId.Value), objectValuesOpt, token); + return await context.SdbAgent.GetObjectValues(objectId.Value, objectValuesOpt, token); case "pointer": - return new JArray{await context.SdbAgent.GetPointerContent(int.Parse(objectId.Value), token)}; + return new JArray{await context.SdbAgent.GetPointerContent(objectId.Value, token)}; case "cfo_res": { - Result res = await SendMonoCommand(id, MonoCommands.GetDetails(RuntimeId, int.Parse(objectId.Value), args), token); + Result res = await SendMonoCommand(id, MonoCommands.GetDetails(RuntimeId, objectId.Value, args), token); string value_json_str = res.Value["result"]?["value"]?["__value_as_json_string__"]?.Value(); return value_json_str != null ? JArray.Parse(value_json_str) : null; } diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs b/src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs index 216f78a53af564..35d1ef4fceba12 100644 --- a/src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs +++ b/src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs @@ -502,7 +502,7 @@ protected unsafe void WriteBigEndian(T val) where T : struct base.Write(data); } - private void Write(ElementType type, T value) where T : struct => Write((byte)type, value); + internal void Write(ElementType type, T value) where T : struct => Write((byte)type, value); private void Write(T1 type, T2 value) where T1 : struct where T2 : struct { @@ -514,11 +514,11 @@ public void WriteObj(DotnetObjectId objectId, MonoSDBHelper SdbHelper) { if (objectId.Scheme == "object") { - Write(ElementType.Class, int.Parse(objectId.Value)); + Write(ElementType.Class, objectId.Value); } else if (objectId.Scheme == "valuetype") { - Write(SdbHelper.valueTypes[int.Parse(objectId.Value)].valueTypeBuffer); + Write(SdbHelper.valueTypes[objectId.Value].valueTypeBuffer); } } public async Task WriteConst(LiteralExpressionSyntax constValue, MonoSDBHelper SdbHelper, CancellationToken token) @@ -1537,6 +1537,13 @@ public async Task InvokeMethod(ArraySegment valueTypeBuffer, int return await CreateJObjectForVariableValue(retDebuggerCmdReader, varName, false, -1, false, token); } + public async Task InvokeMethodInObject(int objectId, int methodId, string varName, CancellationToken token) + { + using var commandParamsObjWriter = new MonoBinaryWriter(); + commandParamsObjWriter.Write(ElementType.Class, objectId); + return await InvokeMethod(commandParamsObjWriter.GetParameterBuffer(), methodId, varName, token); + } + public async Task GetPropertyMethodIdByName(int typeId, string propertyName, CancellationToken token) { using var retDebuggerCmdReader = await GetTypePropertiesReader(typeId, token); @@ -1559,13 +1566,14 @@ public async Task GetPropertyMethodIdByName(int typeId, string propertyName return -1; } - public async Task CreateJArrayForProperties(int typeId, ArraySegment object_buffer, JArray attributes, bool isAutoExpandable, string objectId, bool isOwn, CancellationToken token) + public async Task CreateJArrayForProperties(int typeId, ArraySegment object_buffer, JArray attributes, bool isAutoExpandable, string objectIdStr, bool isOwn, CancellationToken token) { JArray ret = new JArray(); using var retDebuggerCmdReader = await GetTypePropertiesReader(typeId, token); if (retDebuggerCmdReader == null) return null; - + if (!DotnetObjectId.TryParse(objectIdStr, out DotnetObjectId objectId)) + return null; var nProperties = retDebuggerCmdReader.ReadInt32(); for (int i = 0 ; i < nProperties; i++) { @@ -1595,11 +1603,11 @@ public async Task CreateJArrayForProperties(int typeId, ArraySegment GetHoistedLocalVariables(int objectId, JArray asyncLoc { if (DotnetObjectId.TryParse(asyncLocal?["value"]?["objectId"]?.Value(), out DotnetObjectId dotnetObjectId)) { - if (int.TryParse(dotnetObjectId.Value, out int objectIdToGetInfo) && !objectsAlreadyRead.Contains(objectIdToGetInfo)) + if (!objectsAlreadyRead.Contains(dotnetObjectId.Value)) { - var asyncLocalsFromObject = await GetObjectValues(objectIdToGetInfo, GetObjectCommandOptions.WithProperties, token); - var hoistedLocalVariable = await GetHoistedLocalVariables(objectIdToGetInfo, asyncLocalsFromObject, token); + var asyncLocalsFromObject = await GetObjectValues(dotnetObjectId.Value, GetObjectCommandOptions.WithProperties, token); + var hoistedLocalVariable = await GetHoistedLocalVariables(dotnetObjectId.Value, asyncLocalsFromObject, token); asyncLocalsFull = new JArray(asyncLocalsFull.Union(hoistedLocalVariable)); } } @@ -2295,7 +2303,7 @@ public async Task GetValuesFromDebuggerProxyAttribute(int objectId, int var retMethod = await InvokeMethod(invokeParamsWriter.GetParameterBuffer(), methodId, "methodRet", token); DotnetObjectId.TryParse(retMethod?["value"]?["objectId"]?.Value(), out DotnetObjectId dotnetObjectId); - var displayAttrs = await GetObjectValues(int.Parse(dotnetObjectId.Value), GetObjectCommandOptions.WithProperties | GetObjectCommandOptions.ForDebuggerProxyAttribute, token); + var displayAttrs = await GetObjectValues(dotnetObjectId.Value, GetObjectCommandOptions.WithProperties | GetObjectCommandOptions.ForDebuggerProxyAttribute, token); return displayAttrs; } } @@ -2385,7 +2393,7 @@ public async Task GetObjectValues(int objectId, GetObjectCommandOptions if (!getCommandType.HasFlag(GetObjectCommandOptions.WithProperties)) return ret; using var commandParamsObjWriter = new MonoBinaryWriter(); - commandParamsObjWriter.WriteObj(new DotnetObjectId("object", $"{objectId}"), this); + commandParamsObjWriter.WriteObj(new DotnetObjectId("object", objectId), this); var props = await CreateJArrayForProperties(typeId[i], commandParamsObjWriter.GetParameterBuffer(), ret, getCommandType.HasFlag(GetObjectCommandOptions.ForDebuggerProxyAttribute), $"dotnet:object:{objectId}", i == 0, token); ret = new JArray(ret.Union(props)); diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs index fbc176dc2ca5e3..f22b4ae3196bef 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs @@ -623,7 +623,12 @@ internal async Task CheckCustomType(JToken actual_val, JToken exp_val, string la AssertEqual("Function", get["className"]?.Value(), $"{label}-className"); AssertStartsWith($"get {exp_val["type_name"]?.Value()} ()", get["description"]?.Value(), $"{label}-description"); AssertEqual("function", get["type"]?.Value(), $"{label}-type"); - + var expectedValue = exp_val["value"]; + if (expectedValue.Type != JTokenType.Null) + { + var valueAfterRunGet = await GetProperties(get["objectId"]?.Value()); + await CheckValue(valueAfterRunGet[0]?["value"], expectedValue, exp_val["type_name"]?.Value()); + } break; } @@ -1059,7 +1064,7 @@ internal static JObject TDelegate(string className, string target) => JObject.Fr internal static JObject TIgnore() => JObject.FromObject(new { __custom_type = "ignore_me" }); - internal static JObject TGetter(string type) => JObject.FromObject(new { __custom_type = "getter", type_name = type }); + internal static JObject TGetter(string type, JObject value = null) => JObject.FromObject(new { __custom_type = "getter", type_name = type, value = value}); internal static JObject TDateTime(DateTime dt) => JObject.FromObject(new { diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/GetPropertiesTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/GetPropertiesTests.cs index ca5afa742cfb3f..f91ba3c012effb 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/GetPropertiesTests.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/GetPropertiesTests.cs @@ -340,7 +340,7 @@ public async Task GetObjectValueWithInheritance() { var pause_location = await EvaluateAndCheck( "window.setTimeout(function() { invoke_static_method('[debugger-test] TestChild:TestWatchWithInheritance'); }, 1);", - "dotnet://debugger-test.dll/debugger-test2.cs", 127, 8, + "dotnet://debugger-test.dll/debugger-test2.cs", 128, 8, "TestWatchWithInheritance"); var frame_id = pause_location["callFrames"][0]["callFrameId"].Value(); var frame_locals = await GetProperties(frame_id); @@ -350,9 +350,10 @@ public async Task GetObjectValueWithInheritance() j = TNumber(20), i = TNumber(50), k = TNumber(30), - GetJ = TGetter("GetJ"), - GetI = TGetter("GetI"), - GetK = TGetter("GetK") + GetJ = TGetter("GetJ", TNumber(20)), + GetI = TGetter("GetI", TNumber(50)), + GetK = TGetter("GetK", TNumber(30)), + GetD = TGetter("GetD", TDateTime(new DateTime(2020, 7, 6, 5, 4, 3))) }, "test_props"); await EvaluateOnCallFrameAndCheck(frame_id, ($"test.GetJ", TNumber(20)), diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/TestHarnessStartup.cs b/src/mono/wasm/debugger/DebuggerTestSuite/TestHarnessStartup.cs index e7be4958421bed..c8ac7709007118 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/TestHarnessStartup.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/TestHarnessStartup.cs @@ -114,9 +114,9 @@ public async Task LaunchAndServe(ProcessStartInfo psi, HttpContext context, Func proc.BeginErrorReadLine(); proc.BeginOutputReadLine(); - if (await Task.WhenAny(tcs.Task, Task.Delay(5000)) != tcs.Task) + if (await Task.WhenAny(tcs.Task, Task.Delay(20000)) != tcs.Task) { - Logger.LogError("Didnt get the con string after 5s."); + Logger.LogError("Didnt get the con string after 20s."); throw new Exception("node.js timedout"); } var line = await tcs.Task; diff --git a/src/mono/wasm/debugger/tests/debugger-test/debugger-test2.cs b/src/mono/wasm/debugger/tests/debugger-test/debugger-test2.cs index 9756cbe26de449..28c908261a6aa8 100644 --- a/src/mono/wasm/debugger/tests/debugger-test/debugger-test2.cs +++ b/src/mono/wasm/debugger/tests/debugger-test/debugger-test2.cs @@ -118,6 +118,7 @@ public class TestChild : TestParent { public int i = 50; public int GetI => i; + public DateTime GetD => new DateTime(2020, 7, 6, 5, 4, 3); public TestChild() { Console.WriteLine("Hi"); diff --git a/src/mono/wasm/runtime/cwraps.ts b/src/mono/wasm/runtime/cwraps.ts index b8e5ca141e2062..98dd8f8e4e9bb5 100644 --- a/src/mono/wasm/runtime/cwraps.ts +++ b/src/mono/wasm/runtime/cwraps.ts @@ -21,7 +21,7 @@ const fn_signatures: [ident: string, returnType: string | null, argTypes?: strin ["mono_wasm_parse_runtime_options", null, ["number", "number"]], ["mono_wasm_strdup", "number", ["string"]], ["mono_background_exec", null, []], - ["mono_set_timeout_exec", null, ["number"]], + ["mono_set_timeout_exec", null, []], ["mono_wasm_load_icu_data", "number", ["number"]], ["mono_wasm_get_icudt_name", "string", ["string"]], ["mono_wasm_add_assembly", "number", ["string", "number", "number"]], @@ -82,7 +82,7 @@ export interface t_Cwraps { mono_wasm_strdup(value: string): number; mono_wasm_parse_runtime_options(length: number, argv: VoidPtr): void; mono_background_exec(): void; - mono_set_timeout_exec(id: number): void; + mono_set_timeout_exec(): void; mono_wasm_load_icu_data(offset: VoidPtr): number; mono_wasm_get_icudt_name(name: string): string; mono_wasm_add_assembly(name: string, data: VoidPtr, size: number): number; diff --git a/src/mono/wasm/runtime/scheduling.ts b/src/mono/wasm/runtime/scheduling.ts index b2b5616738e78f..c997c2ea9ff280 100644 --- a/src/mono/wasm/runtime/scheduling.ts +++ b/src/mono/wasm/runtime/scheduling.ts @@ -38,7 +38,7 @@ export function prevent_timer_throttling(): void { for (let schedule = next_reach_time; schedule < desired_reach_time; schedule += light_throttling_frequency) { const delay = schedule - now; setTimeout(() => { - cwraps.mono_set_timeout_exec(0); + cwraps.mono_set_timeout_exec(); pump_count++; pump_message(); }, delay); @@ -52,9 +52,9 @@ export function schedule_background_exec(): void { } let lastScheduledTimeoutId: any = undefined; -export function mono_set_timeout(timeout: number, id: number): void { +export function mono_set_timeout(timeout: number): void { function mono_wasm_set_timeout_exec() { - cwraps.mono_set_timeout_exec(id); + cwraps.mono_set_timeout_exec(); } if (lastScheduledTimeoutId) { clearTimeout(lastScheduledTimeoutId); diff --git a/src/native/corehost/build.sh b/src/native/corehost/build.sh index 333f3802f10747..8d2eb46fa914a2 100755 --- a/src/native/corehost/build.sh +++ b/src/native/corehost/build.sh @@ -16,8 +16,6 @@ __TargetOS=Linux __BuildType=Debug __CMakeArgs="" __Compiler=clang -__CompilerMajorVersion= -__CompilerMinorVersion= __CrossBuild=0 __PortableBuild=1 __RootBinDir="$__RepoRootDir/artifacts" diff --git a/src/native/libs/System.IO.Ports.Native/pal_termios.c b/src/native/libs/System.IO.Ports.Native/pal_termios.c index 318886c5abc40d..28d98f105e89b2 100644 --- a/src/native/libs/System.IO.Ports.Native/pal_termios.c +++ b/src/native/libs/System.IO.Ports.Native/pal_termios.c @@ -52,7 +52,7 @@ enum SendQueue = 2, }; -static int32_t SystemIoPortsNative_TermiosGetStatus(intptr_t handle) +static int32_t TermiosGetStatus(intptr_t handle) { int fd = ToFileDescriptor(handle); int status = 0; @@ -66,7 +66,7 @@ static int32_t SystemIoPortsNative_TermiosGetStatus(intptr_t handle) int32_t SystemIoPortsNative_TermiosGetSignal(intptr_t handle, int32_t signal) { - int32_t status = SystemIoPortsNative_TermiosGetStatus(handle); + int32_t status = TermiosGetStatus(handle); if (status == -1) { return -1; @@ -91,7 +91,7 @@ int32_t SystemIoPortsNative_TermiosGetSignal(intptr_t handle, int32_t signal) int32_t SystemIoPortsNative_TermiosGetAllSignals(intptr_t handle) { - int32_t status = SystemIoPortsNative_TermiosGetStatus(handle); + int32_t status = TermiosGetStatus(handle); if (status == -1) { return -1; @@ -132,7 +132,7 @@ int32_t SystemIoPortsNative_TermiosSetSignal(intptr_t handle, int32_t signal, in return -1; } - int status = SystemIoPortsNative_TermiosGetStatus(fd); + int status = TermiosGetStatus(fd); if (status >= 0) { if (set) @@ -149,7 +149,7 @@ int32_t SystemIoPortsNative_TermiosSetSignal(intptr_t handle, int32_t signal, in return -1; } -static speed_t SystemIoPortsNative_TermiosSpeed2Rate(int speed) +static speed_t TermiosSpeed2Rate(int speed) { switch (speed) { @@ -242,7 +242,7 @@ static speed_t SystemIoPortsNative_TermiosSpeed2Rate(int speed) return B0; } -static int SystemIoPortsNative_TermiosRate2Speed(speed_t brate) +static int TermiosRate2Speed(speed_t brate) { switch (brate) { @@ -344,14 +344,14 @@ int32_t SystemIoPortsNative_TermiosGetSpeed(intptr_t handle) return -1; } - return SystemIoPortsNative_TermiosRate2Speed(cfgetispeed(&term)); + return TermiosRate2Speed(cfgetispeed(&term)); } int32_t SystemIoPortsNative_TermiosSetSpeed(intptr_t handle, int32_t speed) { int fd = ToFileDescriptor(handle); struct termios term; - speed_t brate = SystemIoPortsNative_TermiosSpeed2Rate(speed); + speed_t brate = TermiosSpeed2Rate(speed); if (brate == B0) { @@ -515,7 +515,7 @@ int32_t SystemIoPortsNative_TermiosReset(intptr_t handle, int32_t speed, int32_t if (speed) { - brate = SystemIoPortsNative_TermiosSpeed2Rate(speed); + brate = TermiosSpeed2Rate(speed); if (brate == B0) { #if !HAVE_IOSS_H diff --git a/src/native/libs/System.Native/CMakeLists.txt b/src/native/libs/System.Native/CMakeLists.txt index 60780bf85c7089..45bfea5a8e7b62 100644 --- a/src/native/libs/System.Native/CMakeLists.txt +++ b/src/native/libs/System.Native/CMakeLists.txt @@ -27,7 +27,6 @@ set(NATIVE_SOURCES pal_process.c pal_random.c pal_runtimeinformation.c - pal_runtimeextensions.c pal_signal.c pal_string.c pal_tcpstate.c diff --git a/src/native/libs/System.Native/entrypoints.c b/src/native/libs/System.Native/entrypoints.c index 8b251d93e3f1d9..0e54f4b5f15193 100644 --- a/src/native/libs/System.Native/entrypoints.c +++ b/src/native/libs/System.Native/entrypoints.c @@ -21,7 +21,6 @@ #include "pal_networkstatistics.h" #include "pal_process.h" #include "pal_random.h" -#include "pal_runtimeextensions.h" #include "pal_runtimeinformation.h" #include "pal_searchpath.h" #include "pal_signal.h" @@ -118,7 +117,6 @@ static const Entry s_sysNative[] = DllImportEntry(SystemNative_AlignedRealloc) DllImportEntry(SystemNative_Calloc) DllImportEntry(SystemNative_Free) - DllImportEntry(SystemNative_GetUsableSize) DllImportEntry(SystemNative_Malloc) DllImportEntry(SystemNative_MemSet) DllImportEntry(SystemNative_Realloc) @@ -214,18 +212,15 @@ static const Entry s_sysNative[] = DllImportEntry(SystemNative_GetProcessPath) DllImportEntry(SystemNative_GetNonCryptographicallySecureRandomBytes) DllImportEntry(SystemNative_GetCryptographicallySecureRandomBytes) - DllImportEntry(SystemNative_GetNodeName) DllImportEntry(SystemNative_GetUnixName) DllImportEntry(SystemNative_GetUnixRelease) DllImportEntry(SystemNative_GetUnixVersion) DllImportEntry(SystemNative_GetOSArchitecture) - DllImportEntry(SystemNative_GetProcessArchitecture) DllImportEntry(SystemNative_SearchPath) DllImportEntry(SystemNative_SearchPath_TempDirectory) DllImportEntry(SystemNative_RegisterForSigChld) DllImportEntry(SystemNative_SetDelayedSigChildConsoleConfigurationHandler) DllImportEntry(SystemNative_SetTerminalInvalidationHandler) - DllImportEntry(SystemNative_InitializeTerminalAndSignalHandling) DllImportEntry(SystemNative_SNPrintF) DllImportEntry(SystemNative_Sysctl) DllImportEntry(SystemNative_MapTcpState) diff --git a/src/native/libs/System.Native/pal_memory.c b/src/native/libs/System.Native/pal_memory.c index eb76650f47b43d..011204bad88f0c 100644 --- a/src/native/libs/System.Native/pal_memory.c +++ b/src/native/libs/System.Native/pal_memory.c @@ -50,7 +50,7 @@ void* SystemNative_AlignedRealloc(void* ptr, uintptr_t alignment, uintptr_t new_ if (result != NULL) { - uintptr_t old_size = SystemNative_GetUsableSize(ptr); + uintptr_t old_size = MALLOC_SIZE(ptr); assert((ptr != NULL) || (old_size == 0)); memcpy(result, ptr, (new_size < old_size) ? new_size : old_size); @@ -70,11 +70,6 @@ void SystemNative_Free(void* ptr) free(ptr); } -uintptr_t SystemNative_GetUsableSize(void* ptr) -{ - return MALLOC_SIZE(ptr); -} - void* SystemNative_Malloc(uintptr_t size) { return malloc(size); diff --git a/src/native/libs/System.Native/pal_memory.h b/src/native/libs/System.Native/pal_memory.h index 2cc4c1d8635be9..37c8bf711d5ca8 100644 --- a/src/native/libs/System.Native/pal_memory.h +++ b/src/native/libs/System.Native/pal_memory.h @@ -31,11 +31,6 @@ PALEXPORT void* SystemNative_Calloc(uintptr_t num, uintptr_t size); */ PALEXPORT void SystemNative_Free(void* ptr); -/** - * Get usable size of C runtime malloc - */ -PALEXPORT uintptr_t SystemNative_GetUsableSize(void* ptr); - /** * C runtime malloc */ diff --git a/src/native/libs/System.Native/pal_runtimeextensions.c b/src/native/libs/System.Native/pal_runtimeextensions.c deleted file mode 100644 index b4690ecd6ef9bf..00000000000000 --- a/src/native/libs/System.Native/pal_runtimeextensions.c +++ /dev/null @@ -1,23 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -#include "pal_runtimeextensions.h" -#include "pal_types.h" -#include -#include - -int32_t SystemNative_GetNodeName(char* version, int* capacity) -{ - struct utsname _utsname; - if (uname(&_utsname) != -1) - { - int r = snprintf(version, (size_t)(*capacity), "%s", _utsname.nodename); - if (r > *capacity) - { - *capacity = r + 1; - return -1; - } - } - - return 0; -} diff --git a/src/native/libs/System.Native/pal_runtimeextensions.h b/src/native/libs/System.Native/pal_runtimeextensions.h deleted file mode 100644 index 99d14765d412c6..00000000000000 --- a/src/native/libs/System.Native/pal_runtimeextensions.h +++ /dev/null @@ -1,9 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -#pragma once - -#include "pal_compiler.h" -#include "pal_types.h" - -PALEXPORT int32_t SystemNative_GetNodeName(char* version, int* capacity); diff --git a/src/native/libs/System.Native/pal_runtimeinformation.c b/src/native/libs/System.Native/pal_runtimeinformation.c index c7b7073adfafd1..107aff8f9786cb 100644 --- a/src/native/libs/System.Native/pal_runtimeinformation.c +++ b/src/native/libs/System.Native/pal_runtimeinformation.c @@ -53,52 +53,8 @@ int32_t SystemNative_GetUnixVersion(char* version, int* capacity) return 0; } -/* Returns an int representing the OS Architecture: - 0 - x86 - 1 - x64 - 2 - ARM - 3 - ARM64 - 4 - WASM */ +/* Returns an int representing the OS Architecture. -1 if same as process architecture. */ int32_t SystemNative_GetOSArchitecture() { -#if defined(TARGET_ARM) - return ARCH_ARM; -#elif defined(TARGET_ARM64) - return ARCH_ARM64; -#elif defined(TARGET_AMD64) - return ARCH_X64; -#elif defined(TARGET_X86) - return ARCH_X86; -#elif defined(TARGET_WASM) - return ARCH_WASM; -#elif defined(TARGET_S390X) - return ARCH_S390X; -#else -#error Unidentified Architecture -#endif -} - -/* Returns an int representing the OS Architecture: -0 - x86 -1 - x64 -2 - ARM -3 - ARM64 -4 - WASM */ -int32_t SystemNative_GetProcessArchitecture() -{ -#if defined(TARGET_ARM) - return ARCH_ARM; -#elif defined(TARGET_ARM64) - return ARCH_ARM64; -#elif defined(TARGET_AMD64) - return ARCH_X64; -#elif defined(TARGET_X86) - return ARCH_X86; -#elif defined(TARGET_WASM) - return ARCH_WASM; -#elif defined(TARGET_S390X) - return ARCH_S390X; -#else -#error Unidentified Architecture -#endif + return -1; } diff --git a/src/native/libs/System.Native/pal_runtimeinformation.h b/src/native/libs/System.Native/pal_runtimeinformation.h index ff7e91d7dad1da..6b13077b1a730d 100644 --- a/src/native/libs/System.Native/pal_runtimeinformation.h +++ b/src/native/libs/System.Native/pal_runtimeinformation.h @@ -14,8 +14,7 @@ PALEXPORT int32_t SystemNative_GetUnixVersion(char* version, int* capacity); PALEXPORT int32_t SystemNative_GetOSArchitecture(void); -PALEXPORT int32_t SystemNative_GetProcessArchitecture(void); - +// Keep in sync with System.Runtime.InteropServices.Architecture enum enum { ARCH_X86, diff --git a/src/native/libs/System.Net.Security.Native/pal_gssapi.c b/src/native/libs/System.Net.Security.Native/pal_gssapi.c index 7ccc59631b95c2..6206fa0fa0ce42 100644 --- a/src/native/libs/System.Net.Security.Native/pal_gssapi.c +++ b/src/native/libs/System.Net.Security.Native/pal_gssapi.c @@ -163,10 +163,10 @@ static void NetSecurityNative_MoveBuffer(gss_buffer_t gssBuffer, PAL_GssBuffer* targetBuffer->data = (uint8_t*)(gssBuffer->value); } -static uint32_t NetSecurityNative_AcquireCredSpNego(uint32_t* minorStatus, - GssName* desiredName, - gss_cred_usage_t credUsage, - GssCredId** outputCredHandle) +static uint32_t AcquireCredSpNego(uint32_t* minorStatus, + GssName* desiredName, + gss_cred_usage_t credUsage, + GssCredId** outputCredHandle) { assert(minorStatus != NULL); assert(desiredName != NULL); @@ -196,7 +196,7 @@ static uint32_t NetSecurityNative_AcquireCredSpNego(uint32_t* minorStatus, uint32_t NetSecurityNative_InitiateCredSpNego(uint32_t* minorStatus, GssName* desiredName, GssCredId** outputCredHandle) { - return NetSecurityNative_AcquireCredSpNego(minorStatus, desiredName, GSS_C_INITIATE, outputCredHandle); + return AcquireCredSpNego(minorStatus, desiredName, GSS_C_INITIATE, outputCredHandle); } uint32_t NetSecurityNative_DeleteSecContext(uint32_t* minorStatus, GssCtxId** contextHandle) @@ -566,13 +566,13 @@ uint32_t NetSecurityNative_Unwrap(uint32_t* minorStatus, return majorStatus; } -static uint32_t NetSecurityNative_AcquireCredWithPassword(uint32_t* minorStatus, - int32_t isNtlm, - GssName* desiredName, - char* password, - uint32_t passwdLen, - gss_cred_usage_t credUsage, - GssCredId** outputCredHandle) +static uint32_t AcquireCredWithPassword(uint32_t* minorStatus, + int32_t isNtlm, + GssName* desiredName, + char* password, + uint32_t passwdLen, + gss_cred_usage_t credUsage, + GssCredId** outputCredHandle) { assert(minorStatus != NULL); assert(isNtlm == 1 || isNtlm == 0); @@ -636,7 +636,7 @@ uint32_t NetSecurityNative_InitiateCredWithPassword(uint32_t* minorStatus, uint32_t passwdLen, GssCredId** outputCredHandle) { - return NetSecurityNative_AcquireCredWithPassword( + return AcquireCredWithPassword( minorStatus, isNtlm, desiredName, password, passwdLen, GSS_C_INITIATE, outputCredHandle); } diff --git a/src/native/libs/System.Security.Cryptography.Native.Android/pal_ecc_import_export.c b/src/native/libs/System.Security.Cryptography.Native.Android/pal_ecc_import_export.c index 42543bd21f01a5..b625a26a081aa5 100644 --- a/src/native/libs/System.Security.Cryptography.Native.Android/pal_ecc_import_export.c +++ b/src/native/libs/System.Security.Cryptography.Native.Android/pal_ecc_import_export.c @@ -251,7 +251,7 @@ int32_t AndroidCryptoNative_GetECCurveParameters(const EC_KEY* key, return rc; } -static jobject AndroidCryptoNative_CreateKeyPairFromCurveParameters( +static jobject CreateKeyPairFromCurveParameters( jobject curveParameters, uint8_t* qx, int32_t qxLength, uint8_t* qy, int32_t qyLength, uint8_t* d, int32_t dLength) { JNIEnv* env = GetJNIEnv(); @@ -360,7 +360,7 @@ int32_t AndroidCryptoNative_EcKeyCreateByKeyParameters(EC_KEY** key, // Release the reference to the generated key pair. We're going to make our own with the explicit keys. ReleaseGRef(env, (*key)->keyPair); (*key)->keyPair = - AndroidCryptoNative_CreateKeyPairFromCurveParameters((*key)->curveParameters, qx, qxLength, qy, qyLength, d, dLength); + CreateKeyPairFromCurveParameters((*key)->curveParameters, qx, qxLength, qy, qyLength, d, dLength); if ((*key)->keyPair == NULL) { @@ -518,7 +518,7 @@ EC_KEY* AndroidCryptoNative_EcKeyCreateByExplicitParameters(ECCurveType curveTyp if ((qx && qy) || d) { // If we have explicit key parameters, use those. - keyPair = AndroidCryptoNative_CreateKeyPairFromCurveParameters(loc[paramSpec], qx, qxLength, qy, qyLength, d, dLength); + keyPair = CreateKeyPairFromCurveParameters(loc[paramSpec], qx, qxLength, qy, qyLength, d, dLength); } else { diff --git a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_ssl.c b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_ssl.c index 0770a946bee1ed..aff6eb8b250813 100644 --- a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_ssl.c +++ b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_ssl.c @@ -48,7 +48,7 @@ static SSLProtocol PalSslProtocolToSslProtocol(PAL_SslProtocol palProtocolId) #pragma clang diagnostic ignored "-Wdeprecated-declarations" case PAL_SslProtocol_Tls13: return kTLSProtocol13; - case PAL_SslProtocol_Tls12: + case PAL_SslProtocol_Tls12: return kTLSProtocol12; case PAL_SslProtocol_Tls11: return kTLSProtocol11; @@ -129,10 +129,10 @@ AppleCryptoNative_SslCopyCADistinguishedNames(SSLContextRef sslContext, CFArrayR return *pOSStatus == noErr; } -static int32_t AppleCryptoNative_SslSetSessionOption(SSLContextRef sslContext, - SSLSessionOption option, - int32_t value, - int32_t* pOSStatus) +static int32_t SslSetSessionOption(SSLContextRef sslContext, + SSLSessionOption option, + int32_t value, + int32_t* pOSStatus) { if (sslContext == NULL) return -1; @@ -152,7 +152,7 @@ int32_t AppleCryptoNative_SslSetBreakOnServerAuth(SSLContextRef sslContext, int3 { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - return AppleCryptoNative_SslSetSessionOption(sslContext, kSSLSessionOptionBreakOnServerAuth, setBreak, pOSStatus); + return SslSetSessionOption(sslContext, kSSLSessionOptionBreakOnServerAuth, setBreak, pOSStatus); #pragma clang diagnostic pop } @@ -160,7 +160,7 @@ int32_t AppleCryptoNative_SslSetBreakOnClientAuth(SSLContextRef sslContext, int3 { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - return AppleCryptoNative_SslSetSessionOption(sslContext, kSSLSessionOptionBreakOnClientAuth, setBreak, pOSStatus); + return SslSetSessionOption(sslContext, kSSLSessionOptionBreakOnClientAuth, setBreak, pOSStatus); #pragma clang diagnostic pop } @@ -603,7 +603,7 @@ int32_t AppleCryptoNative_SslSetEnabledCipherSuites(SSLContextRef sslContext, co #pragma clang diagnostic ignored "-Wdeprecated-declarations" // macOS & MacCatalyst x64 return SSLSetEnabledCiphers(sslContext, (const SSLCipherSuite *)cipherSuites, (size_t)numCipherSuites); -#pragma clang diagnostic pop +#pragma clang diagnostic pop } else #endif diff --git a/src/native/libs/System.Security.Cryptography.Native/entrypoints.c b/src/native/libs/System.Security.Cryptography.Native/entrypoints.c index 4a95b97756a32e..9a7c60f7f0e1ce 100644 --- a/src/native/libs/System.Security.Cryptography.Native/entrypoints.c +++ b/src/native/libs/System.Security.Cryptography.Native/entrypoints.c @@ -211,7 +211,6 @@ static const Entry s_cryptoNative[] = DllImportEntry(CryptoNative_NewX509Stack) DllImportEntry(CryptoNative_ObjNid2Obj) DllImportEntry(CryptoNative_ObjObj2Txt) - DllImportEntry(CryptoNative_ObjSn2Nid) DllImportEntry(CryptoNative_ObjTxt2Nid) DllImportEntry(CryptoNative_ObjTxt2Obj) DllImportEntry(CryptoNative_OcspRequestDestroy) @@ -280,7 +279,6 @@ static const Entry s_cryptoNative[] = DllImportEntry(CryptoNative_EnsureOpenSslInitialized) DllImportEntry(CryptoNative_OpenSslGetProtocolSupport) DllImportEntry(CryptoNative_OpenSslVersionNumber) - DllImportEntry(CryptoNative_BioWrite) DllImportEntry(CryptoNative_EnsureLibSslInitialized) DllImportEntry(CryptoNative_GetOpenSslCipherSuiteName) DllImportEntry(CryptoNative_SslRenegotiate) @@ -297,7 +295,6 @@ static const Entry s_cryptoNative[] = DllImportEntry(CryptoNative_SslCtxSetAlpnSelectCb) DllImportEntry(CryptoNative_SslCtxSetProtocolOptions) DllImportEntry(CryptoNative_SslCtxSetQuietShutdown) - DllImportEntry(CryptoNative_SslCtxSetVerify) DllImportEntry(CryptoNative_SslCtxUseCertificate) DllImportEntry(CryptoNative_SslCtxUsePrivateKey) DllImportEntry(CryptoNative_SslDestroy) @@ -324,11 +321,9 @@ static const Entry s_cryptoNative[] = DllImportEntry(CryptoNative_SslShutdown) DllImportEntry(CryptoNative_SslV2_3Method) DllImportEntry(CryptoNative_SslWrite) - DllImportEntry(CryptoNative_X509StoreCtxGetTargetCert) DllImportEntry(CryptoNative_Tls13Supported) DllImportEntry(CryptoNative_X509Duplicate) DllImportEntry(CryptoNative_SslGet0AlpnSelected) - DllImportEntry(CryptoNative_Asn1StringFree) }; EXTERN_C const void* CryptoResolveDllImport(const char* name); diff --git a/src/native/libs/System.Security.Cryptography.Native/opensslshim.h b/src/native/libs/System.Security.Cryptography.Native/opensslshim.h index 5675f4c0ca7fbd..daaa49da2869e9 100644 --- a/src/native/libs/System.Security.Cryptography.Native/opensslshim.h +++ b/src/native/libs/System.Security.Cryptography.Native/opensslshim.h @@ -956,7 +956,6 @@ FOR_ALL_OPENSSL_FUNCTIONS #define SSL_peek SSL_peek_ptr #define SSL_state_string_long SSL_state_string_long_ptr #define SSL_read SSL_read_ptr -#define ERR_print_errors_fp ERR_print_errors_fp_ptr #define SSL_renegotiate SSL_renegotiate_ptr #define SSL_renegotiate_pending SSL_renegotiate_pending_ptr #define SSL_session_reused SSL_session_reused_ptr diff --git a/src/native/libs/System.Security.Cryptography.Native/pal_asn1.c b/src/native/libs/System.Security.Cryptography.Native/pal_asn1.c index aef59c230dd11c..349bff95d6d6fc 100644 --- a/src/native/libs/System.Security.Cryptography.Native/pal_asn1.c +++ b/src/native/libs/System.Security.Cryptography.Native/pal_asn1.c @@ -38,11 +38,6 @@ const ASN1_OBJECT* CryptoNative_GetObjectDefinitionByName(const char* friendlyNa return OBJ_nid2obj(nid); } -int32_t CryptoNative_ObjSn2Nid(const char* sn) -{ - return OBJ_sn2nid(sn); -} - int32_t CryptoNative_ObjTxt2Nid(const char* sn) { return OBJ_txt2nid(sn); @@ -88,11 +83,6 @@ void CryptoNative_Asn1OctetStringFree(ASN1_STRING* a) ASN1_OCTET_STRING_free(a); } -void CryptoNative_Asn1StringFree(ASN1_STRING* a) -{ - ASN1_STRING_free(a); -} - int32_t CryptoNative_GetAsn1IntegerDerSize(ASN1_INTEGER* i) { return i2d_ASN1_INTEGER(i, NULL); diff --git a/src/native/libs/System.Security.Cryptography.Native/pal_asn1.h b/src/native/libs/System.Security.Cryptography.Native/pal_asn1.h index a64e9634805740..d5b533c581d780 100644 --- a/src/native/libs/System.Security.Cryptography.Native/pal_asn1.h +++ b/src/native/libs/System.Security.Cryptography.Native/pal_asn1.h @@ -34,11 +34,6 @@ Can return nullptr if there isn't a corresponding shared object. */ PALEXPORT const ASN1_OBJECT* CryptoNative_GetObjectDefinitionByName(const char* friendlyName); -/* -Direct shim to OBJ_sn2nid. -*/ -PALEXPORT int32_t CryptoNative_ObjSn2Nid(const char* sn); - /* Direct shim to OBJ_txt2nid. */ @@ -79,11 +74,6 @@ Direct shim to ASN1_OCTET_STRING_free. */ PALEXPORT void CryptoNative_Asn1OctetStringFree(ASN1_STRING* a); -/* -Direct shim to ASN1_STRING_free. -*/ -PALEXPORT void CryptoNative_Asn1StringFree(ASN1_STRING* a); - /* Returns the number of bytes it will take to convert the ASN1_INTEGER to a DER format. diff --git a/src/native/libs/System.Security.Cryptography.Native/pal_evp.c b/src/native/libs/System.Security.Cryptography.Native/pal_evp.c index 9cf042a29e9fca..40181b2b132b6e 100644 --- a/src/native/libs/System.Security.Cryptography.Native/pal_evp.c +++ b/src/native/libs/System.Security.Cryptography.Native/pal_evp.c @@ -56,7 +56,7 @@ int32_t CryptoNative_EvpDigestFinalEx(EVP_MD_CTX* ctx, uint8_t* md, uint32_t* s) return ret; } -static EVP_MD_CTX* CryptoNative_EvpDup(const EVP_MD_CTX* ctx) +static EVP_MD_CTX* EvpDup(const EVP_MD_CTX* ctx) { if (ctx == NULL) { @@ -81,7 +81,7 @@ static EVP_MD_CTX* CryptoNative_EvpDup(const EVP_MD_CTX* ctx) int32_t CryptoNative_EvpDigestCurrent(const EVP_MD_CTX* ctx, uint8_t* md, uint32_t* s) { - EVP_MD_CTX* dup = CryptoNative_EvpDup(ctx); + EVP_MD_CTX* dup = EvpDup(ctx); if (dup != NULL) { diff --git a/src/native/libs/System.Security.Cryptography.Native/pal_hmac.c b/src/native/libs/System.Security.Cryptography.Native/pal_hmac.c index 96b008534c0e2c..3b6f8166dac6c5 100644 --- a/src/native/libs/System.Security.Cryptography.Native/pal_hmac.c +++ b/src/native/libs/System.Security.Cryptography.Native/pal_hmac.c @@ -84,7 +84,7 @@ int32_t CryptoNative_HmacFinal(HMAC_CTX* ctx, uint8_t* md, int32_t* len) return ret; } -static HMAC_CTX* CryptoNative_HmacDup(const HMAC_CTX* ctx) +static HMAC_CTX* HmacDup(const HMAC_CTX* ctx) { assert(ctx != NULL); @@ -119,7 +119,7 @@ int32_t CryptoNative_HmacCurrent(const HMAC_CTX* ctx, uint8_t* md, int32_t* len) return 0; } - HMAC_CTX* dup = CryptoNative_HmacDup(ctx); + HMAC_CTX* dup = HmacDup(ctx); if (dup != NULL) { diff --git a/src/native/libs/System.Security.Cryptography.Native/pal_ssl.c b/src/native/libs/System.Security.Cryptography.Native/pal_ssl.c index 2b4eb271b022a2..2032c131892e0f 100644 --- a/src/native/libs/System.Security.Cryptography.Native/pal_ssl.c +++ b/src/native/libs/System.Security.Cryptography.Native/pal_ssl.c @@ -463,13 +463,6 @@ X509NameStack* CryptoNative_SslGetClientCAList(SSL* ssl) return SSL_get_client_CA_list(ssl); } -void CryptoNative_SslCtxSetVerify(SSL_CTX* ctx, SslCtxSetVerifyCallback callback) -{ - int mode = SSL_VERIFY_PEER; - - SSL_CTX_set_verify(ctx, mode, callback); -} - void CryptoNative_SslSetVerifyPeer(SSL* ssl) { SSL_set_verify(ssl, SSL_VERIFY_PEER, verify_callback); diff --git a/src/native/libs/System.Security.Cryptography.Native/pal_ssl.h b/src/native/libs/System.Security.Cryptography.Native/pal_ssl.h index 0a18f7a764c17f..cbebf7b0666485 100644 --- a/src/native/libs/System.Security.Cryptography.Native/pal_ssl.h +++ b/src/native/libs/System.Security.Cryptography.Native/pal_ssl.h @@ -110,9 +110,6 @@ typedef enum PAL_SSL_ERROR_ZERO_RETURN = 6, } SslErrorCode; -// the function pointer definition for the callback used in SslCtxSetVerify -typedef int32_t (*SslCtxSetVerifyCallback)(int32_t, X509_STORE_CTX*); - // the function pointer definition for the callback used in SslCtxSetAlpnSelectCb typedef int32_t (*SslCtxSetAlpnCallback)(SSL* ssl, const uint8_t** out, @@ -312,11 +309,6 @@ Returns the list of CA names explicity set. */ PALEXPORT X509NameStack* CryptoNative_SslGetClientCAList(SSL* ssl); -/* -Shims the SSL_CTX_set_verify method. -*/ -PALEXPORT void CryptoNative_SslCtxSetVerify(SSL_CTX* ctx, SslCtxSetVerifyCallback callback); - /* Shims the SSL_set_verify method. */ diff --git a/src/native/libs/System.Security.Cryptography.Native/pal_x509.c b/src/native/libs/System.Security.Cryptography.Native/pal_x509.c index 54f1482e6ec2ef..be20da8a4a4ffe 100644 --- a/src/native/libs/System.Security.Cryptography.Native/pal_x509.c +++ b/src/native/libs/System.Security.Cryptography.Native/pal_x509.c @@ -292,16 +292,6 @@ X509Stack* CryptoNative_X509StoreCtxGetSharedUntrusted(X509_STORE_CTX* ctx) return NULL; } -X509* CryptoNative_X509StoreCtxGetTargetCert(X509_STORE_CTX* ctx) -{ - if (ctx) - { - return X509_STORE_CTX_get0_cert(ctx); - } - - return NULL; -} - int32_t CryptoNative_X509StoreCtxGetError(X509_STORE_CTX* ctx) { return (int32_t)X509_STORE_CTX_get_error(ctx); diff --git a/src/native/libs/System.Security.Cryptography.Native/pal_x509.h b/src/native/libs/System.Security.Cryptography.Native/pal_x509.h index 8b10534d4d043a..6bc2e00b58e45d 100644 --- a/src/native/libs/System.Security.Cryptography.Native/pal_x509.h +++ b/src/native/libs/System.Security.Cryptography.Native/pal_x509.h @@ -265,11 +265,6 @@ Returns the interior pointer to the "untrusted" certificates collection for this */ PALEXPORT X509Stack* CryptoNative_X509StoreCtxGetSharedUntrusted(X509_STORE_CTX* ctx); -/* -Returns the interior pointer to the target certificate for an X509 certificate chain -*/ -PALEXPORT X509* CryptoNative_X509StoreCtxGetTargetCert(X509_STORE_CTX* ctx); - /* Shims the X509_STORE_CTX_get_error method. */ diff --git a/src/native/libs/build-native.sh b/src/native/libs/build-native.sh index 2928934834bd50..d40399da0e12d7 100755 --- a/src/native/libs/build-native.sh +++ b/src/native/libs/build-native.sh @@ -31,8 +31,6 @@ __TargetOS=Linux __BuildType=Debug __CMakeArgs="" __Compiler=clang -__CompilerMajorVersion= -__CompilerMinorVersion= __CrossBuild=0 __PortableBuild=1 __RootBinDir="$__RepoRootDir/artifacts" @@ -53,7 +51,6 @@ if [[ "$__BuildArch" == wasm ]]; then source "$EMSDK_PATH"/emsdk_env.sh export CLR_CC=$(which emcc) - export CLR_CXX=$(which em++) elif [[ "$__TargetOS" == iOS || "$__TargetOS" == iOSSimulator ]]; then # nothing to do here true diff --git a/src/native/libs/configure.cmake b/src/native/libs/configure.cmake index 8eadf95602021f..7b92afa7b0ae27 100644 --- a/src/native/libs/configure.cmake +++ b/src/native/libs/configure.cmake @@ -61,6 +61,9 @@ endif() # which are not distinguished from the test failing. So no error for that one. # For clang-5.0 avoid errors like "unused variable 'err' [-Werror,-Wunused-variable]". set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror -Wno-error=unused-value -Wno-error=unused-variable") +if (CMAKE_C_COMPILER_ID STREQUAL "Clang") + set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wno-error=builtin-requires-header") +endif() # Apple platforms like macOS/iOS allow targeting older operating system versions with a single SDK, # the mere presence of a symbol in the SDK doesn't tell us whether the deployment target really supports it. @@ -675,7 +678,16 @@ check_symbol_exists( time.h HAVE_CLOCK_GETTIME_NSEC_NP) -check_library_exists(pthread pthread_condattr_setclock "" HAVE_PTHREAD_CONDATTR_SETCLOCK) +check_library_exists(pthread pthread_create "" HAVE_LIBPTHREAD) +check_library_exists(c pthread_create "" HAVE_PTHREAD_IN_LIBC) + +if (HAVE_LIBPTHREAD) + set(PTHREAD_LIBRARY pthread) +elseif (HAVE_PTHREAD_IN_LIBC) + set(PTHREAD_LIBRARY c) +endif() + +check_library_exists(${PTHREAD_LIBRARY} pthread_condattr_setclock "" HAVE_PTHREAD_CONDATTR_SETCLOCK) check_symbol_exists( futimes @@ -893,8 +905,8 @@ if(CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS set(HAVE_IOS_NETINET_IP_VAR_H 1) set(HAVE_IOS_NETINET_ICMP_VAR_H 1) set(HAVE_IOS_NETINET_UDP_VAR_H 1) - set(CMAKE_EXTRA_INCLUDE_FILES - sys/types.h + set(CMAKE_EXTRA_INCLUDE_FILES + sys/types.h "${CMAKE_CURRENT_SOURCE_DIR}/System.Native/ios/net/route.h" ) else() diff --git a/src/tasks/installer.tasks/GenerateRunScript.cs b/src/tasks/installer.tasks/GenerateRunScript.cs index a2629768aa2027..142ac7c996fbd6 100644 --- a/src/tasks/installer.tasks/GenerateRunScript.cs +++ b/src/tasks/installer.tasks/GenerateRunScript.cs @@ -11,6 +11,9 @@ namespace Microsoft.DotNet.Build.Tasks { public class GenerateRunScript : Task { + [Required] + public string[] SetCommands { get; set; } + [Required] public string[] RunCommands { get; set; } @@ -60,6 +63,17 @@ private void WriteRunScript(string templateContent, string extension) bool isUnix = extension == ".sh"; string lineFeed = isUnix ? "\n" : "\r\n"; + var setCommandsBuilder = new StringBuilder(); + for (int i = 0; i < SetCommands.Length; i++) + { + setCommandsBuilder.Append(SetCommands[i]); + if (i < SetCommands.Length - 1) + { + setCommandsBuilder.Append(lineFeed); + } + } + templateContent = templateContent.Replace("[[SetCommands]]", setCommandsBuilder.ToString()); + var runCommandsBuilder = new StringBuilder(); for (int i = 0; i < RunCommands.Length; i++) { @@ -71,29 +85,22 @@ private void WriteRunScript(string templateContent, string extension) } templateContent = templateContent.Replace("[[RunCommands]]", runCommandsBuilder.ToString()); + + var setCommandEchoesBuilder = new StringBuilder(); + foreach (string setCommand in SetCommands) + { + setCommandEchoesBuilder.Append($"echo {SanitizeEcho(setCommand,isUnix)}{lineFeed}"); + } + templateContent = templateContent.Replace("[[SetCommandsEcho]]", setCommandEchoesBuilder.ToString()); + var runCommandEchoesBuilder = new StringBuilder(); foreach (string runCommand in RunCommands) { - // Escape backtick and question mark characters to avoid running commands instead of echo'ing them. - string sanitizedRunCommand = runCommand.Replace("`", "\\`") - .Replace("?", "\\") - .Replace("\r","") - .Replace("\n"," ") - .Replace("&", "^&") - .Replace(">", "^>"); - - if (isUnix) - { - // Remove parentheses and quotes from echo command before wrapping it in quotes to avoid errors on Linux. - sanitizedRunCommand = "\"" + sanitizedRunCommand.Replace("\"", "") - .Replace("(", "") - .Replace(")", "") + "\""; - } - - runCommandEchoesBuilder.Append($"echo {sanitizedRunCommand}{lineFeed}"); + runCommandEchoesBuilder.Append($"echo {SanitizeEcho(runCommand,isUnix)}{lineFeed}"); } templateContent = templateContent.Replace("[[RunCommandsEcho]]", runCommandEchoesBuilder.ToString()); + if (isUnix) { // Just in case any Windows EOLs have made it in by here, clean any up. @@ -109,5 +116,26 @@ private void WriteRunScript(string templateContent, string extension) Log.LogMessage($"Wrote {extension} run script to {OutputPath}"); } + + private static string SanitizeEcho(string command, bool isUnix){ + // Escape backtick and question mark characters to avoid running commands instead of echo'ing them. + string sanitizedRunCommand = command.Replace("`", "\\`") + .Replace("?", "\\") + .Replace("$", "") + .Replace("%", "") + .Replace("\r","") + .Replace("\n"," ") + .Replace("&", "^&") + .Replace(">", "^>"); + + if (isUnix) + { + // Remove parentheses and quotes from echo command before wrapping it in quotes to avoid errors on Linux. + sanitizedRunCommand = "\"" + sanitizedRunCommand.Replace("\"", "") + .Replace("(", "") + .Replace(")", "") + "\""; + } + return sanitizedRunCommand; + } } } \ No newline at end of file diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs index aebb02920310af..ec37a933562bd7 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs @@ -147,8 +147,9 @@ protected string RunAndTestWasmApp(BuildArgs buildArgs, string bundleDir = Path.Combine(GetBinDir(baseDir: buildDir, config: buildArgs.Config), "AppBundle"); (string testCommand, string extraXHarnessArgs) = host switch { - RunHost.V8 => ("wasm test", "--js-file=test-main.js --engine=V8 -v trace"), - _ => ("wasm test-browser", $"-v trace -b {host}") + RunHost.V8 => ("wasm test", "--js-file=test-main.js --engine=V8 -v trace"), + RunHost.NodeJS => ("wasm test", "--js-file=test-main.js --engine=NodeJS -v trace"), + _ => ("wasm test-browser", $"-v trace -b {host}") }; string testLogPath = Path.Combine(_logPath, host.ToString()); diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/RunHost.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/RunHost.cs index 0aa1ae14ea8120..137316ebb546c5 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/RunHost.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/RunHost.cs @@ -13,7 +13,8 @@ public enum RunHost Chrome = 2, Safari = 4, Firefox = 8, + NodeJS = 16, - All = V8 | Chrome//| Firefox//Safari + All = V8 | NodeJS | Chrome//| Firefox//Safari } } diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.cmd b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.cmd index 95772327e6a258..b29ec0164d085b 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.cmd +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.cmd @@ -1,15 +1,19 @@ @echo off setlocal enabledelayedexpansion -set EXECUTION_DIR=%~dp0 -set SCENARIO=%3 +:: SetCommands defined in eng\testing\tests.wasm.targets +[[SetCommands]] +[[SetCommandsEcho]] -cd %EXECUTION_DIR% +set EXECUTION_DIR=%~dp0 +if [%3] NEQ [] ( + set SCENARIO=%3 +) if [%HELIX_WORKITEM_UPLOAD_ROOT%] == [] ( - set XHARNESS_OUT=%EXECUTION_DIR%xharness-output + set "XHARNESS_OUT=%EXECUTION_DIR%xharness-output" ) else ( - set XHARNESS_OUT=%HELIX_WORKITEM_UPLOAD_ROOT%\xharness-output + set "XHARNESS_OUT=%HELIX_WORKITEM_UPLOAD_ROOT%\xharness-output" ) if [%XHARNESS_CLI_PATH%] NEQ [] ( @@ -20,16 +24,63 @@ if [%XHARNESS_CLI_PATH%] NEQ [] ( set HARNESS_RUNNER=dotnet.exe xharness ) +if [%XHARNESS_COMMAND%] == [] ( + if /I [%SCENARIO%]==[WasmTestOnBrowser] ( + set XHARNESS_COMMAND=test-browser + ) else ( + set XHARNESS_COMMAND=test + ) +) + +if /I [%XHARNESS_COMMAND%] == [test] ( + if [%JS_ENGINE%] == [] ( + if /I [%SCENARIO%] == [WasmTestOnNodeJs] ( + set "JS_ENGINE=--engine^=NodeJS" + ) else ( + set "JS_ENGINE=--engine^=V8" + ) + ) + + if [%MAIN_JS%] == [] ( + set "MAIN_JS=--js-file^=test-main.js" + ) + + if [%JS_ENGINE_ARGS%] == [] ( + set "JS_ENGINE_ARGS=--engine-arg^=--stack-trace-limit^=1000" + ) +) else ( + if [%BROWSER_PATH%] == [] ( + set "BROWSER_PATH=--browser-path^=%HELIX_CORRELATION_PAYLOAD%\chrome-win\chrome.exe" + ) +) + +if [%XHARNESS_ARGS%] == [] ( + set "XHARNESS_ARGS=%JS_ENGINE% %JS_ENGINE_ARGS% %BROWSER_PATH% %MAIN_JS%" +) + +echo EXECUTION_DIR=%EXECUTION_DIR% +echo SCENARIO=%SCENARIO% +echo XHARNESS_OUT=%XHARNESS_OUT% +echo XHARNESS_CLI_PATH=%XHARNESS_CLI_PATH% +echo HARNESS_RUNNER=%HARNESS_RUNNER% +echo XHARNESS_COMMAND=%XHARNESS_COMMAND% +echo MAIN_JS=%MAIN_JS% +echo JS_ENGINE=%JS_ENGINE% +echo JS_ENGINE_ARGS=%JS_ENGINE_ARGS% +echo XHARNESS_ARGS=%XHARNESS_ARGS% + set TEST_LOG_PATH=%XHARNESS_OUT%\logs :: ========================= BEGIN Test Execution ============================= echo ----- start %DATE% %TIME% =============== To repro directly: ===================================================== echo pushd %EXECUTION_DIR% +:: RunCommands defined in eng\testing\tests.wasm.targets [[RunCommandsEcho]] echo popd echo =========================================================================================================== pushd %EXECUTION_DIR% @echo on +:: RunCommands defined in eng\testing\tests.wasm.targets [[RunCommands]] set EXIT_CODE=%ERRORLEVEL% @echo off diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh index 7965b10230178e..95a4b8200930c6 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash -EXECUTION_DIR=$(dirname $0) +# SetCommands defined in eng\testing\tests.wasm.targets +[[SetCommands]] +[[SetCommandsEcho]] -cd $EXECUTION_DIR +EXECUTION_DIR=$(dirname $0) +if [[ -n "$3" ]]; then + SCENARIO=$3 +fi if [[ -z "$HELIX_WORKITEM_UPLOAD_ROOT" ]]; then XHARNESS_OUT="$EXECUTION_DIR/xharness-output" @@ -18,6 +23,47 @@ else HARNESS_RUNNER="dotnet xharness" fi +if [[ -z "$XHARNESS_COMMAND" ]]; then + if [[ "$SCENARIO" == "WasmTestOnBrowser" || "$SCENARIO" == "wasmtestonbrowser" ]]; then + XHARNESS_COMMAND="test-browser" + else + XHARNESS_COMMAND="test" + fi +fi + +if [[ "$XHARNESS_COMMAND" == "test" ]]; then + if [[ -z "$JS_ENGINE" ]]; then + if [[ "$SCENARIO" == "WasmTestOnNodeJs" || "$SCENARIO" == "wasmtestonnodejs" ]]; then + JS_ENGINE="--engine=NodeJS" + else + JS_ENGINE="--engine=V8" + fi + fi + + if [[ -z "$MAIN_JS" ]]; then + MAIN_JS="--js-file=test-main.js" + fi + + if [[ -z "$JS_ENGINE_ARGS" ]]; then + JS_ENGINE_ARGS="--engine-arg=--stack-trace-limit=1000" + fi +fi + +if [[ -z "$XHARNESS_ARGS" ]]; then + XHARNESS_ARGS="$JS_ENGINE $JS_ENGINE_ARGS $MAIN_JS" +fi + +echo EXECUTION_DIR=$EXECUTION_DIR +echo SCENARIO=$SCENARIO +echo XHARNESS_OUT=$XHARNESS_OUT +echo XHARNESS_CLI_PATH=$XHARNESS_CLI_PATH +echo HARNESS_RUNNER=$HARNESS_RUNNER +echo XHARNESS_COMMAND=$XHARNESS_COMMAND +echo MAIN_JS=$MAIN_JS +echo JS_ENGINE=$JS_ENGINE +echo JS_ENGINE_ARGS=$JS_ENGINE_ARGS +echo XHARNESS_ARGS=$XHARNESS_ARGS + function set_env_vars() { if [ "x$TEST_USING_WORKLOADS" = "xtrue" ]; then @@ -36,10 +82,22 @@ function set_env_vars() export TEST_LOG_PATH=${XHARNESS_OUT}/logs -[[RunCommands]] +pushd $EXECUTION_DIR +# ========================= BEGIN Test Execution ============================= +echo ----- start $(date) =============== To repro directly: ===================================================== +echo pushd $EXECUTION_DIR +# RunCommands defined in eng\testing\tests.wasm.targets +[[RunCommandsEcho]] +echo popd +echo =========================================================================================================== +pushd $EXECUTION_DIR +# RunCommands defined in eng\testing\tests.wasm.targets +[[RunCommands]] _exitCode=$? +popd +echo ----- end $(date) ----- exit code $_exitCode ---------------------------------------------------------- echo "XHarness artifacts: $XHARNESS_OUT" -exit $_exitCode +exit $_exitCode \ No newline at end of file diff --git a/src/tests/Common/CLRTest.CrossGen.targets b/src/tests/Common/CLRTest.CrossGen.targets index 84ec7a004c6f1e..8c4ac4919c7a09 100644 --- a/src/tests/Common/CLRTest.CrossGen.targets +++ b/src/tests/Common/CLRTest.CrossGen.targets @@ -107,13 +107,13 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then cat $__ResponseFile # Suppress some COMPlus variables for the duration of Crossgen2 execution - export -n COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun + export -n COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun COMPlus_TC_OnStackReplacement COMPlus_TC_PartialCompilation echo "Running CrossGen2: $__Command" $__Command __cg2ExitCode=$? - export COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun + export COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun COMPlus_TC_OnStackReplacement COMPlus_TC_PartialCompilation } if [ ! -z ${CompositeBuildMode+x} ]%3B then @@ -245,6 +245,9 @@ if defined RunCrossGen2 ( set "COMPlus_GCStress=" set "COMPlus_HeapVerify=" set "COMPlus_ReadyToRun=" + REM work around problems in 6.0 OSR + set "COMPlus_TC_OnStackReplacement=" + set "COMPlus_TC_PartialCompilation=" echo "!__Command!" call !__Command! diff --git a/src/tests/Common/CLRTest.NativeAot.targets b/src/tests/Common/CLRTest.NativeAot.targets index 4dc19d233c53fd..ca515f126f5280 100644 --- a/src/tests/Common/CLRTest.NativeAot.targets +++ b/src/tests/Common/CLRTest.NativeAot.targets @@ -139,22 +139,26 @@ if defined RunNativeAot ( Outputs="$(OutputPath)\nativebuild.proj" BeforeTargets="Build"> - <_RootEntryAssemblyLine Condition="$(CLRTestFullTrimming) != 'true'"><TrimmerDefaultAction>copyused</TrimmerDefaultAction> + <_RootEntryAssemblyLine Condition="$(CLRTestFullTrimming) == 'true'"><TrimmerDefaultAction>link</TrimmerDefaultAction> <_NativeAotBuildProjectFile> + $(MSBuildProjectName) - .dll + $(TargetFramework) Exe %24(MSBuildProjectDirectory)\ %24(MSBuildProjectDirectory)\ $(TargetArchitecture) $(Optimize) - true - $(NETCoreSdkVersion) + true + true + false + false + false + $(OutputRid) $(_RootEntryAssemblyLine) @@ -169,9 +173,9 @@ if defined RunNativeAot ( - + - + diff --git a/src/tests/JIT/Methodical/Boxing/misc/typedref_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/typedref_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/misc/typedref_d.ilproj rename to src/tests/JIT/Methodical/Boxing/misc/typedref_il_d.ilproj diff --git a/src/tests/JIT/Methodical/Boxing/misc/typedref_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/typedref_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/misc/typedref_r.ilproj rename to src/tests/JIT/Methodical/Boxing/misc/typedref_il_r.ilproj diff --git a/src/tests/JIT/Methodical/Boxing/seh/fault_d.ilproj b/src/tests/JIT/Methodical/Boxing/seh/fault_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/seh/fault_d.ilproj rename to src/tests/JIT/Methodical/Boxing/seh/fault_il_d.ilproj diff --git a/src/tests/JIT/Methodical/Boxing/seh/fault_r.ilproj b/src/tests/JIT/Methodical/Boxing/seh/fault_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/seh/fault_r.ilproj rename to src/tests/JIT/Methodical/Boxing/seh/fault_il_r.ilproj diff --git a/src/tests/JIT/Methodical/Boxing/seh/filter_d.ilproj b/src/tests/JIT/Methodical/Boxing/seh/filter_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/seh/filter_d.ilproj rename to src/tests/JIT/Methodical/Boxing/seh/filter_il_d.ilproj diff --git a/src/tests/JIT/Methodical/Boxing/seh/filter_r.ilproj b/src/tests/JIT/Methodical/Boxing/seh/filter_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/seh/filter_r.ilproj rename to src/tests/JIT/Methodical/Boxing/seh/filter_il_r.ilproj diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_d.ilproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_d.ilproj rename to src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_d.ilproj diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_r.ilproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_r.ilproj rename to src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_r.ilproj diff --git a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_d.ilproj b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/Invoke/thiscall/thisnull_d.ilproj rename to src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_d.ilproj diff --git a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_r.ilproj b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/Invoke/thiscall/thisnull_r.ilproj rename to src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally_d.ilproj b/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/emptyfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/emptyfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally_r.ilproj b/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/emptyfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/emptyfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwinexcept_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwinexcept_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwinexcept_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwinexcept_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwinexcept_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwinexcept_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfault_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfault_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwinfault_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwinfault_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfault_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfault_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwinfault_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwinfault_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfilter_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwinfilter_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwinfilter_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfilter_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwinfilter_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwinfilter_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/tryexcept_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryexcept_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/tryexcept_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/tryexcept_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/tryexcept_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryexcept_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/tryexcept_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/tryexcept_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/tryfault_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfault_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/tryfault_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/tryfault_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/tryfault_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfault_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/tryfault_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/tryfault_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_d.ilproj b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/trythrowexcept_d.ilproj rename to src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_r.ilproj b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/basics/trythrowexcept_r.ilproj rename to src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadoponerror_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadoponerror_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_d.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_r.ilproj rename to src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/backwardleave_d.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/backwardleave_r.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_d.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_r.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_d.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_r.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/testeit_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/testeit_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/testeit_d.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/testeit_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/testeit_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/testeit_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/testeit_r.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/testeit_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.ilproj rename to src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj rename to src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj rename to src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.ilproj rename to src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.ilproj rename to src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.ilproj rename to src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.ilproj rename to src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_d.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/interactions/throw1dimarray_d.ilproj rename to src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_r.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/interactions/throw1dimarray_r.ilproj rename to src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_d.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/interactions/throw2dimarray_d.ilproj rename to src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_r.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/interactions/throw2dimarray_r.ilproj rename to src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_d.ilproj rename to src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_r.ilproj rename to src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_d.ilproj rename to src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_r.ilproj rename to src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.ilproj rename to src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.ilproj rename to src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_d.ilproj rename to src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_r.ilproj rename to src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_d.ilproj rename to src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_r.ilproj rename to src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_d.ilproj rename to src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_r.ilproj rename to src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_d.ilproj rename to src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_r.ilproj rename to src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.ilproj rename to src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.ilproj rename to src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.ilproj rename to src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.ilproj rename to src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.ilproj rename to src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.ilproj rename to src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_d.ilproj b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/general/localvarincatch_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_r.ilproj b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/general/localvarincatch_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.ilproj b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.ilproj b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.ilproj rename to src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_r.ilproj diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.ilproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.ilproj rename to src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_d.ilproj diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.ilproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.ilproj rename to src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_r.ilproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_c.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_c_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_c.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_c_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_c.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_c_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_c.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_c_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f4.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f4.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_f4_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_f4.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_f4.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_f4_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f8.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f8.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_f8_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_f8.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_f8.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_f8_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i1.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i1.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_i1_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_i1.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_i1.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_i1_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i2.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i2.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_i2_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_i2.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_i2.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_i2_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i4.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i4.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_i4_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_i4.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_i4.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_i4_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_o.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_o_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_o.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_o_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_o.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_o_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_o.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_o_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_s.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_s_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_dbgrefarg_s.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_s_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_s.csproj b/src/tests/JIT/Methodical/explicit/basic/refarg_s_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/basic/_opt_relrefarg_s.csproj rename to src/tests/JIT/Methodical/explicit/basic/refarg_s_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.ilproj rename to src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_d.ilproj diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.ilproj rename to src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_r.ilproj diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.ilproj rename to src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_d.ilproj diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.ilproj rename to src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_r.ilproj diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.ilproj rename to src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_d.ilproj diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.ilproj rename to src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_r.ilproj diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.ilproj rename to src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_d.ilproj diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.ilproj rename to src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_r.ilproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit1_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit1_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit1_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit1_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit2_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit2_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit2_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit2_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit3_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit3_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit3_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit3_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit4_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit4_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit4_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit4_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit5_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit5_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit5_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit5_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit6_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit6_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit6_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit6_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit7_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit7_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit7_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit7_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit8_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit8_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj b/src/tests/JIT/Methodical/explicit/misc/explicit8_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj rename to src/tests/JIT/Methodical/explicit/misc/explicit8_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_double.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_double.csproj rename to src/tests/JIT/Methodical/explicit/rotate/rotarg_double_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/rotate/_opt_relrotarg_double.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/rotate/_opt_relrotarg_double.csproj rename to src/tests/JIT/Methodical/explicit/rotate/rotarg_double_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_float.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_float.csproj rename to src/tests/JIT/Methodical/explicit/rotate/rotarg_float_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/rotate/_opt_relrotarg_float.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/rotate/_opt_relrotarg_float.csproj rename to src/tests/JIT/Methodical/explicit/rotate/rotarg_float_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_objref.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_objref.csproj rename to src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/rotate/_opt_relrotarg_objref.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/rotate/_opt_relrotarg_objref.csproj rename to src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_ro.csproj diff --git a/src/tests/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_valref.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_do.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_valref.csproj rename to src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_do.csproj diff --git a/src/tests/JIT/Methodical/explicit/rotate/_opt_relrotarg_valref.csproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_ro.csproj similarity index 100% rename from src/tests/JIT/Methodical/explicit/rotate/_opt_relrotarg_valref.csproj rename to src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_ro.csproj diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/classic_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/nonvirtualcall/classic_d.ilproj rename to src/tests/JIT/Methodical/nonvirtualcall/classic_il_d.ilproj diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/classic_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/nonvirtualcall/classic_r.ilproj rename to src/tests/JIT/Methodical/nonvirtualcall/classic_il_r.ilproj diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/nonvirtualcall/delegate_d.ilproj rename to src/tests/JIT/Methodical/nonvirtualcall/delegate_il_d.ilproj diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/nonvirtualcall/delegate_r.ilproj rename to src/tests/JIT/Methodical/nonvirtualcall/delegate_il_r.ilproj diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/nonvirtualcall/generics2_d.ilproj rename to src/tests/JIT/Methodical/nonvirtualcall/generics2_il_d.ilproj diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/nonvirtualcall/generics2_r.ilproj rename to src/tests/JIT/Methodical/nonvirtualcall/generics2_il_r.ilproj diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/nonvirtualcall/generics_d.ilproj rename to src/tests/JIT/Methodical/nonvirtualcall/generics_il_d.ilproj diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/nonvirtualcall/generics_r.ilproj rename to src/tests/JIT/Methodical/nonvirtualcall/generics_il_r.ilproj diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/nonvirtualcall/tailcall_d.ilproj rename to src/tests/JIT/Methodical/nonvirtualcall/tailcall_il_d.ilproj diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/nonvirtualcall/tailcall_r.ilproj rename to src/tests/JIT/Methodical/nonvirtualcall/tailcall_il_r.ilproj diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_d.ilproj similarity index 100% rename from src/tests/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj rename to src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_d.ilproj diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_r.ilproj similarity index 100% rename from src/tests/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj rename to src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_r.ilproj diff --git a/src/tests/JIT/Methodical/tailcall/Desktop/thread-race.cs b/src/tests/JIT/Methodical/tailcall/Desktop/thread-race.cs index f9d613ab12d143..a8a728653d7946 100644 --- a/src/tests/JIT/Methodical/tailcall/Desktop/thread-race.cs +++ b/src/tests/JIT/Methodical/tailcall/Desktop/thread-race.cs @@ -3,8 +3,9 @@ using System; using System.Threading; +using Xunit; -internal class Repro +public class Repro { private static volatile bool s_threadsCompleted; private static volatile Mutex s_myMutex; @@ -12,7 +13,8 @@ internal class Repro private const int FibSeriesMax = 35; private const int FibSeriesMin = 20; - public static int Main() + [Fact] + public static int TestEntrypoint() { // Compute the expected value for a single thread int expectedSingle = 0; diff --git a/src/tests/JIT/Methodical/tailcall/Desktop/thread-race_il_r.csproj b/src/tests/JIT/Methodical/tailcall/Desktop/thread-race_r.csproj similarity index 94% rename from src/tests/JIT/Methodical/tailcall/Desktop/thread-race_il_r.csproj rename to src/tests/JIT/Methodical/tailcall/Desktop/thread-race_r.csproj index 553ea3c52b652e..0034e4ae22cde3 100644 --- a/src/tests/JIT/Methodical/tailcall/Desktop/thread-race_il_r.csproj +++ b/src/tests/JIT/Methodical/tailcall/Desktop/thread-race_r.csproj @@ -1,6 +1,5 @@ - Exe true true diff --git a/src/tests/JIT/Methodical/tailcall/compat_enum.il b/src/tests/JIT/Methodical/tailcall/compat_enum.il index 9b5b7765e1cb41..83ddafe1bb24b3 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_enum.il +++ b/src/tests/JIT/Methodical/tailcall/compat_enum.il @@ -9,20 +9,20 @@ } .assembly compat_enum { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_enum { .class private auto ansi serializable sealed TestEnum extends [mscorlib]System.Enum { .field public specialname rtspecialname int32 value__ - .field public static literal value class JitTest.TestEnum v = int32(0x00000000) - .field public static literal value class JitTest.TestEnum w = int32(0x00000001) + .field public static literal value class JitTest_compat_enum.TestEnum v = int32(0x00000000) + .field public static literal value class JitTest_compat_enum.TestEnum w = int32(0x00000001) } - .class private auto ansi beforefieldinit TestClass extends [mscorlib]System.Object + .class public auto ansi beforefieldinit TestClass extends [mscorlib]System.Object { - .method private hidebysig static value class JitTest.TestEnum callee() il managed + .method private hidebysig static value class JitTest_compat_enum.TestEnum callee() il managed { .maxstack 8 - .locals (value class JitTest.TestEnum V_0) + .locals (value class JitTest_compat_enum.TestEnum V_0) ldc.i4.1 stloc.0 ldloc.0 @@ -32,11 +32,11 @@ { // Code size 10 (0xa) .maxstack 8 - tail. call value class JitTest.TestEnum JitTest.TestClass::callee() + tail. call value class JitTest_compat_enum.TestEnum JitTest_compat_enum.TestClass::callee() ret } // end of method TestClass::caller - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -46,7 +46,7 @@ // Code size 40 (0x28) .maxstack 2 .locals (int32 V_0) - IL_0000: call int32 JitTest.TestClass::caller() + IL_0000: call int32 JitTest_compat_enum.TestClass::caller() IL_0005: ldc.i4.1 IL_0006: bne.un.s IL_0017 @@ -78,6 +78,6 @@ } // end of class TestClass -} // end of namespace JitTest +} // end of namespace JitTest_compat_enum //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/compat_enum_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_enum_il_d.ilproj index 77abecbf2f3ea4..fbeb666f8d6e93 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_enum_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_enum_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/compat_enum_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_enum_il_r.ilproj index 93848d1e0702cd..11d62074ebd1e3 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_enum_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_enum_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/compat_i2_bool.il b/src/tests/JIT/Methodical/tailcall/compat_i2_bool.il index a676a17a8a5fee..0a16393dc36e2c 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_i2_bool.il +++ b/src/tests/JIT/Methodical/tailcall/compat_i2_bool.il @@ -9,9 +9,9 @@ } .assembly compat_i2_bool { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_i2_bool { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .method private hidebysig static @@ -65,11 +65,11 @@ IL_0050: call void [mscorlib]System.GC::Collect() IL_0055: call void [mscorlib]System.GC::Collect() IL_005a: tail. - IL_005c: call int16 JitTest.Test::Method1() + IL_005c: call int16 JitTest_compat_i2_bool.Test::Method1() IL_0061: ret } // end of method Test::Method2 - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -79,7 +79,7 @@ // Code size 40 (0x28) .maxstack 2 .locals (int32 V_0) - IL_0000: call bool JitTest.Test::Method2() + IL_0000: call bool JitTest_compat_i2_bool.Test::Method2() IL_0005: ldc.i4.s 10 IL_0007: beq.s IL_0017 @@ -111,6 +111,6 @@ } // end of class Test -} // end of namespace JitTest +} // end of namespace JitTest_compat_i2_bool //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_d.ilproj index 4f39408d409b57..2c2e44aecf94fa 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_r.ilproj index e85abdfc42b9ca..080985186a585f 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_i1.il b/src/tests/JIT/Methodical/tailcall/compat_i4_i1.il index ebff8f0dd5d299..939b926e54e963 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_i4_i1.il +++ b/src/tests/JIT/Methodical/tailcall/compat_i4_i1.il @@ -9,9 +9,9 @@ } .assembly compat_i4_i1 { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_i4_i1 { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .method private hidebysig static @@ -65,11 +65,11 @@ IL_0050: call void [mscorlib]System.GC::Collect() IL_0055: call void [mscorlib]System.GC::Collect() IL_005a: tail. - IL_005c: call int32 JitTest.Test::Method1() + IL_005c: call int32 JitTest_compat_i4_i1.Test::Method1() IL_0061: ret } // end of method Test::Method2 - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -79,7 +79,7 @@ // Code size 40 (0x28) .maxstack 2 .locals (int32 V_0) - IL_0000: call int8 JitTest.Test::Method2() + IL_0000: call int8 JitTest_compat_i4_i1.Test::Method2() IL_0005: ldc.i4.s 10 IL_0007: beq.s IL_0017 @@ -111,6 +111,6 @@ } // end of class Test -} // end of namespace JitTest +} // end of namespace JitTest_compat_i4_i1 //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_d.ilproj index d4a15f82bb8505..600891f7996e97 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_r.ilproj index 8cc78a922b9ca3..c20bc759e0945b 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_u.il b/src/tests/JIT/Methodical/tailcall/compat_i4_u.il index 44ae12d0004b58..65323764e5cca1 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_i4_u.il +++ b/src/tests/JIT/Methodical/tailcall/compat_i4_u.il @@ -9,9 +9,9 @@ } .assembly compat_i4_u { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_i4_u { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .method private hidebysig static @@ -65,11 +65,11 @@ IL_0050: call void [mscorlib]System.GC::Collect() IL_0055: call void [mscorlib]System.GC::Collect() IL_005a: tail. - IL_005c: call int32 JitTest.Test::Method1() + IL_005c: call int32 JitTest_compat_i4_u.Test::Method1() IL_0061: ret } // end of method Test::Method2 - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -79,7 +79,7 @@ // Code size 40 (0x28) .maxstack 2 .locals (int32 V_0) - IL_0000: call native unsigned int JitTest.Test::Method2() + IL_0000: call native unsigned int JitTest_compat_i4_u.Test::Method2() IL_0005: ldc.i4.s 10 IL_0007: beq.s IL_0017 @@ -111,6 +111,6 @@ } // end of class Test -} // end of namespace JitTest +} // end of namespace JitTest_compat_i4_u //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_d.ilproj index 9270da2ebaad82..70f05a464216ba 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_r.ilproj index d9bc2711705f4c..111365cca0fc13 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/compat_i_u2.il b/src/tests/JIT/Methodical/tailcall/compat_i_u2.il index afbd9218d3ad18..f51dc3b45fc3d2 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_i_u2.il +++ b/src/tests/JIT/Methodical/tailcall/compat_i_u2.il @@ -9,9 +9,9 @@ } .assembly compat_i_u2 { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_i_u2 { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .method private hidebysig static @@ -65,11 +65,11 @@ IL_0050: call void [mscorlib]System.GC::Collect() IL_0055: call void [mscorlib]System.GC::Collect() IL_005a: tail. - IL_005c: call native int JitTest.Test::Method1() + IL_005c: call native int JitTest_compat_i_u2.Test::Method1() IL_0061: ret } // end of method Test::Method2 - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -79,7 +79,7 @@ // Code size 40 (0x28) .maxstack 2 .locals (int32 V_0) - IL_0000: call unsigned int16 JitTest.Test::Method2() + IL_0000: call unsigned int16 JitTest_compat_i_u2.Test::Method2() IL_0005: ldc.i4.s 10 IL_0007: beq.s IL_0017 @@ -111,6 +111,6 @@ } // end of class Test -} // end of namespace JitTest +} // end of namespace JitTest_compat_i_u2 //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_d.ilproj index 17f94f45b8b5d1..16b7095cc81592 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_r.ilproj index e64138f2aef447..70012ab43b9c42 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_obj.il b/src/tests/JIT/Methodical/tailcall/compat_obj.il index e9ecbc9ab720b7..b480b6c04abdf8 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_obj.il +++ b/src/tests/JIT/Methodical/tailcall/compat_obj.il @@ -9,24 +9,24 @@ } .assembly compat_obj { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_obj { .class public auto ansi beforefieldinit BaseClass extends [mscorlib]System.Object { .method public hidebysig static - class JitTest.BaseClass caller(bool which) il managed + class JitTest_compat_obj.BaseClass caller(bool which) il managed { // Code size 18 (0x12) .maxstack 8 IL_0000: ldarg.0 IL_0001: brfalse.s IL_000a - IL_0003: newobj instance void JitTest.BaseClass::.ctor() + IL_0003: newobj instance void JitTest_compat_obj.BaseClass::.ctor() IL_0008: br.s IL_0011 IL_000a: tail. - IL_000c: call class JitTest.DerivedClass JitTest.DerivedClass::callee() + IL_000c: call class JitTest_compat_obj.DerivedClass JitTest_compat_obj.DerivedClass::callee() IL_0011: ret } // end of method BaseClass::caller @@ -43,14 +43,14 @@ } // end of class BaseClass .class public auto ansi beforefieldinit DerivedClass - extends JitTest.BaseClass + extends JitTest_compat_obj.BaseClass { .method public hidebysig static - class JitTest.DerivedClass callee() il managed + class JitTest_compat_obj.DerivedClass callee() il managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: newobj instance void JitTest.DerivedClass::.ctor() + IL_0000: newobj instance void JitTest_compat_obj.DerivedClass::.ctor() IL_0005: ret } // end of method DerivedClass::callee @@ -65,10 +65,10 @@ .maxstack 1 .locals (int32 V_0) IL_0000: ldc.i4.0 - IL_0001: call class JitTest.BaseClass JitTest.BaseClass::caller(bool) + IL_0001: call class JitTest_compat_obj.BaseClass JitTest_compat_obj.BaseClass::caller(bool) IL_0006: call void [System.Console]System.Console::WriteLine(class System.Object) IL_000b: ldc.i4.1 - IL_000c: call class JitTest.BaseClass JitTest.BaseClass::caller(bool) + IL_000c: call class JitTest_compat_obj.BaseClass JitTest_compat_obj.BaseClass::caller(bool) IL_0011: call void [System.Console]System.Console::WriteLine(class System.Object) IL_0016: ldstr "passed" IL_001b: call void [System.Console]System.Console::WriteLine(class System.String) @@ -86,12 +86,12 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: call instance void JitTest.BaseClass::.ctor() + IL_0001: call instance void JitTest_compat_obj.BaseClass::.ctor() IL_0006: ret } // end of method DerivedClass::.ctor } // end of class DerivedClass -} // end of namespace JitTest +} // end of namespace JitTest_compat_obj //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/compat_obj_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_obj_il_d.ilproj index 3dcd736d85b5b9..de50541bbbd544 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_obj_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_obj_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/compat_obj_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_obj_il_r.ilproj index d5b14f18d1ae3a..5b7c737ae311f1 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_obj_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_obj_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8.il b/src/tests/JIT/Methodical/tailcall/compat_r4_r8.il index 113da60a5228be..4e0e4e90ef6aea 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_r4_r8.il +++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8.il @@ -9,9 +9,9 @@ .assembly extern mscorlib { } .assembly compat_r4_r8 { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_r4_r8 { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .method private hidebysig static @@ -63,11 +63,11 @@ IL_0050: call void [mscorlib]System.GC::Collect() IL_0055: call void [mscorlib]System.GC::Collect() IL_005a: tail. - IL_005c: call float32 JitTest.Test::Method1() + IL_005c: call float32 JitTest_compat_r4_r8.Test::Method1() IL_0061: ret } - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -76,7 +76,7 @@ .entrypoint .maxstack 8 .locals (int32 V_0) - IL_0000: call float64 JitTest.Test::Method2() + IL_0000: call float64 JitTest_compat_r4_r8.Test::Method2() IL_0005: dup IL_0006: ldc.r8 10. IL_000f: beq.s IL_001a diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_d.ilproj index b2bdb286aaf66c..33fb14329ec39d 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_r.ilproj index 2541555f431794..327debd747d169 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl.il b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl.il index 0d36ae9a6500a0..61641f9bc576c3 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl.il +++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl.il @@ -9,9 +9,9 @@ .assembly extern mscorlib { } .assembly compat_r4_r8_inl { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_r4_r8_inl { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .method private hidebysig static @@ -27,11 +27,11 @@ { .maxstack 8 IL_0000: tail. - IL_0002: call float32 JitTest.Test::Method1() + IL_0002: call float32 JitTest_compat_r4_r8_inl.Test::Method1() IL_0007: ret } - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -40,7 +40,7 @@ .entrypoint .maxstack 8 .locals (int32 V_0) - IL_0000: call float64 JitTest.Test::Method2() + IL_0000: call float64 JitTest_compat_r4_r8_inl.Test::Method2() IL_0005: dup IL_0006: ldc.r8 10. IL_000f: beq.s IL_001a diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_d.ilproj index efb27a6cfc3e90..107544d037e966 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_r.ilproj index ec86ba23c2ad94..bd43a331fc00f5 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4.il b/src/tests/JIT/Methodical/tailcall/compat_r8_r4.il index 46ae0478b84be1..ed1f430659305b 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_r8_r4.il +++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4.il @@ -9,9 +9,9 @@ .assembly extern mscorlib { } .assembly compat_r8_r4 { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_r8_r4 { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .method private hidebysig static @@ -63,11 +63,11 @@ IL_0050: call void [mscorlib]System.GC::Collect() IL_0055: call void [mscorlib]System.GC::Collect() IL_005a: tail. - IL_005c: call float64 JitTest.Test::Method1() + IL_005c: call float64 JitTest_compat_r8_r4.Test::Method1() IL_0061: ret } - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -76,7 +76,7 @@ .entrypoint .maxstack 8 .locals (int32 V_0) - IL_0000: call float32 JitTest.Test::Method2() + IL_0000: call float32 JitTest_compat_r8_r4.Test::Method2() IL_0005: dup IL_0006: ldc.r4 10. IL_000b: beq.s IL_0016 diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_d.ilproj index 81f26de3bca35d..b46efc54b32541 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_r.ilproj index 33dd6566688e28..2893df0c838f37 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl.il b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl.il index 6c4a9c8975c458..736308b10cbf54 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl.il +++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl.il @@ -9,9 +9,9 @@ .assembly extern mscorlib { } .assembly compat_r8_r4_inl { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_r8_r4_inl { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .method private hidebysig static @@ -27,11 +27,11 @@ { .maxstack 8 IL_0000: tail. - IL_0002: call float64 JitTest.Test::Method1() + IL_0002: call float64 JitTest_compat_r8_r4_inl.Test::Method1() IL_0007: ret } - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -40,7 +40,7 @@ .entrypoint .maxstack 8 .locals (int32 V_0) - IL_0000: call float32 JitTest.Test::Method2() + IL_0000: call float32 JitTest_compat_r8_r4_inl.Test::Method2() IL_0005: dup IL_0006: ldc.r4 10. IL_000b: beq.s IL_0016 diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_d.ilproj index 0e28cc1feeabc3..80896998a38353 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_r.ilproj index eaf08cfe97b11a..5061a252343796 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/compat_v.il b/src/tests/JIT/Methodical/tailcall/compat_v.il index 4fe9553bd2393f..ec8198a4e2fd8c 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_v.il +++ b/src/tests/JIT/Methodical/tailcall/compat_v.il @@ -9,7 +9,7 @@ } .assembly compat_v { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_v { .class public sequential ansi sealed beforefieldinit BaseStruct extends [mscorlib]System.ValueType @@ -17,36 +17,36 @@ .pack 1 .size 1024 .method public hidebysig static - value class JitTest.BaseStruct + value class JitTest_compat_v.BaseStruct caller(bool which) il managed { // Code size 22 (0x16) .maxstack 1 - .locals (value class JitTest.BaseStruct V_0, - value class JitTest.BaseStruct V_1) + .locals (value class JitTest_compat_v.BaseStruct V_0, + value class JitTest_compat_v.BaseStruct V_1) IL_0000: ldarg.0 IL_0001: brfalse.s IL_000e IL_0003: ldloca.s V_1 - IL_0005: initobj JitTest.BaseStruct + IL_0005: initobj JitTest_compat_v.BaseStruct IL_000b: ldloc.1 IL_000c: br.s IL_0015 IL_000e: tail. - IL_0010: call value class JitTest.BaseStruct JitTest.BaseStruct::callee() + IL_0010: call value class JitTest_compat_v.BaseStruct JitTest_compat_v.BaseStruct::callee() IL_0015: ret } // end of method BaseStruct::caller .method public hidebysig static - value class JitTest.BaseStruct + value class JitTest_compat_v.BaseStruct callee() il managed { // Code size 14 (0xe) .maxstack 1 - .locals (value class JitTest.BaseStruct V_0, - value class JitTest.BaseStruct V_1) + .locals (value class JitTest_compat_v.BaseStruct V_0, + value class JitTest_compat_v.BaseStruct V_1) IL_0000: ldloca.s V_1 - IL_0002: initobj JitTest.BaseStruct + IL_0002: initobj JitTest_compat_v.BaseStruct IL_0008: ldloc.1 IL_0009: stloc.0 IL_000a: br.s IL_000c @@ -66,16 +66,16 @@ .maxstack 1 .locals (int32 V_0) IL_0000: ldc.i4.0 - IL_0001: call value class JitTest.BaseStruct JitTest.BaseStruct::caller(bool) + IL_0001: call value class JitTest_compat_v.BaseStruct JitTest_compat_v.BaseStruct::caller(bool) //IL_0006: stloc.1 //IL_0007: ldloc.s V_1 - IL_0009: box JitTest.BaseStruct + IL_0009: box JitTest_compat_v.BaseStruct IL_000e: call void [System.Console]System.Console::WriteLine(class System.Object) IL_0013: ldc.i4.1 - IL_0014: call value class JitTest.BaseStruct JitTest.BaseStruct::caller(bool) + IL_0014: call value class JitTest_compat_v.BaseStruct JitTest_compat_v.BaseStruct::caller(bool) //IL_0019: stloc.1 //IL_001a: ldloc.s V_1 - IL_001c: box JitTest.BaseStruct + IL_001c: box JitTest_compat_v.BaseStruct IL_0021: call void [System.Console]System.Console::WriteLine(class System.Object) IL_0026: ldstr "passed" IL_002b: call void [System.Console]System.Console::WriteLine(class System.String) @@ -85,6 +85,6 @@ } // end of class BaseStruct -} // end of namespace JitTest +} // end of namespace JitTest_compat_v //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/compat_v_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_v_il_d.ilproj index b60e43785cfd83..ec934c5634553e 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_v_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_v_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/compat_v_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_v_il_r.ilproj index 6f142d81dbdd32..7b5aacb99aae28 100644 --- a/src/tests/JIT/Methodical/tailcall/compat_v_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/compat_v_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/deep_array.il b/src/tests/JIT/Methodical/tailcall/deep_array.il index f239ac926c6f07..22648b7ec4df87 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_array.il +++ b/src/tests/JIT/Methodical/tailcall/deep_array.il @@ -9,7 +9,7 @@ } .assembly deep_array { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_deep_array { .class public auto ansi beforefieldinit TestClass extends [mscorlib]System.Object { @@ -23,12 +23,12 @@ ldc.i4 2 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method1(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method1(int32[]) ldstr " 2" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method1(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method1(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method1(int32[]) il managed { @@ -40,13 +40,13 @@ REM: ldc.i4 3 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method2(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method2(int32[]) ldstr " 3" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method2(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method2(int32[]) } .method private hidebysig static class [mscorlib]System.String Method2(int32[]) il managed { .maxstack 8 @@ -57,12 +57,12 @@ REM: ldc.i4 4 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method3(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method3(int32[]) ldstr " 4" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method3(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method3(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method3(int32[]) il managed { @@ -74,13 +74,13 @@ REM: ldc.i4 5 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method4(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method4(int32[]) ldstr " 5" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method4(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method4(int32[]) } .method private hidebysig static class [mscorlib]System.String Method4(int32[]) il managed { .maxstack 8 @@ -91,12 +91,12 @@ REM: ldc.i4 6 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method5(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method5(int32[]) ldstr " 6" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method5(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method5(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method5(int32[]) il managed { @@ -108,13 +108,13 @@ REM: ldc.i4 7 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method6(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method6(int32[]) ldstr " 7" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method6(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method6(int32[]) } .method private hidebysig static class [mscorlib]System.String Method6(int32[]) il managed { .maxstack 8 @@ -125,12 +125,12 @@ REM: ldc.i4 8 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method7(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method7(int32[]) ldstr " 8" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method7(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method7(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method7(int32[]) il managed { @@ -142,13 +142,13 @@ REM: ldc.i4 9 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method8(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method8(int32[]) ldstr " 9" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method8(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method8(int32[]) } .method private hidebysig static class [mscorlib]System.String Method8(int32[]) il managed { .maxstack 8 @@ -159,12 +159,12 @@ REM: ldc.i4 10 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method9(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method9(int32[]) ldstr " 10" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method9(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method9(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method9(int32[]) il managed { @@ -176,13 +176,13 @@ REM: ldc.i4 11 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method10(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method10(int32[]) ldstr " 11" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method10(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method10(int32[]) } .method private hidebysig static class [mscorlib]System.String Method10(int32[]) il managed { .maxstack 8 @@ -193,12 +193,12 @@ REM: ldc.i4 12 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method11(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method11(int32[]) ldstr " 12" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method11(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method11(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method11(int32[]) il managed { @@ -210,13 +210,13 @@ REM: ldc.i4 13 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method12(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method12(int32[]) ldstr " 13" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method12(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method12(int32[]) } .method private hidebysig static class [mscorlib]System.String Method12(int32[]) il managed { .maxstack 8 @@ -227,12 +227,12 @@ REM: ldc.i4 14 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method13(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method13(int32[]) ldstr " 14" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method13(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method13(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method13(int32[]) il managed { @@ -244,13 +244,13 @@ REM: ldc.i4 15 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method14(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method14(int32[]) ldstr " 15" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method14(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method14(int32[]) } .method private hidebysig static class [mscorlib]System.String Method14(int32[]) il managed { .maxstack 8 @@ -261,12 +261,12 @@ REM: ldc.i4 16 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method15(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method15(int32[]) ldstr " 16" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method15(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method15(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method15(int32[]) il managed { @@ -278,13 +278,13 @@ REM: ldc.i4 17 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method16(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method16(int32[]) ldstr " 17" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method16(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method16(int32[]) } .method private hidebysig static class [mscorlib]System.String Method16(int32[]) il managed { .maxstack 8 @@ -295,12 +295,12 @@ REM: ldc.i4 18 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method17(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method17(int32[]) ldstr " 18" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method17(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method17(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method17(int32[]) il managed { @@ -312,13 +312,13 @@ REM: ldc.i4 19 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method18(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method18(int32[]) ldstr " 19" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method18(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method18(int32[]) } .method private hidebysig static class [mscorlib]System.String Method18(int32[]) il managed { .maxstack 8 @@ -329,12 +329,12 @@ REM: ldc.i4 20 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method19(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method19(int32[]) ldstr " 20" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method19(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method19(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method19(int32[]) il managed { @@ -346,13 +346,13 @@ REM: ldc.i4 21 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method20(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method20(int32[]) ldstr " 21" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method20(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method20(int32[]) } .method private hidebysig static class [mscorlib]System.String Method20(int32[]) il managed { .maxstack 8 @@ -363,12 +363,12 @@ REM: ldc.i4 22 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method21(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method21(int32[]) ldstr " 22" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method21(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method21(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method21(int32[]) il managed { @@ -380,13 +380,13 @@ REM: ldc.i4 23 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method22(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method22(int32[]) ldstr " 23" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method22(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method22(int32[]) } .method private hidebysig static class [mscorlib]System.String Method22(int32[]) il managed { .maxstack 8 @@ -397,12 +397,12 @@ REM: ldc.i4 24 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method23(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method23(int32[]) ldstr " 24" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method23(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method23(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method23(int32[]) il managed { @@ -414,13 +414,13 @@ REM: ldc.i4 25 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method24(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method24(int32[]) ldstr " 25" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method24(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method24(int32[]) } .method private hidebysig static class [mscorlib]System.String Method24(int32[]) il managed { .maxstack 8 @@ -431,12 +431,12 @@ REM: ldc.i4 26 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method25(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method25(int32[]) ldstr " 26" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method25(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method25(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method25(int32[]) il managed { @@ -448,13 +448,13 @@ REM: ldc.i4 27 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method26(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method26(int32[]) ldstr " 27" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method26(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method26(int32[]) } .method private hidebysig static class [mscorlib]System.String Method26(int32[]) il managed { .maxstack 8 @@ -465,12 +465,12 @@ REM: ldc.i4 28 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method27(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method27(int32[]) ldstr " 28" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method27(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method27(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method27(int32[]) il managed { @@ -482,13 +482,13 @@ REM: ldc.i4 29 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method28(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method28(int32[]) ldstr " 29" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method28(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method28(int32[]) } .method private hidebysig static class [mscorlib]System.String Method28(int32[]) il managed { .maxstack 8 @@ -499,12 +499,12 @@ REM: ldc.i4 30 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method29(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method29(int32[]) ldstr " 30" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method29(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method29(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method29(int32[]) il managed { @@ -516,13 +516,13 @@ REM: ldc.i4 31 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method30(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method30(int32[]) ldstr " 31" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method30(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method30(int32[]) } .method private hidebysig static class [mscorlib]System.String Method30(int32[]) il managed { .maxstack 8 @@ -533,12 +533,12 @@ REM: ldc.i4 32 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method31(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method31(int32[]) ldstr " 32" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method31(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method31(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method31(int32[]) il managed { @@ -550,13 +550,13 @@ REM: ldc.i4 33 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method32(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method32(int32[]) ldstr " 33" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method32(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method32(int32[]) } .method private hidebysig static class [mscorlib]System.String Method32(int32[]) il managed { .maxstack 8 @@ -567,12 +567,12 @@ REM: ldc.i4 34 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method33(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method33(int32[]) ldstr " 34" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method33(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method33(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method33(int32[]) il managed { @@ -584,13 +584,13 @@ REM: ldc.i4 35 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method34(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method34(int32[]) ldstr " 35" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method34(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method34(int32[]) } .method private hidebysig static class [mscorlib]System.String Method34(int32[]) il managed { .maxstack 8 @@ -601,12 +601,12 @@ REM: ldc.i4 36 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method35(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method35(int32[]) ldstr " 36" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method35(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method35(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method35(int32[]) il managed { @@ -618,13 +618,13 @@ REM: ldc.i4 37 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method36(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method36(int32[]) ldstr " 37" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method36(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method36(int32[]) } .method private hidebysig static class [mscorlib]System.String Method36(int32[]) il managed { .maxstack 8 @@ -635,12 +635,12 @@ REM: ldc.i4 38 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method37(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method37(int32[]) ldstr " 38" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method37(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method37(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method37(int32[]) il managed { @@ -652,13 +652,13 @@ REM: ldc.i4 39 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method38(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method38(int32[]) ldstr " 39" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method38(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method38(int32[]) } .method private hidebysig static class [mscorlib]System.String Method38(int32[]) il managed { .maxstack 8 @@ -669,12 +669,12 @@ REM: ldc.i4 40 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method39(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method39(int32[]) ldstr " 40" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method39(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method39(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method39(int32[]) il managed { @@ -686,13 +686,13 @@ REM: ldc.i4 41 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method40(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method40(int32[]) ldstr " 41" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method40(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method40(int32[]) } .method private hidebysig static class [mscorlib]System.String Method40(int32[]) il managed { .maxstack 8 @@ -703,12 +703,12 @@ REM: ldc.i4 42 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method41(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method41(int32[]) ldstr " 42" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method41(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method41(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method41(int32[]) il managed { @@ -720,13 +720,13 @@ REM: ldc.i4 43 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method42(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method42(int32[]) ldstr " 43" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method42(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method42(int32[]) } .method private hidebysig static class [mscorlib]System.String Method42(int32[]) il managed { .maxstack 8 @@ -737,12 +737,12 @@ REM: ldc.i4 44 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method43(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method43(int32[]) ldstr " 44" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method43(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method43(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method43(int32[]) il managed { @@ -754,13 +754,13 @@ REM: ldc.i4 45 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method44(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method44(int32[]) ldstr " 45" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method44(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method44(int32[]) } .method private hidebysig static class [mscorlib]System.String Method44(int32[]) il managed { .maxstack 8 @@ -771,12 +771,12 @@ REM: ldc.i4 46 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method45(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method45(int32[]) ldstr " 46" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method45(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method45(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method45(int32[]) il managed { @@ -788,13 +788,13 @@ REM: ldc.i4 47 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method46(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method46(int32[]) ldstr " 47" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method46(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method46(int32[]) } .method private hidebysig static class [mscorlib]System.String Method46(int32[]) il managed { .maxstack 8 @@ -805,12 +805,12 @@ REM: ldc.i4 48 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method47(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method47(int32[]) ldstr " 48" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method47(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method47(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method47(int32[]) il managed { @@ -822,13 +822,13 @@ REM: ldc.i4 49 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method48(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method48(int32[]) ldstr " 49" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method48(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method48(int32[]) } .method private hidebysig static class [mscorlib]System.String Method48(int32[]) il managed { .maxstack 8 @@ -839,12 +839,12 @@ REM: ldc.i4 50 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method49(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method49(int32[]) ldstr " 50" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method49(int32[]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method49(int32[]) ret } .method private hidebysig static class [mscorlib]System.String Method49(int32[]) il managed { @@ -856,13 +856,13 @@ REM: ldc.i4 51 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method50(int32[]) + call class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method50(int32[]) ldstr " 51" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method50(int32[]) + jmp class [mscorlib]System.String JitTest_compat_deep_array.TestClass::Method50(int32[]) } //-----END AUTO GENERATED CODE-----// @@ -873,7 +873,7 @@ REM: ret } - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -894,7 +894,7 @@ REM: IL_0007: ldloc.0 - call class System.String JitTest.TestClass::Method0(int32[]) + call class System.String JitTest_compat_deep_array.TestClass::Method0(int32[]) brtrue IL_0027 ldloc.0 @@ -939,6 +939,6 @@ IL_0027: } // end of class TestClass -} // end of namespace JitTest +} // end of namespace JitTest_compat_deep_array //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_array_il_d.ilproj index 9ee57cb41189c7..bf8738c9b9ffcf 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_array_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/deep_array_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_array_il_r.ilproj index a637555f59cbc9..13072ae4932880 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_array_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/deep_array_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_nz.il b/src/tests/JIT/Methodical/tailcall/deep_array_nz.il index f50e2c7cfd3170..6fa4dd15e4cb1f 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_array_nz.il +++ b/src/tests/JIT/Methodical/tailcall/deep_array_nz.il @@ -9,7 +9,7 @@ } .assembly deep_array_nz { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_deep_array_nz { .class public auto ansi beforefieldinit TestClass extends [mscorlib]System.Object { @@ -23,12 +23,12 @@ ldc.i4 2 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method1(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method1(int32[100...]) ldstr " 2" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method1(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method1(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method1(int32[100...]) il managed { @@ -40,13 +40,13 @@ REM: ldc.i4 3 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method2(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method2(int32[100...]) ldstr " 3" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method2(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method2(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method2(int32[100...]) il managed { .maxstack 8 @@ -57,12 +57,12 @@ REM: ldc.i4 4 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method3(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method3(int32[100...]) ldstr " 4" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method3(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method3(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method3(int32[100...]) il managed { @@ -74,13 +74,13 @@ REM: ldc.i4 5 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method4(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method4(int32[100...]) ldstr " 5" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method4(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method4(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method4(int32[100...]) il managed { .maxstack 8 @@ -91,12 +91,12 @@ REM: ldc.i4 6 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method5(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method5(int32[100...]) ldstr " 6" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method5(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method5(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method5(int32[100...]) il managed { @@ -108,13 +108,13 @@ REM: ldc.i4 7 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method6(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method6(int32[100...]) ldstr " 7" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method6(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method6(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method6(int32[100...]) il managed { .maxstack 8 @@ -125,12 +125,12 @@ REM: ldc.i4 8 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method7(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method7(int32[100...]) ldstr " 8" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method7(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method7(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method7(int32[100...]) il managed { @@ -142,13 +142,13 @@ REM: ldc.i4 9 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method8(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method8(int32[100...]) ldstr " 9" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method8(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method8(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method8(int32[100...]) il managed { .maxstack 8 @@ -159,12 +159,12 @@ REM: ldc.i4 10 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method9(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method9(int32[100...]) ldstr " 10" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method9(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method9(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method9(int32[100...]) il managed { @@ -176,13 +176,13 @@ REM: ldc.i4 11 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method10(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method10(int32[100...]) ldstr " 11" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method10(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method10(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method10(int32[100...]) il managed { .maxstack 8 @@ -193,12 +193,12 @@ REM: ldc.i4 12 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method11(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method11(int32[100...]) ldstr " 12" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method11(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method11(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method11(int32[100...]) il managed { @@ -210,13 +210,13 @@ REM: ldc.i4 13 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method12(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method12(int32[100...]) ldstr " 13" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method12(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method12(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method12(int32[100...]) il managed { .maxstack 8 @@ -227,12 +227,12 @@ REM: ldc.i4 14 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method13(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method13(int32[100...]) ldstr " 14" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method13(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method13(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method13(int32[100...]) il managed { @@ -244,13 +244,13 @@ REM: ldc.i4 15 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method14(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method14(int32[100...]) ldstr " 15" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method14(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method14(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method14(int32[100...]) il managed { .maxstack 8 @@ -261,12 +261,12 @@ REM: ldc.i4 16 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method15(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method15(int32[100...]) ldstr " 16" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method15(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method15(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method15(int32[100...]) il managed { @@ -278,13 +278,13 @@ REM: ldc.i4 17 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method16(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method16(int32[100...]) ldstr " 17" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method16(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method16(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method16(int32[100...]) il managed { .maxstack 8 @@ -295,12 +295,12 @@ REM: ldc.i4 18 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method17(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method17(int32[100...]) ldstr " 18" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method17(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method17(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method17(int32[100...]) il managed { @@ -312,13 +312,13 @@ REM: ldc.i4 19 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method18(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method18(int32[100...]) ldstr " 19" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method18(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method18(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method18(int32[100...]) il managed { .maxstack 8 @@ -329,12 +329,12 @@ REM: ldc.i4 20 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method19(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method19(int32[100...]) ldstr " 20" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method19(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method19(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method19(int32[100...]) il managed { @@ -346,13 +346,13 @@ REM: ldc.i4 21 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method20(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method20(int32[100...]) ldstr " 21" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method20(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method20(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method20(int32[100...]) il managed { .maxstack 8 @@ -363,12 +363,12 @@ REM: ldc.i4 22 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method21(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method21(int32[100...]) ldstr " 22" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method21(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method21(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method21(int32[100...]) il managed { @@ -380,13 +380,13 @@ REM: ldc.i4 23 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method22(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method22(int32[100...]) ldstr " 23" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method22(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method22(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method22(int32[100...]) il managed { .maxstack 8 @@ -397,12 +397,12 @@ REM: ldc.i4 24 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method23(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method23(int32[100...]) ldstr " 24" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method23(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method23(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method23(int32[100...]) il managed { @@ -414,13 +414,13 @@ REM: ldc.i4 25 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method24(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method24(int32[100...]) ldstr " 25" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method24(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method24(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method24(int32[100...]) il managed { .maxstack 8 @@ -431,12 +431,12 @@ REM: ldc.i4 26 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method25(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method25(int32[100...]) ldstr " 26" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method25(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method25(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method25(int32[100...]) il managed { @@ -448,13 +448,13 @@ REM: ldc.i4 27 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method26(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method26(int32[100...]) ldstr " 27" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method26(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method26(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method26(int32[100...]) il managed { .maxstack 8 @@ -465,12 +465,12 @@ REM: ldc.i4 28 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method27(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method27(int32[100...]) ldstr " 28" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method27(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method27(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method27(int32[100...]) il managed { @@ -482,13 +482,13 @@ REM: ldc.i4 29 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method28(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method28(int32[100...]) ldstr " 29" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method28(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method28(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method28(int32[100...]) il managed { .maxstack 8 @@ -499,12 +499,12 @@ REM: ldc.i4 30 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method29(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method29(int32[100...]) ldstr " 30" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method29(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method29(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method29(int32[100...]) il managed { @@ -516,13 +516,13 @@ REM: ldc.i4 31 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method30(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method30(int32[100...]) ldstr " 31" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method30(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method30(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method30(int32[100...]) il managed { .maxstack 8 @@ -533,12 +533,12 @@ REM: ldc.i4 32 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method31(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method31(int32[100...]) ldstr " 32" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method31(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method31(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method31(int32[100...]) il managed { @@ -550,13 +550,13 @@ REM: ldc.i4 33 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method32(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method32(int32[100...]) ldstr " 33" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method32(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method32(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method32(int32[100...]) il managed { .maxstack 8 @@ -567,12 +567,12 @@ REM: ldc.i4 34 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method33(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method33(int32[100...]) ldstr " 34" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method33(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method33(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method33(int32[100...]) il managed { @@ -584,13 +584,13 @@ REM: ldc.i4 35 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method34(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method34(int32[100...]) ldstr " 35" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method34(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method34(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method34(int32[100...]) il managed { .maxstack 8 @@ -601,12 +601,12 @@ REM: ldc.i4 36 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method35(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method35(int32[100...]) ldstr " 36" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method35(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method35(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method35(int32[100...]) il managed { @@ -618,13 +618,13 @@ REM: ldc.i4 37 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method36(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method36(int32[100...]) ldstr " 37" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method36(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method36(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method36(int32[100...]) il managed { .maxstack 8 @@ -635,12 +635,12 @@ REM: ldc.i4 38 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method37(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method37(int32[100...]) ldstr " 38" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method37(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method37(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method37(int32[100...]) il managed { @@ -652,13 +652,13 @@ REM: ldc.i4 39 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method38(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method38(int32[100...]) ldstr " 39" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method38(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method38(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method38(int32[100...]) il managed { .maxstack 8 @@ -669,12 +669,12 @@ REM: ldc.i4 40 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method39(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method39(int32[100...]) ldstr " 40" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method39(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method39(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method39(int32[100...]) il managed { @@ -686,13 +686,13 @@ REM: ldc.i4 41 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method40(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method40(int32[100...]) ldstr " 41" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method40(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method40(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method40(int32[100...]) il managed { .maxstack 8 @@ -703,12 +703,12 @@ REM: ldc.i4 42 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method41(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method41(int32[100...]) ldstr " 42" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method41(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method41(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method41(int32[100...]) il managed { @@ -720,13 +720,13 @@ REM: ldc.i4 43 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method42(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method42(int32[100...]) ldstr " 43" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method42(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method42(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method42(int32[100...]) il managed { .maxstack 8 @@ -737,12 +737,12 @@ REM: ldc.i4 44 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method43(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method43(int32[100...]) ldstr " 44" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method43(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method43(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method43(int32[100...]) il managed { @@ -754,13 +754,13 @@ REM: ldc.i4 45 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method44(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method44(int32[100...]) ldstr " 45" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method44(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method44(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method44(int32[100...]) il managed { .maxstack 8 @@ -771,12 +771,12 @@ REM: ldc.i4 46 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method45(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method45(int32[100...]) ldstr " 46" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method45(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method45(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method45(int32[100...]) il managed { @@ -788,13 +788,13 @@ REM: ldc.i4 47 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method46(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method46(int32[100...]) ldstr " 47" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method46(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method46(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method46(int32[100...]) il managed { .maxstack 8 @@ -805,12 +805,12 @@ REM: ldc.i4 48 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method47(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method47(int32[100...]) ldstr " 48" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method47(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method47(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method47(int32[100...]) il managed { @@ -822,13 +822,13 @@ REM: ldc.i4 49 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method48(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method48(int32[100...]) ldstr " 49" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method48(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method48(int32[100...]) } .method private hidebysig static class [mscorlib]System.String Method48(int32[100...]) il managed { .maxstack 8 @@ -839,12 +839,12 @@ REM: ldc.i4 50 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method49(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method49(int32[100...]) ldstr " 50" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: - tail. call class [mscorlib]System.String JitTest.TestClass::Method49(int32[100...]) + tail. call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method49(int32[100...]) ret } .method private hidebysig static class [mscorlib]System.String Method49(int32[100...]) il managed { @@ -856,13 +856,13 @@ REM: ldc.i4 51 rem brtrue.s REM - call class [mscorlib]System.String JitTest.TestClass::Method50(int32[100...]) + call class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method50(int32[100...]) ldstr " 51" call class [mscorlib]System.String [mscorlib]System.String::Concat(class [mscorlib]System.String, class [mscorlib]System.String) ret REM: pop - jmp class [mscorlib]System.String JitTest.TestClass::Method50(int32[100...]) + jmp class [mscorlib]System.String JitTest_compat_deep_array_nz.TestClass::Method50(int32[100...]) } //-----END AUTO GENERATED CODE-----// @@ -873,7 +873,7 @@ REM: ret } - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -895,7 +895,7 @@ REM: IL_0007: ldloc.0 - call class System.String JitTest.TestClass::Method0(int32[100...]) + call class System.String JitTest_compat_deep_array_nz.TestClass::Method0(int32[100...]) brtrue IL_0027 ldloc.0 @@ -940,6 +940,6 @@ IL_0027: } // end of class TestClass -} // end of namespace JitTest +} // end of namespace JitTest_compat_deep_array_nz //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_d.ilproj index 3ee6c305a5540f..f9e6cde33097f3 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_r.ilproj index 31e5a311e225ae..7257ef5862befc 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/deep_gc.il b/src/tests/JIT/Methodical/tailcall/deep_gc.il index ceb84e3b36816e..87aa7e61ef794d 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_gc.il +++ b/src/tests/JIT/Methodical/tailcall/deep_gc.il @@ -9,1139 +9,1139 @@ } .assembly deep_gc { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_deep_gc { .class public auto ansi beforefieldinit TestClass extends [mscorlib]System.Object { .field public int32 m_fld .method private hidebysig static - class System.String Method0(class JitTest.TestClass A_0) il managed + class System.String Method0(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x2 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method1(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method1(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 2" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method1(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method1(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method0 .method private hidebysig static - class System.String Method1(class JitTest.TestClass A_0) il managed + class System.String Method1(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x3 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method2(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method2(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 3" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method2(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method2(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method1 .method private hidebysig static - class System.String Method2(class JitTest.TestClass A_0) il managed + class System.String Method2(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x4 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method3(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method3(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 4" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method3(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method3(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method2 .method private hidebysig static - class System.String Method3(class JitTest.TestClass A_0) il managed + class System.String Method3(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x5 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method4(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method4(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 5" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method4(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method4(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method3 .method private hidebysig static - class System.String Method4(class JitTest.TestClass A_0) il managed + class System.String Method4(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x6 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method5(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method5(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 6" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method5(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method5(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method4 .method private hidebysig static - class System.String Method5(class JitTest.TestClass A_0) il managed + class System.String Method5(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x7 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method6(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method6(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 7" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method6(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method6(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method5 .method private hidebysig static - class System.String Method6(class JitTest.TestClass A_0) il managed + class System.String Method6(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x8 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method7(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method7(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 8" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method7(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method7(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method6 .method private hidebysig static - class System.String Method7(class JitTest.TestClass A_0) il managed + class System.String Method7(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x9 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method8(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method8(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 9" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method8(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method8(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method7 .method private hidebysig static - class System.String Method8(class JitTest.TestClass A_0) il managed + class System.String Method8(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0xa IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method9(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method9(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 10" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method9(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method9(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method8 .method private hidebysig static - class System.String Method9(class JitTest.TestClass A_0) il managed + class System.String Method9(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0xb IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method10(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method10(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 11" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method10(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method10(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method9 .method private hidebysig static - class System.String Method10(class JitTest.TestClass A_0) il managed + class System.String Method10(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0xc IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method11(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method11(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 12" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method11(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method11(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method10 .method private hidebysig static - class System.String Method11(class JitTest.TestClass A_0) il managed + class System.String Method11(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0xd IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method12(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method12(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 13" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method12(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method12(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method11 .method private hidebysig static - class System.String Method12(class JitTest.TestClass A_0) il managed + class System.String Method12(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0xe IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method13(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method13(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 14" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method13(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method13(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method12 .method private hidebysig static - class System.String Method13(class JitTest.TestClass A_0) il managed + class System.String Method13(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0xf IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method14(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method14(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 15" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method14(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method14(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method13 .method private hidebysig static - class System.String Method14(class JitTest.TestClass A_0) il managed + class System.String Method14(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x10 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method15(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method15(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 16" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method15(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method15(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method14 .method private hidebysig static - class System.String Method15(class JitTest.TestClass A_0) il managed + class System.String Method15(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x11 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method16(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method16(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 17" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method16(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method16(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method15 .method private hidebysig static - class System.String Method16(class JitTest.TestClass A_0) il managed + class System.String Method16(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x12 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method17(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method17(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 18" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method17(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method17(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method16 .method private hidebysig static - class System.String Method17(class JitTest.TestClass A_0) il managed + class System.String Method17(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x13 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method18(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method18(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 19" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method18(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method18(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method17 .method private hidebysig static - class System.String Method18(class JitTest.TestClass A_0) il managed + class System.String Method18(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x14 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method19(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method19(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 20" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method19(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method19(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method18 .method private hidebysig static - class System.String Method19(class JitTest.TestClass A_0) il managed + class System.String Method19(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x15 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method20(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method20(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 21" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method20(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method20(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method19 .method private hidebysig static - class System.String Method20(class JitTest.TestClass A_0) il managed + class System.String Method20(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x16 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method21(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method21(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 22" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method21(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method21(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method20 .method private hidebysig static - class System.String Method21(class JitTest.TestClass A_0) il managed + class System.String Method21(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x17 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method22(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method22(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 23" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method22(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method22(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method21 .method private hidebysig static - class System.String Method22(class JitTest.TestClass A_0) il managed + class System.String Method22(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x18 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method23(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method23(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 24" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method23(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method23(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method22 .method private hidebysig static - class System.String Method23(class JitTest.TestClass A_0) il managed + class System.String Method23(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x19 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method24(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method24(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 25" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method24(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method24(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method23 .method private hidebysig static - class System.String Method24(class JitTest.TestClass A_0) il managed + class System.String Method24(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x1a IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method25(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method25(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 26" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method25(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method25(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method24 .method private hidebysig static - class System.String Method25(class JitTest.TestClass A_0) il managed + class System.String Method25(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x1b IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method26(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method26(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 27" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method26(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method26(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method25 .method private hidebysig static - class System.String Method26(class JitTest.TestClass A_0) il managed + class System.String Method26(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x1c IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method27(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method27(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 28" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method27(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method27(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method26 .method private hidebysig static - class System.String Method27(class JitTest.TestClass A_0) il managed + class System.String Method27(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x1d IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method28(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method28(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 29" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method28(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method28(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method27 .method private hidebysig static - class System.String Method28(class JitTest.TestClass A_0) il managed + class System.String Method28(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x1e IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method29(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method29(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 30" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method29(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method29(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method28 .method private hidebysig static - class System.String Method29(class JitTest.TestClass A_0) il managed + class System.String Method29(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x1f IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method30(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method30(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 31" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method30(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method30(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method29 .method private hidebysig static - class System.String Method30(class JitTest.TestClass A_0) il managed + class System.String Method30(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x20 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method31(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method31(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 32" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method31(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method31(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method30 .method private hidebysig static - class System.String Method31(class JitTest.TestClass A_0) il managed + class System.String Method31(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x21 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method32(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method32(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 33" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method32(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method32(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method31 .method private hidebysig static - class System.String Method32(class JitTest.TestClass A_0) il managed + class System.String Method32(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x22 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method33(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method33(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 34" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method33(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method33(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method32 .method private hidebysig static - class System.String Method33(class JitTest.TestClass A_0) il managed + class System.String Method33(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x23 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method34(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method34(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 35" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method34(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method34(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method33 .method private hidebysig static - class System.String Method34(class JitTest.TestClass A_0) il managed + class System.String Method34(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x24 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method35(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method35(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 36" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method35(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method35(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method34 .method private hidebysig static - class System.String Method35(class JitTest.TestClass A_0) il managed + class System.String Method35(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x25 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method36(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method36(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 37" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method36(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method36(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method35 .method private hidebysig static - class System.String Method36(class JitTest.TestClass A_0) il managed + class System.String Method36(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x26 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method37(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method37(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 38" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method37(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method37(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method36 .method private hidebysig static - class System.String Method37(class JitTest.TestClass A_0) il managed + class System.String Method37(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x27 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method38(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method38(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 39" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method38(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method38(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method37 .method private hidebysig static - class System.String Method38(class JitTest.TestClass A_0) il managed + class System.String Method38(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x28 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method39(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method39(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 40" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method39(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method39(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method38 .method private hidebysig static - class System.String Method39(class JitTest.TestClass A_0) il managed + class System.String Method39(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x29 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method40(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method40(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 41" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method40(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method40(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method39 .method private hidebysig static - class System.String Method40(class JitTest.TestClass A_0) il managed + class System.String Method40(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x2a IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method41(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method41(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 42" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method41(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method41(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method40 .method private hidebysig static - class System.String Method41(class JitTest.TestClass A_0) il managed + class System.String Method41(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x2b IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method42(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method42(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 43" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method42(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method42(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method41 .method private hidebysig static - class System.String Method42(class JitTest.TestClass A_0) il managed + class System.String Method42(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x2c IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method43(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method43(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 44" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method43(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method43(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method42 .method private hidebysig static - class System.String Method43(class JitTest.TestClass A_0) il managed + class System.String Method43(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x2d IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method44(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method44(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 45" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method44(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method44(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method43 .method private hidebysig static - class System.String Method44(class JitTest.TestClass A_0) il managed + class System.String Method44(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x2e IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method45(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method45(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 46" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method45(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method45(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method44 .method private hidebysig static - class System.String Method45(class JitTest.TestClass A_0) il managed + class System.String Method45(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x2f IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method46(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method46(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 47" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method46(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method46(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method45 .method private hidebysig static - class System.String Method46(class JitTest.TestClass A_0) il managed + class System.String Method46(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x30 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method47(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method47(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 48" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method47(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method47(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method46 .method private hidebysig static - class System.String Method47(class JitTest.TestClass A_0) il managed + class System.String Method47(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x31 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method48(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method48(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 49" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method48(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method48(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method47 .method private hidebysig static - class System.String Method48(class JitTest.TestClass A_0) il managed + class System.String Method48(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 39 (0x27) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x32 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method49(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method49(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 50" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call class System.String JitTest.TestClass::Method49(class JitTest.TestClass) + IL_0021: call class System.String JitTest_compat_deep_gc.TestClass::Method49(class JitTest_compat_deep_gc.TestClass) IL_0026: ret } // end of method TestClass::Method48 .method private hidebysig static - class System.String Method49(class JitTest.TestClass A_0) il managed + class System.String Method49(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 37 (0x25) .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0007: ldc.i4 0x33 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call class System.String JitTest.TestClass::Method50(class JitTest.TestClass) + IL_000f: call class System.String JitTest_compat_deep_gc.TestClass::Method50(class JitTest_compat_deep_gc.TestClass) IL_0014: ldstr " 51" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp class System.String JitTest.TestClass::Method50(class JitTest.TestClass) + IL_0020: jmp class System.String JitTest_compat_deep_gc.TestClass::Method50(class JitTest_compat_deep_gc.TestClass) } // end of method TestClass::Method49 .method private hidebysig static - class System.String Method50(class JitTest.TestClass A_0) il managed + class System.String Method50(class JitTest_compat_deep_gc.TestClass A_0) il managed { // Code size 2 (0x2) .maxstack 8 @@ -1149,7 +1149,7 @@ IL_0001: ret } // end of method TestClass::Method50 - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -1158,33 +1158,33 @@ .entrypoint // Code size 78 (0x4e) .maxstack 8 - .locals (class JitTest.TestClass V_0) + .locals (class JitTest_compat_deep_gc.TestClass V_0) IL_0000: ldc.i4.2 - IL_0001: newobj instance void JitTest.TestClass::.ctor(int32) + IL_0001: newobj instance void JitTest_compat_deep_gc.TestClass::.ctor(int32) IL_0006: stloc.0 IL_0007: ldloc.0 - IL_0008: call class System.String JitTest.TestClass::Method0(class JitTest.TestClass) + IL_0008: call class System.String JitTest_compat_deep_gc.TestClass::Method0(class JitTest_compat_deep_gc.TestClass) IL_000d: brtrue IL_0027 IL_0012: ldloc.0 - IL_0013: ldfld int32 JitTest.TestClass::m_fld + IL_0013: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0018: call void [System.Console]System.Console::Write(int32) IL_001d: ldstr " - prime!" IL_0022: call void [System.Console]System.Console::WriteLine(class System.String) IL_0027: ldloc.0 IL_0028: dup - IL_0029: ldfld int32 JitTest.TestClass::m_fld + IL_0029: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_002e: ldc.i4.1 IL_002f: add - IL_0030: stfld int32 JitTest.TestClass::m_fld + IL_0030: stfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_0035: ldloc.0 - IL_0036: ldfld int32 JitTest.TestClass::m_fld + IL_0036: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_003b: ldc.i4 0x64 IL_0040: ceq IL_0042: brfalse IL_0007 IL_0047: ldloc.0 - IL_0048: ldfld int32 JitTest.TestClass::m_fld + IL_0048: ldfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_004d: ret } // end of method TestClass::Main @@ -1197,10 +1197,10 @@ IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld int32 JitTest.TestClass::m_fld + IL_0008: stfld int32 JitTest_compat_deep_gc.TestClass::m_fld IL_000d: ret } // end of method TestClass::.ctor } // end of class TestClass -} // end of namespace JitTest +} // end of namespace JitTest_compat_deep_gc diff --git a/src/tests/JIT/Methodical/tailcall/deep_gc_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_gc_il_d.ilproj index 8d76fd8a3b0d99..1cf12034f0423a 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_gc_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/deep_gc_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/deep_gc_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_gc_il_r.ilproj index e8f4d66e924fc0..eb64df0c91575d 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_gc_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/deep_gc_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/deep_inst.il b/src/tests/JIT/Methodical/tailcall/deep_inst.il index 6f23d5e23dd190..8140171779e1b5 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_inst.il +++ b/src/tests/JIT/Methodical/tailcall/deep_inst.il @@ -9,7 +9,7 @@ } .assembly deep_inst { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_deep_inst { .class public auto ansi beforefieldinit TestClass extends [mscorlib]System.Object @@ -22,19 +22,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x2 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method1() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method1() IL_0014: ldstr " 2" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method1() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method1() IL_0026: ret } // end of method TestClass::Method0 @@ -45,19 +45,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x3 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method2() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method2() IL_0014: ldstr " 3" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method2() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method2() } // end of method TestClass::Method1 .method private hidebysig instance class System.String @@ -67,19 +67,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x4 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method3() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method3() IL_0014: ldstr " 4" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method3() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method3() IL_0026: ret } // end of method TestClass::Method2 @@ -90,19 +90,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x5 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method4() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method4() IL_0014: ldstr " 5" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method4() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method4() } // end of method TestClass::Method3 .method private hidebysig instance class System.String @@ -112,19 +112,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x6 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method5() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method5() IL_0014: ldstr " 6" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method5() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method5() IL_0026: ret } // end of method TestClass::Method4 @@ -135,19 +135,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x7 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method6() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method6() IL_0014: ldstr " 7" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method6() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method6() } // end of method TestClass::Method5 .method private hidebysig instance class System.String @@ -157,19 +157,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x8 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method7() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method7() IL_0014: ldstr " 8" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method7() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method7() IL_0026: ret } // end of method TestClass::Method6 @@ -180,19 +180,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x9 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method8() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method8() IL_0014: ldstr " 9" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method8() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method8() } // end of method TestClass::Method7 .method private hidebysig instance class System.String @@ -202,19 +202,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0xa IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method9() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method9() IL_0014: ldstr " 10" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method9() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method9() IL_0026: ret } // end of method TestClass::Method8 @@ -225,19 +225,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0xb IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method10() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method10() IL_0014: ldstr " 11" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method10() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method10() } // end of method TestClass::Method9 .method private hidebysig instance class System.String @@ -247,19 +247,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0xc IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method11() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method11() IL_0014: ldstr " 12" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method11() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method11() IL_0026: ret } // end of method TestClass::Method10 @@ -270,19 +270,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0xd IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method12() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method12() IL_0014: ldstr " 13" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method12() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method12() } // end of method TestClass::Method11 .method private hidebysig instance class System.String @@ -292,19 +292,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0xe IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method13() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method13() IL_0014: ldstr " 14" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method13() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method13() IL_0026: ret } // end of method TestClass::Method12 @@ -315,19 +315,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0xf IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method14() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method14() IL_0014: ldstr " 15" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method14() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method14() } // end of method TestClass::Method13 .method private hidebysig instance class System.String @@ -337,19 +337,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x10 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method15() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method15() IL_0014: ldstr " 16" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method15() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method15() IL_0026: ret } // end of method TestClass::Method14 @@ -360,19 +360,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x11 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method16() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method16() IL_0014: ldstr " 17" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method16() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method16() } // end of method TestClass::Method15 .method private hidebysig instance class System.String @@ -382,19 +382,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x12 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method17() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method17() IL_0014: ldstr " 18" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method17() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method17() IL_0026: ret } // end of method TestClass::Method16 @@ -405,19 +405,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x13 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method18() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method18() IL_0014: ldstr " 19" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method18() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method18() } // end of method TestClass::Method17 .method private hidebysig instance class System.String @@ -427,19 +427,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x14 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method19() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method19() IL_0014: ldstr " 20" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method19() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method19() IL_0026: ret } // end of method TestClass::Method18 @@ -450,19 +450,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x15 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method20() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method20() IL_0014: ldstr " 21" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method20() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method20() } // end of method TestClass::Method19 .method private hidebysig instance class System.String @@ -472,19 +472,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x16 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method21() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method21() IL_0014: ldstr " 22" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method21() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method21() IL_0026: ret } // end of method TestClass::Method20 @@ -495,19 +495,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x17 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method22() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method22() IL_0014: ldstr " 23" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method22() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method22() } // end of method TestClass::Method21 .method private hidebysig instance class System.String @@ -517,19 +517,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x18 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method23() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method23() IL_0014: ldstr " 24" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method23() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method23() IL_0026: ret } // end of method TestClass::Method22 @@ -540,19 +540,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x19 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method24() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method24() IL_0014: ldstr " 25" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method24() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method24() } // end of method TestClass::Method23 .method private hidebysig instance class System.String @@ -562,19 +562,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x1a IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method25() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method25() IL_0014: ldstr " 26" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method25() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method25() IL_0026: ret } // end of method TestClass::Method24 @@ -585,19 +585,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x1b IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method26() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method26() IL_0014: ldstr " 27" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method26() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method26() } // end of method TestClass::Method25 .method private hidebysig instance class System.String @@ -607,19 +607,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x1c IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method27() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method27() IL_0014: ldstr " 28" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method27() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method27() IL_0026: ret } // end of method TestClass::Method26 @@ -630,19 +630,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x1d IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method28() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method28() IL_0014: ldstr " 29" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method28() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method28() } // end of method TestClass::Method27 .method private hidebysig instance class System.String @@ -652,19 +652,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x1e IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method29() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method29() IL_0014: ldstr " 30" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method29() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method29() IL_0026: ret } // end of method TestClass::Method28 @@ -675,19 +675,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x1f IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method30() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method30() IL_0014: ldstr " 31" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method30() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method30() } // end of method TestClass::Method29 .method private hidebysig instance class System.String @@ -697,19 +697,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x20 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method31() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method31() IL_0014: ldstr " 32" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method31() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method31() IL_0026: ret } // end of method TestClass::Method30 @@ -720,19 +720,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x21 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method32() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method32() IL_0014: ldstr " 33" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method32() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method32() } // end of method TestClass::Method31 .method private hidebysig instance class System.String @@ -742,19 +742,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x22 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method33() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method33() IL_0014: ldstr " 34" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method33() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method33() IL_0026: ret } // end of method TestClass::Method32 @@ -765,19 +765,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x23 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method34() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method34() IL_0014: ldstr " 35" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method34() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method34() } // end of method TestClass::Method33 .method private hidebysig instance class System.String @@ -787,19 +787,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x24 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method35() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method35() IL_0014: ldstr " 36" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method35() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method35() IL_0026: ret } // end of method TestClass::Method34 @@ -810,19 +810,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x25 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method36() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method36() IL_0014: ldstr " 37" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method36() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method36() } // end of method TestClass::Method35 .method private hidebysig instance class System.String @@ -832,19 +832,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x26 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method37() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method37() IL_0014: ldstr " 38" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method37() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method37() IL_0026: ret } // end of method TestClass::Method36 @@ -855,19 +855,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x27 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method38() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method38() IL_0014: ldstr " 39" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method38() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method38() } // end of method TestClass::Method37 .method private hidebysig instance class System.String @@ -877,19 +877,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x28 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method39() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method39() IL_0014: ldstr " 40" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method39() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method39() IL_0026: ret } // end of method TestClass::Method38 @@ -900,19 +900,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x29 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method40() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method40() IL_0014: ldstr " 41" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method40() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method40() } // end of method TestClass::Method39 .method private hidebysig instance class System.String @@ -922,19 +922,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x2a IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method41() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method41() IL_0014: ldstr " 42" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method41() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method41() IL_0026: ret } // end of method TestClass::Method40 @@ -945,19 +945,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x2b IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method42() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method42() IL_0014: ldstr " 43" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method42() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method42() } // end of method TestClass::Method41 .method private hidebysig instance class System.String @@ -967,19 +967,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x2c IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method43() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method43() IL_0014: ldstr " 44" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method43() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method43() IL_0026: ret } // end of method TestClass::Method42 @@ -990,19 +990,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x2d IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method44() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method44() IL_0014: ldstr " 45" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method44() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method44() } // end of method TestClass::Method43 .method private hidebysig instance class System.String @@ -1012,19 +1012,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x2e IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method45() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method45() IL_0014: ldstr " 46" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method45() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method45() IL_0026: ret } // end of method TestClass::Method44 @@ -1035,19 +1035,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x2f IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method46() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method46() IL_0014: ldstr " 47" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method46() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method46() } // end of method TestClass::Method45 .method private hidebysig instance class System.String @@ -1057,19 +1057,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x30 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method47() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method47() IL_0014: ldstr " 48" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method47() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method47() IL_0026: ret } // end of method TestClass::Method46 @@ -1080,19 +1080,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x31 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method48() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method48() IL_0014: ldstr " 49" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method48() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method48() } // end of method TestClass::Method47 .method private hidebysig instance class System.String @@ -1102,19 +1102,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x32 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method49() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method49() IL_0014: ldstr " 50" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method49() + IL_0021: call instance class System.String JitTest_compat_deep_inst.TestClass::Method49() IL_0026: ret } // end of method TestClass::Method48 @@ -1125,19 +1125,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0007: ldc.i4 0x33 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method50() + IL_000f: call instance class System.String JitTest_compat_deep_inst.TestClass::Method50() IL_0014: ldstr " 51" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method50() + IL_0020: jmp instance class System.String JitTest_compat_deep_inst.TestClass::Method50() } // end of method TestClass::Method49 .method private hidebysig instance class System.String @@ -1149,7 +1149,7 @@ IL_0001: ret } // end of method TestClass::Method50 - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -1158,33 +1158,33 @@ .entrypoint // Code size 78 (0x4e) .maxstack 8 - .locals (class JitTest.TestClass V_0) + .locals (class JitTest_compat_deep_inst.TestClass V_0) IL_0000: ldc.i4.2 - IL_0001: newobj instance void JitTest.TestClass::.ctor(int32) + IL_0001: newobj instance void JitTest_compat_deep_inst.TestClass::.ctor(int32) IL_0006: stloc.0 IL_0007: ldloc.0 - IL_0008: call instance class System.String JitTest.TestClass::Method0() + IL_0008: call instance class System.String JitTest_compat_deep_inst.TestClass::Method0() IL_000d: brtrue IL_0027 IL_0012: ldloc.0 - IL_0013: ldfld int32 JitTest.TestClass::m_fld + IL_0013: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0018: call void [System.Console]System.Console::Write(int32) IL_001d: ldstr " - prime!" IL_0022: call void [System.Console]System.Console::WriteLine(class System.String) IL_0027: ldloc.0 IL_0028: dup - IL_0029: ldfld int32 JitTest.TestClass::m_fld + IL_0029: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_002e: ldc.i4.1 IL_002f: add - IL_0030: stfld int32 JitTest.TestClass::m_fld + IL_0030: stfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_0035: ldloc.0 - IL_0036: ldfld int32 JitTest.TestClass::m_fld + IL_0036: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_003b: ldc.i4 0x64 IL_0040: ceq IL_0042: brfalse IL_0007 IL_0047: ldloc.0 - IL_0048: ldfld int32 JitTest.TestClass::m_fld + IL_0048: ldfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_004d: ret } // end of method TestClass::Main @@ -1197,12 +1197,12 @@ IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld int32 JitTest.TestClass::m_fld + IL_0008: stfld int32 JitTest_compat_deep_inst.TestClass::m_fld IL_000d: ret } // end of method TestClass::.ctor } // end of class TestClass -} // end of namespace JitTest +} // end of namespace JitTest_compat_deep_inst //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/deep_inst_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_inst_il_d.ilproj index 29502ce5dc4c90..c173c2814bd4c1 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_inst_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/deep_inst_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/deep_inst_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_inst_il_r.ilproj index d480b0ffd68e3c..b9622ea78ea630 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_inst_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/deep_inst_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/deep_value.il b/src/tests/JIT/Methodical/tailcall/deep_value.il index 12915076e1bd15..f5111d5c0e91e8 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_value.il +++ b/src/tests/JIT/Methodical/tailcall/deep_value.il @@ -9,7 +9,7 @@ } .assembly deep_value { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_deep_value { .class public auto ansi sealed ValueClass extends [mscorlib]System.ValueType @@ -21,1207 +21,1207 @@ extends [mscorlib]System.Object { .method private hidebysig static - class System.String Method0(value class JitTest.ValueClass A_0) il managed + class System.String Method0(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x2 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method1(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method1(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 2" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method1(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method1(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method0 .method private hidebysig static - class System.String Method1(value class JitTest.ValueClass A_0) il managed + class System.String Method1(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x3 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method2(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method2(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 3" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method2(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method2(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method1 .method private hidebysig static - class System.String Method2(value class JitTest.ValueClass A_0) il managed + class System.String Method2(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x4 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method3(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method3(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 4" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method3(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method3(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method2 .method private hidebysig static - class System.String Method3(value class JitTest.ValueClass A_0) il managed + class System.String Method3(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x5 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method4(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method4(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 5" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method4(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method4(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method3 .method private hidebysig static - class System.String Method4(value class JitTest.ValueClass A_0) il managed + class System.String Method4(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x6 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method5(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method5(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 6" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method5(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method5(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method4 .method private hidebysig static - class System.String Method5(value class JitTest.ValueClass A_0) il managed + class System.String Method5(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x7 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method6(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method6(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 7" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method6(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method6(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method5 .method private hidebysig static - class System.String Method6(value class JitTest.ValueClass A_0) il managed + class System.String Method6(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x8 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method7(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method7(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 8" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method7(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method7(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method6 .method private hidebysig static - class System.String Method7(value class JitTest.ValueClass A_0) il managed + class System.String Method7(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x9 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method8(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method8(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 9" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method8(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method8(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method7 .method private hidebysig static - class System.String Method8(value class JitTest.ValueClass A_0) il managed + class System.String Method8(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0xa IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method9(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method9(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 10" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method9(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method9(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method8 .method private hidebysig static - class System.String Method9(value class JitTest.ValueClass A_0) il managed + class System.String Method9(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0xb IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method10(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method10(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 11" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method10(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method10(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method9 .method private hidebysig static - class System.String Method10(value class JitTest.ValueClass A_0) il managed + class System.String Method10(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0xc IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method11(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method11(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 12" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method11(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method11(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method10 .method private hidebysig static - class System.String Method11(value class JitTest.ValueClass A_0) il managed + class System.String Method11(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0xd IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method12(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method12(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 13" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method12(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method12(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method11 .method private hidebysig static - class System.String Method12(value class JitTest.ValueClass A_0) il managed + class System.String Method12(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0xe IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method13(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method13(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 14" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method13(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method13(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method12 .method private hidebysig static - class System.String Method13(value class JitTest.ValueClass A_0) il managed + class System.String Method13(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0xf IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method14(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method14(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 15" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method14(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method14(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method13 .method private hidebysig static - class System.String Method14(value class JitTest.ValueClass A_0) il managed + class System.String Method14(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x10 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method15(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method15(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 16" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method15(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method15(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method14 .method private hidebysig static - class System.String Method15(value class JitTest.ValueClass A_0) il managed + class System.String Method15(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x11 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method16(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method16(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 17" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method16(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method16(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method15 .method private hidebysig static - class System.String Method16(value class JitTest.ValueClass A_0) il managed + class System.String Method16(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x12 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method17(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method17(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 18" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method17(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method17(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method16 .method private hidebysig static - class System.String Method17(value class JitTest.ValueClass A_0) il managed + class System.String Method17(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x13 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method18(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method18(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 19" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method18(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method18(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method17 .method private hidebysig static - class System.String Method18(value class JitTest.ValueClass A_0) il managed + class System.String Method18(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x14 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method19(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method19(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 20" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method19(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method19(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method18 .method private hidebysig static - class System.String Method19(value class JitTest.ValueClass A_0) il managed + class System.String Method19(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x15 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method20(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method20(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 21" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method20(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method20(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method19 .method private hidebysig static - class System.String Method20(value class JitTest.ValueClass A_0) il managed + class System.String Method20(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x16 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method21(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method21(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 22" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method21(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method21(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method20 .method private hidebysig static - class System.String Method21(value class JitTest.ValueClass A_0) il managed + class System.String Method21(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x17 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method22(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method22(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 23" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method22(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method22(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method21 .method private hidebysig static - class System.String Method22(value class JitTest.ValueClass A_0) il managed + class System.String Method22(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x18 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method23(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method23(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 24" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method23(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method23(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method22 .method private hidebysig static - class System.String Method23(value class JitTest.ValueClass A_0) il managed + class System.String Method23(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x19 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method24(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method24(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 25" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method24(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method24(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method23 .method private hidebysig static - class System.String Method24(value class JitTest.ValueClass A_0) il managed + class System.String Method24(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x1a IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method25(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method25(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 26" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method25(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method25(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method24 .method private hidebysig static - class System.String Method25(value class JitTest.ValueClass A_0) il managed + class System.String Method25(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x1b IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method26(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method26(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 27" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method26(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method26(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method25 .method private hidebysig static - class System.String Method26(value class JitTest.ValueClass A_0) il managed + class System.String Method26(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x1c IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method27(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method27(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 28" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method27(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method27(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method26 .method private hidebysig static - class System.String Method27(value class JitTest.ValueClass A_0) il managed + class System.String Method27(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x1d IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method28(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method28(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 29" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method28(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method28(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method27 .method private hidebysig static - class System.String Method28(value class JitTest.ValueClass A_0) il managed + class System.String Method28(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x1e IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method29(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method29(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 30" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method29(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method29(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method28 .method private hidebysig static - class System.String Method29(value class JitTest.ValueClass A_0) il managed + class System.String Method29(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x1f IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method30(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method30(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 31" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method30(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method30(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method29 .method private hidebysig static - class System.String Method30(value class JitTest.ValueClass A_0) il managed + class System.String Method30(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x20 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method31(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method31(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 32" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method31(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method31(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method30 .method private hidebysig static - class System.String Method31(value class JitTest.ValueClass A_0) il managed + class System.String Method31(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x21 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method32(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method32(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 33" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method32(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method32(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method31 .method private hidebysig static - class System.String Method32(value class JitTest.ValueClass A_0) il managed + class System.String Method32(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x22 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method33(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method33(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 34" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method33(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method33(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method32 .method private hidebysig static - class System.String Method33(value class JitTest.ValueClass A_0) il managed + class System.String Method33(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x23 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method34(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method34(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 35" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method34(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method34(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method33 .method private hidebysig static - class System.String Method34(value class JitTest.ValueClass A_0) il managed + class System.String Method34(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x24 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method35(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method35(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 36" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method35(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method35(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method34 .method private hidebysig static - class System.String Method35(value class JitTest.ValueClass A_0) il managed + class System.String Method35(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x25 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method36(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method36(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 37" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method36(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method36(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method35 .method private hidebysig static - class System.String Method36(value class JitTest.ValueClass A_0) il managed + class System.String Method36(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x26 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method37(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method37(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 38" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method37(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method37(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method36 .method private hidebysig static - class System.String Method37(value class JitTest.ValueClass A_0) il managed + class System.String Method37(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x27 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method38(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method38(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 39" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method38(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method38(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method37 .method private hidebysig static - class System.String Method38(value class JitTest.ValueClass A_0) il managed + class System.String Method38(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x28 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method39(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method39(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 40" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method39(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method39(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method38 .method private hidebysig static - class System.String Method39(value class JitTest.ValueClass A_0) il managed + class System.String Method39(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x29 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method40(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method40(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 41" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method40(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method40(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method39 .method private hidebysig static - class System.String Method40(value class JitTest.ValueClass A_0) il managed + class System.String Method40(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x2a IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method41(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method41(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 42" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method41(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method41(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method40 .method private hidebysig static - class System.String Method41(value class JitTest.ValueClass A_0) il managed + class System.String Method41(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x2b IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method42(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method42(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 43" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method42(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method42(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method41 .method private hidebysig static - class System.String Method42(value class JitTest.ValueClass A_0) il managed + class System.String Method42(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x2c IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method43(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method43(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 44" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method43(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method43(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method42 .method private hidebysig static - class System.String Method43(value class JitTest.ValueClass A_0) il managed + class System.String Method43(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x2d IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method44(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method44(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 45" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method44(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method44(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method43 .method private hidebysig static - class System.String Method44(value class JitTest.ValueClass A_0) il managed + class System.String Method44(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x2e IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method45(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method45(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 46" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method45(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method45(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method44 .method private hidebysig static - class System.String Method45(value class JitTest.ValueClass A_0) il managed + class System.String Method45(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x2f IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method46(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method46(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 47" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method46(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method46(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method45 .method private hidebysig static - class System.String Method46(value class JitTest.ValueClass A_0) il managed + class System.String Method46(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x30 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method47(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method47(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 48" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method47(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method47(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method46 .method private hidebysig static - class System.String Method47(value class JitTest.ValueClass A_0) il managed + class System.String Method47(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x31 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method48(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method48(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 49" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method48(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method48(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method47 .method private hidebysig static - class System.String Method48(value class JitTest.ValueClass A_0) il managed + class System.String Method48(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 52 (0x34) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x32 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method49(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method49(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 50" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret - IL_0027: ldobj JitTest.ValueClass + IL_0027: ldobj JitTest_compat_deep_value.ValueClass IL_002c: tail. - IL_002e: call class System.String JitTest.TestClass::Method49(value class JitTest.ValueClass) + IL_002e: call class System.String JitTest_compat_deep_value.TestClass::Method49(value class JitTest_compat_deep_value.ValueClass) IL_0033: ret } // end of method TestClass::Method48 .method private hidebysig static - class System.String Method49(value class JitTest.ValueClass A_0) il managed + class System.String Method49(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 45 (0x2d) .maxstack 8 IL_0000: ldarga A_0 IL_0004: dup - IL_0005: ldfld int32 JitTest.ValueClass::m_fld + IL_0005: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldc.i4 0x33 IL_000f: rem IL_0010: brtrue.s IL_0027 - IL_0012: ldobj JitTest.ValueClass - IL_0017: call class System.String JitTest.TestClass::Method50(value class JitTest.ValueClass) + IL_0012: ldobj JitTest_compat_deep_value.ValueClass + IL_0017: call class System.String JitTest_compat_deep_value.TestClass::Method50(value class JitTest_compat_deep_value.ValueClass) IL_001c: ldstr " 51" IL_0021: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0026: ret IL_0027: pop - IL_0028: jmp class System.String JitTest.TestClass::Method50(value class JitTest.ValueClass) + IL_0028: jmp class System.String JitTest_compat_deep_value.TestClass::Method50(value class JitTest_compat_deep_value.ValueClass) } // end of method TestClass::Method49 .method private hidebysig static - class System.String Method50(value class JitTest.ValueClass A_0) il managed + class System.String Method50(value class JitTest_compat_deep_value.ValueClass A_0) il managed { // Code size 2 (0x2) .maxstack 8 @@ -1229,7 +1229,7 @@ IL_0001: ret } // end of method TestClass::Method50 - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -1238,33 +1238,33 @@ .entrypoint // Code size 93 (0x5d) .maxstack 8 - .locals init (value class JitTest.ValueClass V_0) + .locals init (value class JitTest_compat_deep_value.ValueClass V_0) IL_0000: ldloca V_0 IL_0004: ldc.i4.2 - IL_0005: stfld int32 JitTest.ValueClass::m_fld + IL_0005: stfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_000a: ldloc.0 - IL_000b: call class System.String JitTest.TestClass::Method0(value class JitTest.ValueClass) + IL_000b: call class System.String JitTest_compat_deep_value.TestClass::Method0(value class JitTest_compat_deep_value.ValueClass) IL_0010: brtrue IL_002d IL_0015: ldloca V_0 - IL_0019: ldfld int32 JitTest.ValueClass::m_fld + IL_0019: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_001e: call void [System.Console]System.Console::Write(int32) IL_0023: ldstr " - prime!" IL_0028: call void [System.Console]System.Console::WriteLine(class System.String) IL_002d: ldloca V_0 IL_0031: dup - IL_0032: ldfld int32 JitTest.ValueClass::m_fld + IL_0032: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_0037: ldc.i4.1 IL_0038: add - IL_0039: stfld int32 JitTest.ValueClass::m_fld + IL_0039: stfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_003e: ldloca V_0 - IL_0042: ldfld int32 JitTest.ValueClass::m_fld + IL_0042: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_0047: ldc.i4 0x64 IL_004c: ceq IL_004e: brfalse IL_000a IL_0053: ldloca V_0 - IL_0057: ldfld int32 JitTest.ValueClass::m_fld + IL_0057: ldfld int32 JitTest_compat_deep_value.ValueClass::m_fld IL_005c: ret } // end of method TestClass::Main @@ -1280,4 +1280,4 @@ } // end of class TestClass -} // end of namespace JitTest +} // end of namespace JitTest_compat_deep_value diff --git a/src/tests/JIT/Methodical/tailcall/deep_value_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_value_il_d.ilproj index a8ac2ed5be4b38..764d480ba10512 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_value_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/deep_value_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/deep_value_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_value_il_r.ilproj index d8ff01675b2c25..efdfc21c23cac8 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_value_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/deep_value_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/deep_virt.il b/src/tests/JIT/Methodical/tailcall/deep_virt.il index 67703b5970d006..d6bde6b497b1f9 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_virt.il +++ b/src/tests/JIT/Methodical/tailcall/deep_virt.il @@ -9,7 +9,7 @@ } .assembly deep_virt { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_deep_virt { .class public auto ansi beforefieldinit TestClass extends [mscorlib]System.Object @@ -22,19 +22,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x2 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method1() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method1() IL_0014: ldstr " 2" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method1() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method1() IL_0026: ret } // end of method TestClass::Method0 @@ -45,19 +45,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x3 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method2() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method2() IL_0014: ldstr " 3" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method2() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method2() } // end of method TestClass::Method1 .method private hidebysig virtual @@ -67,19 +67,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x4 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method3() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method3() IL_0014: ldstr " 4" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method3() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method3() IL_0026: ret } // end of method TestClass::Method2 @@ -90,19 +90,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x5 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method4() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method4() IL_0014: ldstr " 5" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method4() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method4() } // end of method TestClass::Method3 .method private hidebysig virtual @@ -112,19 +112,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x6 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method5() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method5() IL_0014: ldstr " 6" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method5() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method5() IL_0026: ret } // end of method TestClass::Method4 @@ -135,19 +135,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x7 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method6() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method6() IL_0014: ldstr " 7" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method6() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method6() } // end of method TestClass::Method5 .method private hidebysig virtual @@ -157,19 +157,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x8 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method7() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method7() IL_0014: ldstr " 8" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method7() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method7() IL_0026: ret } // end of method TestClass::Method6 @@ -180,19 +180,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x9 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method8() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method8() IL_0014: ldstr " 9" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method8() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method8() } // end of method TestClass::Method7 .method private hidebysig virtual @@ -202,19 +202,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0xa IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method9() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method9() IL_0014: ldstr " 10" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method9() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method9() IL_0026: ret } // end of method TestClass::Method8 @@ -225,19 +225,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0xb IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method10() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method10() IL_0014: ldstr " 11" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method10() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method10() } // end of method TestClass::Method9 .method private hidebysig virtual @@ -247,19 +247,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0xc IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method11() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method11() IL_0014: ldstr " 12" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method11() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method11() IL_0026: ret } // end of method TestClass::Method10 @@ -270,19 +270,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0xd IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method12() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method12() IL_0014: ldstr " 13" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method12() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method12() } // end of method TestClass::Method11 .method private hidebysig virtual @@ -292,19 +292,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0xe IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method13() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method13() IL_0014: ldstr " 14" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method13() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method13() IL_0026: ret } // end of method TestClass::Method12 @@ -315,19 +315,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0xf IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method14() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method14() IL_0014: ldstr " 15" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method14() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method14() } // end of method TestClass::Method13 .method private hidebysig virtual @@ -337,19 +337,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x10 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method15() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method15() IL_0014: ldstr " 16" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method15() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method15() IL_0026: ret } // end of method TestClass::Method14 @@ -360,19 +360,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x11 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method16() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method16() IL_0014: ldstr " 17" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method16() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method16() } // end of method TestClass::Method15 .method private hidebysig virtual @@ -382,19 +382,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x12 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method17() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method17() IL_0014: ldstr " 18" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method17() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method17() IL_0026: ret } // end of method TestClass::Method16 @@ -405,19 +405,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x13 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method18() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method18() IL_0014: ldstr " 19" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method18() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method18() } // end of method TestClass::Method17 .method private hidebysig virtual @@ -427,19 +427,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x14 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method19() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method19() IL_0014: ldstr " 20" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method19() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method19() IL_0026: ret } // end of method TestClass::Method18 @@ -450,19 +450,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x15 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method20() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method20() IL_0014: ldstr " 21" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method20() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method20() } // end of method TestClass::Method19 .method private hidebysig virtual @@ -472,19 +472,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x16 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method21() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method21() IL_0014: ldstr " 22" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method21() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method21() IL_0026: ret } // end of method TestClass::Method20 @@ -495,19 +495,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x17 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method22() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method22() IL_0014: ldstr " 23" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method22() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method22() } // end of method TestClass::Method21 .method private hidebysig virtual @@ -517,19 +517,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x18 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method23() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method23() IL_0014: ldstr " 24" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method23() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method23() IL_0026: ret } // end of method TestClass::Method22 @@ -540,19 +540,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x19 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method24() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method24() IL_0014: ldstr " 25" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method24() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method24() } // end of method TestClass::Method23 .method private hidebysig virtual @@ -562,19 +562,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x1a IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method25() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method25() IL_0014: ldstr " 26" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method25() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method25() IL_0026: ret } // end of method TestClass::Method24 @@ -585,19 +585,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x1b IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method26() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method26() IL_0014: ldstr " 27" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method26() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method26() } // end of method TestClass::Method25 .method private hidebysig virtual @@ -607,19 +607,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x1c IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method27() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method27() IL_0014: ldstr " 28" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method27() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method27() IL_0026: ret } // end of method TestClass::Method26 @@ -630,19 +630,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x1d IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method28() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method28() IL_0014: ldstr " 29" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method28() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method28() } // end of method TestClass::Method27 .method private hidebysig virtual @@ -652,19 +652,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x1e IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method29() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method29() IL_0014: ldstr " 30" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method29() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method29() IL_0026: ret } // end of method TestClass::Method28 @@ -675,19 +675,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x1f IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method30() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method30() IL_0014: ldstr " 31" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method30() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method30() } // end of method TestClass::Method29 .method private hidebysig virtual @@ -697,19 +697,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x20 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method31() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method31() IL_0014: ldstr " 32" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method31() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method31() IL_0026: ret } // end of method TestClass::Method30 @@ -720,19 +720,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x21 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method32() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method32() IL_0014: ldstr " 33" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method32() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method32() } // end of method TestClass::Method31 .method private hidebysig virtual @@ -742,19 +742,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x22 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method33() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method33() IL_0014: ldstr " 34" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method33() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method33() IL_0026: ret } // end of method TestClass::Method32 @@ -765,19 +765,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x23 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method34() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method34() IL_0014: ldstr " 35" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method34() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method34() } // end of method TestClass::Method33 .method private hidebysig virtual @@ -787,19 +787,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x24 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method35() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method35() IL_0014: ldstr " 36" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method35() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method35() IL_0026: ret } // end of method TestClass::Method34 @@ -810,19 +810,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x25 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method36() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method36() IL_0014: ldstr " 37" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method36() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method36() } // end of method TestClass::Method35 .method private hidebysig virtual @@ -832,19 +832,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x26 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method37() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method37() IL_0014: ldstr " 38" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method37() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method37() IL_0026: ret } // end of method TestClass::Method36 @@ -855,19 +855,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x27 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method38() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method38() IL_0014: ldstr " 39" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method38() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method38() } // end of method TestClass::Method37 .method private hidebysig virtual @@ -877,19 +877,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x28 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method39() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method39() IL_0014: ldstr " 40" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method39() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method39() IL_0026: ret } // end of method TestClass::Method38 @@ -900,19 +900,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x29 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method40() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method40() IL_0014: ldstr " 41" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method40() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method40() } // end of method TestClass::Method39 .method private hidebysig virtual @@ -922,19 +922,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x2a IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method41() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method41() IL_0014: ldstr " 42" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method41() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method41() IL_0026: ret } // end of method TestClass::Method40 @@ -945,19 +945,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x2b IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method42() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method42() IL_0014: ldstr " 43" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method42() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method42() } // end of method TestClass::Method41 .method private hidebysig virtual @@ -967,19 +967,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x2c IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method43() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method43() IL_0014: ldstr " 44" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method43() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method43() IL_0026: ret } // end of method TestClass::Method42 @@ -990,19 +990,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x2d IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method44() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method44() IL_0014: ldstr " 45" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method44() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method44() } // end of method TestClass::Method43 .method private hidebysig virtual @@ -1012,19 +1012,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x2e IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method45() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method45() IL_0014: ldstr " 46" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method45() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method45() IL_0026: ret } // end of method TestClass::Method44 @@ -1035,19 +1035,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x2f IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method46() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method46() IL_0014: ldstr " 47" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method46() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method46() } // end of method TestClass::Method45 .method private hidebysig virtual @@ -1057,19 +1057,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x30 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method47() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method47() IL_0014: ldstr " 48" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method47() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method47() IL_0026: ret } // end of method TestClass::Method46 @@ -1080,19 +1080,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x31 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method48() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method48() IL_0014: ldstr " 49" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method48() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method48() } // end of method TestClass::Method47 .method private hidebysig virtual @@ -1102,19 +1102,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x32 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method49() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method49() IL_0014: ldstr " 50" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: tail. - IL_0021: call instance class System.String JitTest.TestClass::Method49() + IL_0021: call instance class System.String JitTest_compat_deep_virt.TestClass::Method49() IL_0026: ret } // end of method TestClass::Method48 @@ -1125,19 +1125,19 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: dup - IL_0002: ldfld int32 JitTest.TestClass::m_fld + IL_0002: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0007: ldc.i4 0x33 IL_000c: rem IL_000d: brtrue.s IL_001f - IL_000f: call instance class System.String JitTest.TestClass::Method50() + IL_000f: call instance class System.String JitTest_compat_deep_virt.TestClass::Method50() IL_0014: ldstr " 51" IL_0019: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_001e: ret IL_001f: pop - IL_0020: jmp instance class System.String JitTest.TestClass::Method50() + IL_0020: jmp instance class System.String JitTest_compat_deep_virt.TestClass::Method50() } // end of method TestClass::Method49 .method private hidebysig virtual @@ -1149,7 +1149,7 @@ IL_0001: ret } // end of method TestClass::Method50 - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -1158,33 +1158,33 @@ .entrypoint // Code size 78 (0x4e) .maxstack 8 - .locals (class JitTest.TestClass V_0) + .locals (class JitTest_compat_deep_virt.TestClass V_0) IL_0000: ldc.i4.2 - IL_0001: newobj instance void JitTest.TestClass::.ctor(int32) + IL_0001: newobj instance void JitTest_compat_deep_virt.TestClass::.ctor(int32) IL_0006: stloc.0 IL_0007: ldloc.0 - IL_0008: callvirt instance class System.String JitTest.TestClass::Method0() + IL_0008: callvirt instance class System.String JitTest_compat_deep_virt.TestClass::Method0() IL_000d: brtrue IL_0027 IL_0012: ldloc.0 - IL_0013: ldfld int32 JitTest.TestClass::m_fld + IL_0013: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0018: call void [System.Console]System.Console::Write(int32) IL_001d: ldstr " - prime!" IL_0022: call void [System.Console]System.Console::WriteLine(class System.String) IL_0027: ldloc.0 IL_0028: dup - IL_0029: ldfld int32 JitTest.TestClass::m_fld + IL_0029: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_002e: ldc.i4.1 IL_002f: add - IL_0030: stfld int32 JitTest.TestClass::m_fld + IL_0030: stfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_0035: ldloc.0 - IL_0036: ldfld int32 JitTest.TestClass::m_fld + IL_0036: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_003b: ldc.i4 0x64 IL_0040: ceq IL_0042: brfalse IL_0007 IL_0047: ldloc.0 - IL_0048: ldfld int32 JitTest.TestClass::m_fld + IL_0048: ldfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_004d: ret } // end of method TestClass::Main @@ -1197,12 +1197,12 @@ IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld int32 JitTest.TestClass::m_fld + IL_0008: stfld int32 JitTest_compat_deep_virt.TestClass::m_fld IL_000d: ret } // end of method TestClass::.ctor } // end of class TestClass -} // end of namespace JitTest +} // end of namespace JitTest_compat_deep_virt //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/deep_virt_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_virt_il_d.ilproj index 2403667db5c9cb..b040b4ae38d703 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_virt_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/deep_virt_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/deep_virt_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_virt_il_r.ilproj index ab75f209e87aea..3a38a1c5ba121e 100644 --- a/src/tests/JIT/Methodical/tailcall/deep_virt_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/deep_virt_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/gcval.il b/src/tests/JIT/Methodical/tailcall/gcval.il index ef433314e27367..93eee89b55b4ff 100644 --- a/src/tests/JIT/Methodical/tailcall/gcval.il +++ b/src/tests/JIT/Methodical/tailcall/gcval.il @@ -9,20 +9,20 @@ } .assembly gcval { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_gcval { - .class private sequential ansi sealed beforefieldinit LargeVT + .class public sequential ansi sealed beforefieldinit LargeVT extends [mscorlib]System.ValueType { .field private int32[] 'value' - .method private hidebysig static value class JitTest.LargeVT + .method private hidebysig static value class JitTest_compat_gcval.LargeVT callee(int32 retcode) il managed { // Code size 33 (0x21) .maxstack 8 - .locals (value class JitTest.LargeVT lv) + .locals (value class JitTest_compat_gcval.LargeVT lv) ldloca.s lv - initobj JitTest.LargeVT + initobj JitTest_compat_gcval.LargeVT ldloca.s lv ldc.i4.1 newarr [mscorlib]System.Int32 @@ -30,22 +30,22 @@ ldc.i4.0 ldarg.0 stelem.i4 - stfld int32[] JitTest.LargeVT::'value' + stfld int32[] JitTest_compat_gcval.LargeVT::'value' ldloc.0 ret } // end of method LargeVT::callee - .method private hidebysig static value class JitTest.LargeVT + .method private hidebysig static value class JitTest_compat_gcval.LargeVT caller(int32 retcode) il managed { // Code size 11 (0xb) .maxstack 8 ldarg.0 - tail. call value class JitTest.LargeVT JitTest.LargeVT::callee(int32) + tail. call value class JitTest_compat_gcval.LargeVT JitTest_compat_gcval.LargeVT::callee(int32) ret } // end of method LargeVT::caller - .method private hidebysig static int32 + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -56,12 +56,12 @@ .maxstack 2 .locals (int32 V_0, int32 V_1, - value class JitTest.LargeVT V_2) + value class JitTest_compat_gcval.LargeVT V_2) IL_0000: ldc.i4.s 100 - IL_0002: call value class JitTest.LargeVT JitTest.LargeVT::caller(int32) + IL_0002: call value class JitTest_compat_gcval.LargeVT JitTest_compat_gcval.LargeVT::caller(int32) IL_0007: stloc.2 IL_0008: ldloca.s V_2 - IL_000a: ldfld int32[] JitTest.LargeVT::'value' + IL_000a: ldfld int32[] JitTest_compat_gcval.LargeVT::'value' IL_000f: ldc.i4.0 IL_0010: ldelem.i4 IL_0011: stloc.0 @@ -84,6 +84,6 @@ } // end of class LargeVT -} // end of namespace JitTest +} // end of namespace JitTest_compat_gcval //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/gcval_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_il_d.ilproj index 79c7e1eaa96e4b..c9d9c1769314cf 100644 --- a/src/tests/JIT/Methodical/tailcall/gcval_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/gcval_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/gcval_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_il_r.ilproj index 79010073f95edf..bd1ded421c35fa 100644 --- a/src/tests/JIT/Methodical/tailcall/gcval_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/gcval_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/gcval_nested.il b/src/tests/JIT/Methodical/tailcall/gcval_nested.il index bd15d3ba98cee1..85def71fb69a41 100644 --- a/src/tests/JIT/Methodical/tailcall/gcval_nested.il +++ b/src/tests/JIT/Methodical/tailcall/gcval_nested.il @@ -9,55 +9,55 @@ } .assembly 'gcval_nested' { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_gcval_nested { - .class private sequential ansi sealed beforefieldinit LargeVT + .class public sequential ansi sealed beforefieldinit LargeVT extends [mscorlib]System.ValueType { .field private int32[] 'value' - .field private valuetype JitTest.LargeVT[] next + .field private valuetype JitTest_compat_gcval_nested.LargeVT[] next - .method private hidebysig static value class JitTest.LargeVT + .method private hidebysig static value class JitTest_compat_gcval_nested.LargeVT callee(int32 retcode) il managed { // Code size 33 (0x21) .maxstack 8 - .locals (value class JitTest.LargeVT lv) + .locals (value class JitTest_compat_gcval_nested.LargeVT lv) ldloca lv - initobj JitTest.LargeVT + initobj JitTest_compat_gcval_nested.LargeVT ldloca lv ldc.i4.1 - newarr value class JitTest.LargeVT + newarr value class JitTest_compat_gcval_nested.LargeVT dup ldc.i4.0 - ldelema value class JitTest.LargeVT + ldelema value class JitTest_compat_gcval_nested.LargeVT dup - initobj JitTest.LargeVT + initobj JitTest_compat_gcval_nested.LargeVT ldc.i4.1 newarr [mscorlib]System.Int32 dup ldc.i4.0 ldarg.0 stelem.i4 - stfld int32[] JitTest.LargeVT::'value' + stfld int32[] JitTest_compat_gcval_nested.LargeVT::'value' - stfld valuetype JitTest.LargeVT[] JitTest.LargeVT::next + stfld valuetype JitTest_compat_gcval_nested.LargeVT[] JitTest_compat_gcval_nested.LargeVT::next ldloc.0 ret } // end of method LargeVT::callee - .method private hidebysig static value class JitTest.LargeVT + .method private hidebysig static value class JitTest_compat_gcval_nested.LargeVT caller(int32 retcode) il managed { // Code size 11 (0xb) .maxstack 8 ldarg.0 - tail. call value class JitTest.LargeVT JitTest.LargeVT::callee(int32) + tail. call value class JitTest_compat_gcval_nested.LargeVT JitTest_compat_gcval_nested.LargeVT::callee(int32) ret } // end of method LargeVT::caller - .method private hidebysig static int32 + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -68,15 +68,15 @@ .maxstack 2 .locals (int32 V_0, int32 V_1, - value class JitTest.LargeVT V_2) + value class JitTest_compat_gcval_nested.LargeVT V_2) ldc.i4.s 100 - call value class JitTest.LargeVT JitTest.LargeVT::caller(int32) + call value class JitTest_compat_gcval_nested.LargeVT JitTest_compat_gcval_nested.LargeVT::caller(int32) stloc.2 ldloca.s V_2 - ldfld value class JitTest.LargeVT[] JitTest.LargeVT::next + ldfld value class JitTest_compat_gcval_nested.LargeVT[] JitTest_compat_gcval_nested.LargeVT::next ldc.i4.0 - ldelema value class JitTest.LargeVT - ldfld int32[] JitTest.LargeVT::'value' + ldelema value class JitTest_compat_gcval_nested.LargeVT + ldfld int32[] JitTest_compat_gcval_nested.LargeVT::'value' ldc.i4.0 ldelem.i4 @@ -98,6 +98,6 @@ } // end of class LargeVT -} // end of namespace JitTest +} // end of namespace JitTest_compat_gcval_nested //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/gcval_nested_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_nested_il_d.ilproj index d90e11a893b52a..9d6938303d5462 100644 --- a/src/tests/JIT/Methodical/tailcall/gcval_nested_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/gcval_nested_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/gcval_nested_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_nested_il_r.ilproj index 20913d53088a91..b0bf097f91993f 100644 --- a/src/tests/JIT/Methodical/tailcall/gcval_nested_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/gcval_nested_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect.il b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect.il index def9ef7ef0b0cc..f6da98a7016266 100644 --- a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect.il +++ b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect.il @@ -9,20 +9,20 @@ } .assembly gcval_sideeffect { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_compat_gcval_sideeffect { - .class private sequential ansi sealed beforefieldinit LargeVT + .class public sequential ansi sealed beforefieldinit LargeVT extends [mscorlib]System.ValueType { .field private int32[] 'value' - .method private hidebysig static value class JitTest.LargeVT + .method private hidebysig static value class JitTest_compat_gcval_sideeffect.LargeVT callee(int32 retcode) il managed { // Code size 33 (0x21) .maxstack 8 - .locals (value class JitTest.LargeVT lv) + .locals (value class JitTest_compat_gcval_sideeffect.LargeVT lv) ldloca.s lv - initobj JitTest.LargeVT + initobj JitTest_compat_gcval_sideeffect.LargeVT ldloca.s lv ldc.i4.1 newarr [mscorlib]System.Int32 @@ -30,25 +30,25 @@ ldc.i4.0 ldarg.0 stelem.i4 - stfld int32[] JitTest.LargeVT::'value' + stfld int32[] JitTest_compat_gcval_sideeffect.LargeVT::'value' ldloc.0 ldloca lv ldnull - stfld int32[] JitTest.LargeVT::'value' + stfld int32[] JitTest_compat_gcval_sideeffect.LargeVT::'value' ret } // end of method LargeVT::callee - .method private hidebysig static value class JitTest.LargeVT + .method private hidebysig static value class JitTest_compat_gcval_sideeffect.LargeVT caller(int32 retcode) il managed { // Code size 11 (0xb) .maxstack 8 ldarg.0 - tail. call value class JitTest.LargeVT JitTest.LargeVT::callee(int32) + tail. call value class JitTest_compat_gcval_sideeffect.LargeVT JitTest_compat_gcval_sideeffect.LargeVT::callee(int32) ret } // end of method LargeVT::caller - .method private hidebysig static int32 + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -59,12 +59,12 @@ .maxstack 2 .locals (int32 V_0, int32 V_1, - value class JitTest.LargeVT V_2) + value class JitTest_compat_gcval_sideeffect.LargeVT V_2) IL_0000: ldc.i4.s 100 - IL_0002: call value class JitTest.LargeVT JitTest.LargeVT::caller(int32) + IL_0002: call value class JitTest_compat_gcval_sideeffect.LargeVT JitTest_compat_gcval_sideeffect.LargeVT::caller(int32) IL_0007: stloc.2 IL_0008: ldloca.s V_2 - IL_000a: ldfld int32[] JitTest.LargeVT::'value' + IL_000a: ldfld int32[] JitTest_compat_gcval_sideeffect.LargeVT::'value' IL_000f: ldc.i4.0 IL_0010: ldelem.i4 IL_0011: stloc.0 @@ -87,6 +87,6 @@ } // end of class LargeVT -} // end of namespace JitTest +} // end of namespace JitTest_compat_gcval_sideeffect //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_d.ilproj index 04038b8dc4d842..be7af0a686ff57 100644 --- a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_r.ilproj index 21f4d30eb8a624..8f523cd7027455 100644 --- a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/pointer.il b/src/tests/JIT/Methodical/tailcall/pointer.il index 5da933e217828b..96a4debe890116 100644 --- a/src/tests/JIT/Methodical/tailcall/pointer.il +++ b/src/tests/JIT/Methodical/tailcall/pointer.il @@ -7,6 +7,7 @@ .ver 4:0:0:0 } .assembly extern mscorlib { } +.assembly extern xunit.core {} .assembly pointer { } .field public static int32 temp at D_00004000 .method public static class System.String @@ -56,8 +57,13 @@ IL_0047: ret } +.class public auto ansi beforefieldinit Test_pointer extends [mscorlib]System.Object +{ .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 2 .locals (int32 V_0, @@ -96,5 +102,15 @@ ret } +.method public hidebysig specialname rtspecialname + instance void .ctor() il managed +{ + .maxstack 8 + IL_0000: ldarg.0 + IL_0001: call instance void [mscorlib]System.Object::.ctor() + IL_0006: ret +} +} + .data D_00004000 = bytearray ( 00 00 00 00) diff --git a/src/tests/JIT/Methodical/tailcall/pointer_i.il b/src/tests/JIT/Methodical/tailcall/pointer_i.il index c6b4d64b24d0f8..e34af54d1e28da 100644 --- a/src/tests/JIT/Methodical/tailcall/pointer_i.il +++ b/src/tests/JIT/Methodical/tailcall/pointer_i.il @@ -7,6 +7,7 @@ .ver 4:0:0:0 } .assembly extern mscorlib { } +.assembly extern xunit.core {} .assembly pointer_i { } .field public static int32 temp at D_00004000 .method public static class System.String @@ -57,8 +58,13 @@ IL_004e: ret } +.class public auto ansi beforefieldinit Test_pointer_i extends [mscorlib]System.Object +{ .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 2 .locals (int32 V_0, @@ -95,7 +101,17 @@ IL_0037: call void [System.Console]System.Console::WriteLine() ldc.i4 0x64 ret -} +} + +.method public hidebysig specialname rtspecialname + instance void .ctor() il managed +{ + .maxstack 8 + IL_0000: ldarg.0 + IL_0001: call instance void [mscorlib]System.Object::.ctor() + IL_0006: ret +} +} .data D_00004000 = bytearray ( 00 00 00 00) diff --git a/src/tests/JIT/Methodical/tailcall/pointer_i_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/pointer_i_il_d.ilproj index 9e93edebc4fe0d..961f20c2ef8d61 100644 --- a/src/tests/JIT/Methodical/tailcall/pointer_i_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/pointer_i_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Methodical/tailcall/pointer_i_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/pointer_i_il_r.ilproj index ff5255a1d05c32..409bf4b2c1ea5b 100644 --- a/src/tests/JIT/Methodical/tailcall/pointer_i_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/pointer_i_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Methodical/tailcall/pointer_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/pointer_il_d.ilproj index 0f27b563df65b7..70d15e7ecb2820 100644 --- a/src/tests/JIT/Methodical/tailcall/pointer_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/pointer_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Methodical/tailcall/pointer_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/pointer_il_r.ilproj index 44c8e7dc58701b..dc63676b04c33c 100644 --- a/src/tests/JIT/Methodical/tailcall/pointer_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/pointer_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep.il b/src/tests/JIT/Methodical/tailcall/recurse_ep.il index 604888c9cdf97d..1a1e4dba058ca7 100644 --- a/src/tests/JIT/Methodical/tailcall/recurse_ep.il +++ b/src/tests/JIT/Methodical/tailcall/recurse_ep.il @@ -9,14 +9,14 @@ } .assembly recurse_ep { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_recurse_ep { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .field private static int32 m .field private static int32 n - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -26,11 +26,11 @@ // Code size 93 (0x5d) .maxstack 4 .locals (int32 V_0) - IL_0000: ldsfld int32 JitTest.Test::n + IL_0000: ldsfld int32 JitTest_recurse_ep.Test::n IL_0005: ldc.i4.1 IL_0006: bne.un.s IL_003d - IL_0008: ldsfld int32 JitTest.Test::m + IL_0008: ldsfld int32 JitTest_recurse_ep.Test::m IL_000d: ldc.i4 0x375f00 IL_0012: bne.un.s IL_0021 @@ -40,7 +40,7 @@ IL_0020: ret IL_0021: ldstr "FAILED: 10! != " - IL_0026: ldsflda int32 JitTest.Test::m + IL_0026: ldsflda int32 JitTest_recurse_ep.Test::m IL_002b: call instance class System.String [mscorlib]System.Int32::ToString() IL_0030: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) @@ -48,16 +48,16 @@ IL_003a: ldc.i4.s 101 IL_003c: ret - IL_003d: ldsfld int32 JitTest.Test::m - IL_0042: ldsfld int32 JitTest.Test::n + IL_003d: ldsfld int32 JitTest_recurse_ep.Test::m + IL_0042: ldsfld int32 JitTest_recurse_ep.Test::n IL_0047: dup IL_0048: ldc.i4.1 IL_0049: sub - IL_004a: stsfld int32 JitTest.Test::n + IL_004a: stsfld int32 JitTest_recurse_ep.Test::n IL_004f: mul - IL_0050: stsfld int32 JitTest.Test::m + IL_0050: stsfld int32 JitTest_recurse_ep.Test::m IL_0055: tail. - IL_0057: call int32 JitTest.Test::Main() + IL_0057: call int32 JitTest_recurse_ep.Test::Main() IL_005c: ret } // end of method Test::Main @@ -67,9 +67,9 @@ // Code size 14 (0xe) .maxstack 8 IL_0000: ldc.i4.1 - IL_0001: stsfld int32 JitTest.Test::m + IL_0001: stsfld int32 JitTest_recurse_ep.Test::m IL_0006: ldc.i4.s 10 - IL_0008: stsfld int32 JitTest.Test::n + IL_0008: stsfld int32 JitTest_recurse_ep.Test::n IL_000d: ret } // end of method Test::.cctor @@ -85,6 +85,6 @@ } // end of class Test -} // end of namespace JitTest +} // end of namespace JitTest_recurse_ep //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/recurse_ep_il_d.ilproj index dcf7db1795c6a2..234d1d38ee7e62 100644 --- a/src/tests/JIT/Methodical/tailcall/recurse_ep_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/recurse_ep_il_r.ilproj index 296c1e08e10256..96baeaeb8e148f 100644 --- a/src/tests/JIT/Methodical/tailcall/recurse_ep_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_void.il b/src/tests/JIT/Methodical/tailcall/recurse_ep_void.il index 02eb788946b8dc..a05f6e5800cada 100644 --- a/src/tests/JIT/Methodical/tailcall/recurse_ep_void.il +++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_void.il @@ -8,66 +8,77 @@ .assembly recurse_ep_void { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_recurse_ep_void { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .field private static int32 m .field private static int32 n + .field private static int32 returnValue .method private hidebysig static void Main() il managed { - .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( - 01 00 00 00 - ) - .entrypoint .maxstack 4 .locals (int32 V_0) - IL_0000: ldsfld int32 JitTest.Test::n + IL_0000: ldsfld int32 JitTest_recurse_ep_void.Test::n IL_0005: ldc.i4.1 IL_0006: bne.un.s IL_0049 - IL_0008: ldsfld int32 JitTest.Test::m + IL_0008: ldsfld int32 JitTest_recurse_ep_void.Test::m IL_000d: ldc.i4 0x375f00 IL_0012: bne.un.s IL_0025 IL_0014: ldstr "PASSED: 10! == 3628800" IL_0019: call void [System.Console]System.Console::WriteLine(class System.String) IL_001e: ldc.i4 0x64 - IL_0023: br.s IL_0043 + stsfld int32 JitTest_recurse_ep_void.Test::returnValue + ret IL_0025: ldstr "FAILED: 10! != " - IL_002a: ldsflda int32 JitTest.Test::m + IL_002a: ldsflda int32 JitTest_recurse_ep_void.Test::m IL_002f: call instance class System.String [mscorlib]System.Int32::ToString() IL_0034: call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) IL_0039: call void [System.Console]System.Console::WriteLine(class System.String) IL_003e: ldc.i4 0x65 - IL_0043: call void [System.Runtime.Extensions]System.Environment::Exit(int32) - IL_0048: ret + stsfld int32 JitTest_recurse_ep_void.Test::returnValue + ret - IL_0049: ldsfld int32 JitTest.Test::m - IL_004e: ldsfld int32 JitTest.Test::n + IL_0049: ldsfld int32 JitTest_recurse_ep_void.Test::m + IL_004e: ldsfld int32 JitTest_recurse_ep_void.Test::n IL_0053: dup IL_0054: ldc.i4.1 IL_0055: sub - IL_0056: stsfld int32 JitTest.Test::n + IL_0056: stsfld int32 JitTest_recurse_ep_void.Test::n IL_005b: mul - IL_005c: stsfld int32 JitTest.Test::m + IL_005c: stsfld int32 JitTest_recurse_ep_void.Test::m IL_0061: tail. - IL_0063: call void JitTest.Test::Main() + IL_0063: call void JitTest_recurse_ep_void.Test::Main() IL_0068: ret } + .method public hidebysig static + int32 TestEntrypoint() il managed + { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) + .entrypoint + .maxstack 4 + call void JitTest_recurse_ep_void.Test::Main() + ldsfld int32 JitTest_recurse_ep_void.Test::returnValue + ret + } + .method private hidebysig specialname rtspecialname static void .cctor() il managed { .maxstack 8 IL_0000: ldc.i4.1 - IL_0001: stsfld int32 JitTest.Test::m + IL_0001: stsfld int32 JitTest_recurse_ep_void.Test::m IL_0006: ldc.i4.s 10 - IL_0008: stsfld int32 JitTest.Test::n + IL_0008: stsfld int32 JitTest_recurse_ep_void.Test::n IL_000d: ret } diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_d.ilproj index 27fb9f1a189287..90105e8aebaa97 100644 --- a/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_r.ilproj index c509687adfb739..ef36852b3dbe14 100644 --- a/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/reference_i.il b/src/tests/JIT/Methodical/tailcall/reference_i.il index 486500a6879104..b6124288a23115 100644 --- a/src/tests/JIT/Methodical/tailcall/reference_i.il +++ b/src/tests/JIT/Methodical/tailcall/reference_i.il @@ -7,6 +7,7 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly reference_i { } .method public static class System.String rems(int32& n, @@ -68,8 +69,13 @@ IL_005c: ret } // end of global method rems +.class public auto ansi beforefieldinit Test_reference_i extends [mscorlib]System.Object +{ .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint // Code size 66 (0x42) .maxstack 2 @@ -107,6 +113,17 @@ IL_0037: call void [System.Console]System.Console::WriteLine() IL_003c: ldc.i4 0x64 IL_0041: ret -} // end of global method main +} // end of method main + + +.method public hidebysig specialname rtspecialname + instance void .ctor() il managed +{ + .maxstack 8 + IL_0000: ldarg.0 + IL_0001: call instance void [mscorlib]System.Object::.ctor() + IL_0006: ret +} +} //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/reference_i_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/reference_i_il_d.ilproj index 864eedceaa915a..75419284daf6e8 100644 --- a/src/tests/JIT/Methodical/tailcall/reference_i_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/reference_i_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/reference_i_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/reference_i_il_r.ilproj index 93c1c478634485..0bc661b8416bf9 100644 --- a/src/tests/JIT/Methodical/tailcall/reference_i_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/reference_i_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/test_2a.il b/src/tests/JIT/Methodical/tailcall/test_2a.il index 737a281e6f2964..c145d11d21ba83 100644 --- a/src/tests/JIT/Methodical/tailcall/test_2a.il +++ b/src/tests/JIT/Methodical/tailcall/test_2a.il @@ -8,14 +8,14 @@ .assembly test_2a { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_test_2a { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .field private static int32 m .field private static int32 n - .method private hidebysig static int32 Main() il managed + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 @@ -25,11 +25,11 @@ .locals (int32 V_0) ldc.i4.1 call void [System.Runtime.Extensions]System.Environment::set_ExitCode(int32) - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_2a.Test::n ldc.i4.1 bne.un.s IL_0047 - ldsfld int32 JitTest.Test::m + ldsfld int32 JitTest_test_2a.Test::m ldc.i4 0x375f00 bne.un.s IL_0029 @@ -39,12 +39,12 @@ ret OUT: - tail. call int32 JitTest.Test::Main() + tail. call int32 JitTest_test_2a.Test::Main() ret IL_0029: ldstr "FAILED: 10! != " - ldsflda int32 JitTest.Test::m + ldsflda int32 JitTest_test_2a.Test::m call instance class System.String [mscorlib]System.Int32::ToString() call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) @@ -53,14 +53,14 @@ IL_0029: ret IL_0047: - ldsfld int32 JitTest.Test::m - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_2a.Test::m + ldsfld int32 JitTest_test_2a.Test::n dup ldc.i4.1 sub - stsfld int32 JitTest.Test::n + stsfld int32 JitTest_test_2a.Test::n mul - stsfld int32 JitTest.Test::m + stsfld int32 JitTest_test_2a.Test::m br.s OUT } // end of method Test::Main @@ -70,9 +70,9 @@ IL_0047: // Code size 14 (0xe) .maxstack 8 IL_0000: ldc.i4.1 - IL_0001: stsfld int32 JitTest.Test::m + IL_0001: stsfld int32 JitTest_test_2a.Test::m IL_0006: ldc.i4.s 10 - IL_0008: stsfld int32 JitTest.Test::n + IL_0008: stsfld int32 JitTest_test_2a.Test::n IL_000d: ret } // end of method Test::.cctor @@ -88,6 +88,6 @@ IL_0047: } // end of class Test -} // end of namespace JitTest +} // end of namespace JitTest_test_2a //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/test_2a_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_2a_il_d.ilproj index b8c32a0e3532f3..a9ff90843ac7ba 100644 --- a/src/tests/JIT/Methodical/tailcall/test_2a_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_2a_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/test_2a_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_2a_il_r.ilproj index f2230a23b6138c..eb7b6234dd6e7e 100644 --- a/src/tests/JIT/Methodical/tailcall/test_2a_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_2a_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/test_2b.il b/src/tests/JIT/Methodical/tailcall/test_2b.il index ef25fad1688c23..86e04824a301c0 100644 --- a/src/tests/JIT/Methodical/tailcall/test_2b.il +++ b/src/tests/JIT/Methodical/tailcall/test_2b.il @@ -9,14 +9,14 @@ .assembly test_2b { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_test_2b { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .field private static int32 m .field private static int32 n - .method private hidebysig static int32 Main() il managed + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 @@ -26,11 +26,11 @@ .locals (int32 V_0) ldc.i4.1 call void [System.Runtime.Extensions]System.Environment::set_ExitCode(int32) - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_2b.Test::n ldc.i4.1 bne.un.s IL_0047 - ldsfld int32 JitTest.Test::m + ldsfld int32 JitTest_test_2b.Test::m ldc.i4 0x375f00 bne.un.s IL_0029 @@ -41,7 +41,7 @@ IL_0029: ldstr "FAILED: 10! != " - ldsflda int32 JitTest.Test::m + ldsflda int32 JitTest_test_2b.Test::m call instance class System.String [mscorlib]System.Int32::ToString() call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) @@ -50,20 +50,20 @@ IL_0029: ret IL_0047: - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_2b.Test::n ldc.i4.1 beq MERGE - ldsfld int32 JitTest.Test::m - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_2b.Test::m + ldsfld int32 JitTest_test_2b.Test::n dup ldc.i4.1 sub - stsfld int32 JitTest.Test::n + stsfld int32 JitTest_test_2b.Test::n mul - stsfld int32 JitTest.Test::m + stsfld int32 JitTest_test_2b.Test::m MERGE: - tail. call int32 JitTest.Test::Main() + tail. call int32 JitTest_test_2b.Test::Main() ret } // end of method Test::Main @@ -73,9 +73,9 @@ MERGE: // Code size 14 (0xe) .maxstack 8 IL_0000: ldc.i4.1 - IL_0001: stsfld int32 JitTest.Test::m + IL_0001: stsfld int32 JitTest_test_2b.Test::m IL_0006: ldc.i4.s 10 - IL_0008: stsfld int32 JitTest.Test::n + IL_0008: stsfld int32 JitTest_test_2b.Test::n IL_000d: ret } // end of method Test::.cctor @@ -91,6 +91,6 @@ MERGE: } // end of class Test -} // end of namespace JitTest +} // end of namespace JitTest_test_2b //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/test_2b_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_2b_il_d.ilproj index 880455da7eef94..a5b55ca6a19e0c 100644 --- a/src/tests/JIT/Methodical/tailcall/test_2b_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_2b_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/test_2b_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_2b_il_r.ilproj index 22488f43074be5..ebd91458e7f6da 100644 --- a/src/tests/JIT/Methodical/tailcall/test_2b_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_2b_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/test_2c.il b/src/tests/JIT/Methodical/tailcall/test_2c.il index 3f830ca5d8fb8f..0c0169b77d30ed 100644 --- a/src/tests/JIT/Methodical/tailcall/test_2c.il +++ b/src/tests/JIT/Methodical/tailcall/test_2c.il @@ -8,14 +8,14 @@ .assembly test_2c { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_test_2c { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .field private static int32 m .field private static int32 n - .method private hidebysig static int32 Main() il managed + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 @@ -25,11 +25,11 @@ .locals (int32 V_0) ldc.i4.1 call void [System.Runtime.Extensions]System.Environment::set_ExitCode(int32) - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_2c.Test::n ldc.i4.1 bne.un.s IL_0047 - ldsfld int32 JitTest.Test::m + ldsfld int32 JitTest_test_2c.Test::m ldc.i4 0x375f00 bne.un.s IL_0029 @@ -40,7 +40,7 @@ IL_0029: ldstr "FAILED: 10! != " - ldsflda int32 JitTest.Test::m + ldsflda int32 JitTest_test_2c.Test::m call instance class System.String [mscorlib]System.Int32::ToString() call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) @@ -50,20 +50,20 @@ IL_0029: IL_0047: nop - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_2c.Test::n ldc.i4.1 beq MERGE - ldsfld int32 JitTest.Test::m - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_2c.Test::m + ldsfld int32 JitTest_test_2c.Test::n dup ldc.i4.1 sub - stsfld int32 JitTest.Test::n + stsfld int32 JitTest_test_2c.Test::n mul - stsfld int32 JitTest.Test::m + stsfld int32 JitTest_test_2c.Test::m MERGE: - tail. call int32 JitTest.Test::Main() + tail. call int32 JitTest_test_2c.Test::Main() RET: ret } // end of method Test::Main @@ -74,9 +74,9 @@ RET: // Code size 14 (0xe) .maxstack 8 IL_0000: ldc.i4.1 - IL_0001: stsfld int32 JitTest.Test::m + IL_0001: stsfld int32 JitTest_test_2c.Test::m IL_0006: ldc.i4.s 10 - IL_0008: stsfld int32 JitTest.Test::n + IL_0008: stsfld int32 JitTest_test_2c.Test::n IL_000d: ret } // end of method Test::.cctor @@ -92,6 +92,6 @@ RET: } // end of class Test -} // end of namespace JitTest +} // end of namespace JitTest_test_2c //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/test_2c_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_2c_il_d.ilproj index f287fed5d51e67..d33775f8579911 100644 --- a/src/tests/JIT/Methodical/tailcall/test_2c_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_2c_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/test_2c_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_2c_il_r.ilproj index c29666ef1507f1..baa20c9f4163e1 100644 --- a/src/tests/JIT/Methodical/tailcall/test_2c_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_2c_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/test_3b.il b/src/tests/JIT/Methodical/tailcall/test_3b.il index b08f5d2b604dde..ce6dee1df7ec32 100644 --- a/src/tests/JIT/Methodical/tailcall/test_3b.il +++ b/src/tests/JIT/Methodical/tailcall/test_3b.il @@ -9,26 +9,26 @@ } .assembly test_3b { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_test_3b { .class private value sealed ansi beforefieldinit ValueClass extends [mscorlib]System.ValueType { .field public float64 m_fld } - .class private auto ansi beforefieldinit TestClass + .class public auto ansi beforefieldinit TestClass extends [mscorlib]System.Object { .method private hidebysig static - int32 TestFunc2(value class JitTest.ValueClass) il managed + int32 TestFunc2(value class JitTest_test_3b.ValueClass) il managed { // Code size 10 (0xa) .maxstack 8 .locals init (int32 V_0) - sizeof value class JitTest.ValueClass + sizeof value class JitTest_test_3b.ValueClass localloc ldarg.0 - stobj value class JitTest.ValueClass + stobj value class JitTest_test_3b.ValueClass ldc.i4.0 ret } // end of method TestClass::TestFunc2 @@ -38,17 +38,17 @@ { // Code size 22 (0x16) .maxstack 8 - sizeof value class JitTest.ValueClass + sizeof value class JitTest_test_3b.ValueClass localloc dup - initobj value class JitTest.ValueClass - ldobj value class JitTest.ValueClass + initobj value class JitTest_test_3b.ValueClass + ldobj value class JitTest_test_3b.ValueClass tail. - call int32 JitTest.TestClass::TestFunc2(value class JitTest.ValueClass) + call int32 JitTest_test_3b.TestClass::TestFunc2(value class JitTest_test_3b.ValueClass) ret } // end of method TestClass::TestFunc1 - .method private hidebysig static + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -58,7 +58,7 @@ // Code size 38 (0x26) .maxstack 1 .locals (int32 V_0) - IL_0000: call int32 JitTest.TestClass::TestFunc1() + IL_0000: call int32 JitTest_test_3b.TestClass::TestFunc1() IL_0005: brfalse.s IL_0015 IL_0007: ldstr "failed" diff --git a/src/tests/JIT/Methodical/tailcall/test_3b_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_3b_il_d.ilproj index 99764b8ea0d41e..0038bbfc27bebf 100644 --- a/src/tests/JIT/Methodical/tailcall/test_3b_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_3b_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/test_3b_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_3b_il_r.ilproj index aa6c441c1549cd..db5c63806baeac 100644 --- a/src/tests/JIT/Methodical/tailcall/test_3b_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_3b_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Methodical/tailcall/test_implicit_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_implicit_il_d.ilproj index 4e143ca41f4425..44d30fdc755819 100644 --- a/src/tests/JIT/Methodical/tailcall/test_implicit_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_implicit_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/test_implicit_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_implicit_il_r.ilproj index f3196a318fbdfe..caa938e9d0e93b 100644 --- a/src/tests/JIT/Methodical/tailcall/test_implicit_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_implicit_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/test_mutual_rec.il b/src/tests/JIT/Methodical/tailcall/test_mutual_rec.il index 378d6b5aa84c07..65b5cfb8bf2009 100644 --- a/src/tests/JIT/Methodical/tailcall/test_mutual_rec.il +++ b/src/tests/JIT/Methodical/tailcall/test_mutual_rec.il @@ -8,14 +8,14 @@ .assembly test_mutual_rec { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_test_mutual_rec { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .field private static int32 m .field private static int32 n - .method private hidebysig static int32 Main() il managed + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 @@ -25,11 +25,11 @@ .locals (int32 V_0) ldc.i4.1 call void [System.Runtime.Extensions]System.Environment::set_ExitCode(int32) - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_mutual_rec.Test::n ldc.i4.1 bne.un.s IL_0047 - ldsfld int32 JitTest.Test::m + ldsfld int32 JitTest_test_mutual_rec.Test::m ldc.i4 0x375f00 bne.un.s IL_0029 @@ -40,7 +40,7 @@ IL_0029: ldstr "FAILED: 10! != " - ldsflda int32 JitTest.Test::m + ldsflda int32 JitTest_test_mutual_rec.Test::m call instance class System.String [mscorlib]System.Int32::ToString() call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) @@ -49,26 +49,26 @@ IL_0029: ret IL_0047: - ldsfld int32 JitTest.Test::m - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_mutual_rec.Test::m + ldsfld int32 JitTest_test_mutual_rec.Test::n dup ldc.i4.1 sub - stsfld int32 JitTest.Test::n + stsfld int32 JitTest_test_mutual_rec.Test::n mul - stsfld int32 JitTest.Test::m + stsfld int32 JitTest_test_mutual_rec.Test::m - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_mutual_rec.Test::n ldc.i4.3 rem switch (CASE1, CASE2) - ldftn int32 JitTest.Test::Main() + ldftn int32 JitTest_test_mutual_rec.Test::Main() br.s MERGE1 CASE1: - ldftn int32 JitTest.Test::Main1() + ldftn int32 JitTest_test_mutual_rec.Test::Main1() br.s MERGE1 CASE2: - ldftn int32 JitTest.Test::Main2() + ldftn int32 JitTest_test_mutual_rec.Test::Main2() MERGE1: tail. calli int32() ret @@ -79,11 +79,11 @@ MERGE1: .locals (int32 V_0) ldc.i4.1 call void [System.Runtime.Extensions]System.Environment::set_ExitCode(int32) - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_mutual_rec.Test::n ldc.i4.1 bne.un.s IL_0047 - ldsfld int32 JitTest.Test::m + ldsfld int32 JitTest_test_mutual_rec.Test::m ldc.i4 0x375f00 bne.un.s IL_0029 @@ -94,7 +94,7 @@ MERGE1: IL_0029: ldstr "FAILED: 10! != " - ldsflda int32 JitTest.Test::m + ldsflda int32 JitTest_test_mutual_rec.Test::m call instance class System.String [mscorlib]System.Int32::ToString() call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) @@ -103,26 +103,26 @@ IL_0029: ret IL_0047: - ldsfld int32 JitTest.Test::m - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_mutual_rec.Test::m + ldsfld int32 JitTest_test_mutual_rec.Test::n dup ldc.i4.1 sub - stsfld int32 JitTest.Test::n + stsfld int32 JitTest_test_mutual_rec.Test::n mul - stsfld int32 JitTest.Test::m + stsfld int32 JitTest_test_mutual_rec.Test::m - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_mutual_rec.Test::n ldc.i4.3 rem switch (CASE1, CASE2) - ldftn int32 JitTest.Test::Main() + ldftn int32 JitTest_test_mutual_rec.Test::Main() br.s MERGE1 CASE1: - ldftn int32 JitTest.Test::Main1() + ldftn int32 JitTest_test_mutual_rec.Test::Main1() br.s MERGE1 CASE2: - ldftn int32 JitTest.Test::Main2() + ldftn int32 JitTest_test_mutual_rec.Test::Main2() MERGE1: tail. calli int32() ret @@ -133,11 +133,11 @@ MERGE1: .locals (int32 V_0) ldc.i4.1 call void [System.Runtime.Extensions]System.Environment::set_ExitCode(int32) - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_mutual_rec.Test::n ldc.i4.1 bne.un.s IL_0047 - ldsfld int32 JitTest.Test::m + ldsfld int32 JitTest_test_mutual_rec.Test::m ldc.i4 0x375f00 bne.un.s IL_0029 @@ -148,7 +148,7 @@ MERGE1: IL_0029: ldstr "FAILED: 10! != " - ldsflda int32 JitTest.Test::m + ldsflda int32 JitTest_test_mutual_rec.Test::m call instance class System.String [mscorlib]System.Int32::ToString() call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) @@ -157,26 +157,26 @@ IL_0029: ret IL_0047: - ldsfld int32 JitTest.Test::m - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_mutual_rec.Test::m + ldsfld int32 JitTest_test_mutual_rec.Test::n dup ldc.i4.1 sub - stsfld int32 JitTest.Test::n + stsfld int32 JitTest_test_mutual_rec.Test::n mul - stsfld int32 JitTest.Test::m + stsfld int32 JitTest_test_mutual_rec.Test::m - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_mutual_rec.Test::n ldc.i4.3 rem switch (CASE1, CASE2) - ldftn int32 JitTest.Test::Main() + ldftn int32 JitTest_test_mutual_rec.Test::Main() br.s MERGE1 CASE1: - ldftn int32 JitTest.Test::Main1() + ldftn int32 JitTest_test_mutual_rec.Test::Main1() br.s MERGE1 CASE2: - ldftn int32 JitTest.Test::Main2() + ldftn int32 JitTest_test_mutual_rec.Test::Main2() MERGE1: tail. calli int32() ret @@ -188,9 +188,9 @@ MERGE1: // Code size 14 (0xe) .maxstack 8 IL_0000: ldc.i4.1 - IL_0001: stsfld int32 JitTest.Test::m + IL_0001: stsfld int32 JitTest_test_mutual_rec.Test::m IL_0006: ldc.i4.s 10 - IL_0008: stsfld int32 JitTest.Test::n + IL_0008: stsfld int32 JitTest_test_mutual_rec.Test::n IL_000d: ret } // end of method Test::.cctor @@ -206,6 +206,6 @@ MERGE1: } // end of class Test -} // end of namespace JitTest +} // end of namespace JitTest_test_mutual_rec //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_d.ilproj index b3367b322b414d..df6335ef2bfcd1 100644 --- a/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_r.ilproj index c862d3fe07b877..d5f22faf5bddac 100644 --- a/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/test_switch.il b/src/tests/JIT/Methodical/tailcall/test_switch.il index 92917b40c46695..78e1fdbc10d99e 100644 --- a/src/tests/JIT/Methodical/tailcall/test_switch.il +++ b/src/tests/JIT/Methodical/tailcall/test_switch.il @@ -8,9 +8,9 @@ .assembly test_switch { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_test_switch { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .field private static int32 m @@ -18,22 +18,22 @@ .method private hidebysig static int32 Main1() il managed { .maxstack 4 - tail. call int32 JitTest.Test::Main2() + tail. call int32 JitTest_test_switch.Test::Main2() ret } .method private hidebysig static int32 Main2() il managed { .maxstack 4 - tail. call int32 JitTest.Test::Main3() + tail. call int32 JitTest_test_switch.Test::Main3() ret } .method private hidebysig static int32 Main3() il managed { .maxstack 4 - tail. call int32 JitTest.Test::Main() + tail. call int32 JitTest_test_switch.Test::Main() ret } - .method private hidebysig static int32 Main() il managed + .method public hidebysig static int32 Main() il managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 @@ -43,11 +43,11 @@ .locals (int32 V_0) ldc.i4.1 call void [System.Runtime.Extensions]System.Environment::set_ExitCode(int32) - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_switch.Test::n ldc.i4.1 bne.un.s IL_0047 - ldsfld int32 JitTest.Test::m + ldsfld int32 JitTest_test_switch.Test::m ldc.i4 0x375f00 bne.un.s IL_0029 @@ -58,7 +58,7 @@ IL_0029: ldstr "FAILED: 10! != " - ldsflda int32 JitTest.Test::m + ldsflda int32 JitTest_test_switch.Test::m call instance class System.String [mscorlib]System.Int32::ToString() call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) call void [System.Console]System.Console::WriteLine(class System.String) @@ -66,31 +66,31 @@ IL_0029: ret IL_0047: - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_switch.Test::n ldc.i4.1 beq MERGE - ldsfld int32 JitTest.Test::m - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_switch.Test::m + ldsfld int32 JitTest_test_switch.Test::n dup ldc.i4.1 sub - stsfld int32 JitTest.Test::n + stsfld int32 JitTest_test_switch.Test::n mul - stsfld int32 JitTest.Test::m + stsfld int32 JitTest_test_switch.Test::m MERGE: - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_switch.Test::n switch (CASE1, CASE2, CASE3) - ldftn int32 JitTest.Test::Main() + ldftn int32 JitTest_test_switch.Test::Main() br.s MERGE1 CASE1: - ldftn int32 JitTest.Test::Main1() + ldftn int32 JitTest_test_switch.Test::Main1() br.s MERGE1 CASE2: - ldftn int32 JitTest.Test::Main2() + ldftn int32 JitTest_test_switch.Test::Main2() br.s MERGE1 CASE3: - ldftn int32 JitTest.Test::Main3() + ldftn int32 JitTest_test_switch.Test::Main3() MERGE1: tail. calli int32() ret @@ -102,9 +102,9 @@ MERGE1: // Code size 14 (0xe) .maxstack 8 IL_0000: ldc.i4.1 - IL_0001: stsfld int32 JitTest.Test::m + IL_0001: stsfld int32 JitTest_test_switch.Test::m IL_0006: ldc.i4.s 10 - IL_0008: stsfld int32 JitTest.Test::n + IL_0008: stsfld int32 JitTest_test_switch.Test::n IL_000d: ret } // end of method Test::.cctor @@ -120,6 +120,6 @@ MERGE1: } // end of class Test -} // end of namespace JitTest +} // end of namespace JitTest_test_switch //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/test_switch_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_switch_il_d.ilproj index dda8bfcc190a64..ba2c5a2e219342 100644 --- a/src/tests/JIT/Methodical/tailcall/test_switch_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_switch_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/test_switch_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_switch_il_r.ilproj index 0a7b7d0525c82d..9432aec2cec281 100644 --- a/src/tests/JIT/Methodical/tailcall/test_switch_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_switch_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/test_virt.il b/src/tests/JIT/Methodical/tailcall/test_virt.il index 6cf8067e7b5271..c06597d283617a 100644 --- a/src/tests/JIT/Methodical/tailcall/test_virt.il +++ b/src/tests/JIT/Methodical/tailcall/test_virt.il @@ -8,26 +8,21 @@ .assembly test_virt { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_test_virt { - .class private auto ansi beforefieldinit TestClass extends [mscorlib]System.Object + .class public auto ansi beforefieldinit TestClass extends [mscorlib]System.Object { .field private static int32 m .field private static int32 n .method private hidebysig virtual instance int32 Main() il managed { - .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( - 01 00 00 00 - ) .maxstack 4 .locals (int32 V_0) - ldc.i4.1 - call void [System.Runtime.Extensions]System.Environment::set_ExitCode(int32) - ldsfld int32 JitTest.TestClass::n + ldsfld int32 JitTest_test_virt.TestClass::n ldc.i4.1 bne.un.s IL_0047 - ldsfld int32 JitTest.TestClass::m + ldsfld int32 JitTest_test_virt.TestClass::m ldc.i4 0x375f00 bne.un.s IL_0029 @@ -38,7 +33,7 @@ IL_0029: ldstr "FAILED: 10! != " - ldsflda int32 JitTest.TestClass::m + ldsflda int32 JitTest_test_virt.TestClass::m call instance class System.String [mscorlib]System.Int32::ToString() call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) @@ -47,25 +42,28 @@ IL_0029: ret IL_0047: - ldsfld int32 JitTest.TestClass::m - ldsfld int32 JitTest.TestClass::n + ldsfld int32 JitTest_test_virt.TestClass::m + ldsfld int32 JitTest_test_virt.TestClass::n dup ldc.i4.1 sub - stsfld int32 JitTest.TestClass::n + stsfld int32 JitTest_test_virt.TestClass::n mul - stsfld int32 JitTest.TestClass::m + stsfld int32 JitTest_test_virt.TestClass::m ldarg.0 - tail. call instance int32 JitTest.TestClass::Main() + tail. call instance int32 JitTest_test_virt.TestClass::Main() ret } // end of method Test::Main - .method private hidebysig static int32 Main1() il managed + .method public hidebysig static int32 Main1() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 4 - newobj instance void JitTest.TestClass::.ctor() - tail. callvirt instance int32 JitTest.TestClass::Main() + newobj instance void JitTest_test_virt.TestClass::.ctor() + tail. callvirt instance int32 JitTest_test_virt.TestClass::Main() ret } .method private hidebysig specialname rtspecialname static @@ -74,9 +72,9 @@ IL_0047: // Code size 14 (0xe) .maxstack 8 IL_0000: ldc.i4.1 - IL_0001: stsfld int32 JitTest.TestClass::m + IL_0001: stsfld int32 JitTest_test_virt.TestClass::m IL_0006: ldc.i4.s 10 - IL_0008: stsfld int32 JitTest.TestClass::n + IL_0008: stsfld int32 JitTest_test_virt.TestClass::n IL_000d: ret } // end of method Test::.cctor @@ -92,6 +90,6 @@ IL_0047: } // end of class Test -} // end of namespace JitTest +} // end of namespace JitTest_test_virt //*********** DISASSEMBLY COMPLETE *********************** diff --git a/src/tests/JIT/Methodical/tailcall/test_virt_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_virt_il_d.ilproj index 09c397bb173a40..e86439fcf7034c 100644 --- a/src/tests/JIT/Methodical/tailcall/test_virt_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_virt_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/test_virt_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_virt_il_r.ilproj index 3b41da7f024463..57e9e93e8fcb3d 100644 --- a/src/tests/JIT/Methodical/tailcall/test_virt_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_virt_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/test_void.il b/src/tests/JIT/Methodical/tailcall/test_void.il index 52b6821860a550..ccb19cadd62f3a 100644 --- a/src/tests/JIT/Methodical/tailcall/test_void.il +++ b/src/tests/JIT/Methodical/tailcall/test_void.il @@ -8,65 +8,74 @@ .assembly test_void { } .assembly extern xunit.core {} -.namespace JitTest +.namespace JitTest_test_void { - .class private auto ansi beforefieldinit Test extends [mscorlib]System.Object + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .field private static int32 m .field private static int32 n + .field private static int32 returnValue .method private hidebysig static void Main() il managed { - .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( - 01 00 00 00 - ) - .entrypoint .maxstack 4 .locals (int32 V_0) - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_void.Test::n ldc.i4.1 bne.un.s IL_0047 - ldsfld int32 JitTest.Test::m + ldsfld int32 JitTest_test_void.Test::m ldc.i4 0x375f00 bne.un.s IL_0029 ldstr "PASSED: 10! == 3628800" call void [System.Console]System.Console::WriteLine(class System.String) ldc.i4.s 100 - call void [System.Runtime.Extensions]System.Environment::Exit(int32) + stsfld int32 JitTest_test_void.Test::returnValue ret IL_0029: ldstr "FAILED: 10! != " - ldsflda int32 JitTest.Test::m + ldsflda int32 JitTest_test_void.Test::m call instance class System.String [mscorlib]System.Int32::ToString() call class System.String [mscorlib]System.String::Concat(class System.String, class System.String) call void [System.Console]System.Console::WriteLine(class System.String) ldc.i4.s 101 - call void [System.Runtime.Extensions]System.Environment::Exit(int32) + stsfld int32 JitTest_test_void.Test::returnValue ret IL_0047: - ldsfld int32 JitTest.Test::m - ldsfld int32 JitTest.Test::n + ldsfld int32 JitTest_test_void.Test::m + ldsfld int32 JitTest_test_void.Test::n dup ldc.i4.1 sub - stsfld int32 JitTest.Test::n + stsfld int32 JitTest_test_void.Test::n mul - stsfld int32 JitTest.Test::m - tail. call void JitTest.Test::Main() + stsfld int32 JitTest_test_void.Test::m + tail. call void JitTest_test_void.Test::Main() ret } + .method public hidebysig static int32 TestEntrypoint() il managed + { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) + .entrypoint + .maxstack 4 + call void JitTest_test_void.Test::Main() + ldsfld int32 JitTest_test_void.Test::returnValue + ret + } + .method private hidebysig specialname rtspecialname static void .cctor() il managed { .maxstack 8 IL_0000: ldc.i4.1 - IL_0001: stsfld int32 JitTest.Test::m + IL_0001: stsfld int32 JitTest_test_void.Test::m IL_0006: ldc.i4.s 10 - IL_0008: stsfld int32 JitTest.Test::n + IL_0008: stsfld int32 JitTest_test_void.Test::n IL_000d: ret } diff --git a/src/tests/JIT/Methodical/tailcall/test_void_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_void_il_d.ilproj index 8317f0294fd447..82c54d2792983f 100644 --- a/src/tests/JIT/Methodical/tailcall/test_void_il_d.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_void_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Methodical/tailcall/test_void_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_void_il_r.ilproj index 66b3dd1f0c2b5b..0f1e5af140bb14 100644 --- a/src/tests/JIT/Methodical/tailcall/test_void_il_r.ilproj +++ b/src/tests/JIT/Methodical/tailcall/test_void_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Methodical/tailcall/widen.cs b/src/tests/JIT/Methodical/tailcall/widen.cs index 7fb02766d7796f..c81b8824f42bd7 100644 --- a/src/tests/JIT/Methodical/tailcall/widen.cs +++ b/src/tests/JIT/Methodical/tailcall/widen.cs @@ -1,13 +1,15 @@ using System; using System.Runtime.CompilerServices; +using Xunit; -public class Program +public class Program_widen { // Random field we assign some bogus values to to trick the inliner below. // We cannot use NoInlining as the runtime disables tailcalls from such functions. private static int s_val; - public static int Main() + [Fact] + public static int TestEntrypoint() { bool result = true; Console.Write("Test1U1S: "); diff --git a/src/tests/JIT/Methodical/tailcall/widen.csproj b/src/tests/JIT/Methodical/tailcall/widen_r.csproj similarity index 74% rename from src/tests/JIT/Methodical/tailcall/widen.csproj rename to src/tests/JIT/Methodical/tailcall/widen_r.csproj index e656204a0c1a2f..2418344ad9a184 100644 --- a/src/tests/JIT/Methodical/tailcall/widen.csproj +++ b/src/tests/JIT/Methodical/tailcall/widen_r.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/build.sh b/src/tests/build.sh index 40745ddde67c97..ae26724f9882fe 100755 --- a/src/tests/build.sh +++ b/src/tests/build.sh @@ -293,8 +293,6 @@ export __ProjectDir __SkipTestWrappers=0 __BuildTestWrappersOnly=0 __Compiler=clang -__CompilerMajorVersion= -__CompilerMinorVersion= __ConfigureOnly=0 __CopyNativeProjectsAfterCombinedTestBuild=true __CopyNativeTestBinaries=0 @@ -394,7 +392,7 @@ if [[ "$__RebuildTests" -ne 0 ]]; then echo "Removing test build dir: ${__TestBinDir}" rm -rf "${__TestBinDir}" echo "Removing test intermediate dir: ${__TestIntermediatesDir}" - rm -rf "${__TestIntermediatesDir}" + rm -rf "${__TestIntermediatesDir}" fi build_Tests diff --git a/src/tests/issues.targets b/src/tests/issues.targets index e1c3b9528933d5..5097f3e87e5dda 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -1067,10 +1067,10 @@ https://github.com/dotnet/runtimelab/issues/155: RuntimeHelpers.InitializeArray - + https://github.com/dotnet/runtimelab/issues/188 - + https://github.com/dotnet/runtimelab/issues/188 @@ -2496,10 +2496,10 @@ needs triage - + https://github.com/dotnet/runtime/issues/47624 - + https://github.com/dotnet/runtime/issues/47624 diff --git a/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/x64Vex.csproj b/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/x64Vex.csproj index 80d05ff9cb9f76..b3a7e88134f8ed 100644 --- a/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/x64Vex.csproj +++ b/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/x64Vex.csproj @@ -31,6 +31,12 @@ $(BashCLRTestPreCommands) exit 0 fi fi + if [[ "$OSTYPE" == "linux"* ]]; then + if ! grep -q '^flags.*avx2' /proc/cpuinfo 2>/dev/null; then + echo No support for AVX2, test not applicable. + exit 0 + fi + fi ]]> diff --git a/src/tests/nativeaot/SmokeTests/Reflection/Reflection.cs b/src/tests/nativeaot/SmokeTests/Reflection/Reflection.cs index ee88635a8b65d1..e8cf15ce7cf855 100644 --- a/src/tests/nativeaot/SmokeTests/Reflection/Reflection.cs +++ b/src/tests/nativeaot/SmokeTests/Reflection/Reflection.cs @@ -27,6 +27,7 @@ private static int Main() // // Tests for dependency graph in the compiler // + TestRunClassConstructor.Run(); #if !OPTIMIZED_MODE_WITHOUT_SCANNER TestContainment.Run(); TestInterfaceMethod.Run(); @@ -1655,6 +1656,26 @@ public static void Run() } } + class TestRunClassConstructor + { + static class TypeWithNoStaticFieldsButACCtor + { + static TypeWithNoStaticFieldsButACCtor() + { + s_cctorRan = true; + } + } + + private static bool s_cctorRan; + + public static void Run() + { + RuntimeHelpers.RunClassConstructor(typeof(TypeWithNoStaticFieldsButACCtor).TypeHandle); + if (!s_cctorRan) + throw new Exception(); + } + } + #region Helpers private static Type GetTestType(string testName, string typeName) diff --git a/src/tests/readytorun/multifolder/multifolder.csproj b/src/tests/readytorun/multifolder/multifolder.csproj index b159a53339245b..99c6f0ff9f12c9 100644 --- a/src/tests/readytorun/multifolder/multifolder.csproj +++ b/src/tests/readytorun/multifolder/multifolder.csproj @@ -53,6 +53,10 @@ $(CLRTestBatchPreCommands) set __Command=%__Command% "%CORE_ROOT%\crossgen2\crossgen2.dll" set __Command=%__Command% @"%__ResponseFile%" + REM work around problems in 6.0 OSR + set "COMPlus_TC_OnStackReplacement=" + set "COMPlus_TC_PartialCompilation=" + echo Response file: %__ResponseFile% type %__ResponseFile% echo ------------------ @@ -85,9 +89,8 @@ $(BashCLRTestPreCommands) echo $__OutputDir/../FolderA/FolderA/FolderA.dll>>$__ResponseFile echo $__OutputDir/../FolderB/FolderB/FolderB.dll>>$__ResponseFile - # Suppress GC standalone mode for the duration of Crossgen2 execution - local gcstandaloneModeToRestore=$COMPlus_GCName; - unset COMPlus_GCName + # Suppress some COMPlus variables for the duration of Crossgen2 execution + export -n COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun COMPlus_TC_OnStackReplacement COMPlus_TC_PartialCompilation __Command=$_DebuggerFullPath # Tests run locally need __TestDotNetCmd (set by runtest.py) or a compatible 5.0 dotnet runtime in the path @@ -105,9 +108,10 @@ $(BashCLRTestPreCommands) echo Running crossgen2: $__Command $__Command + export COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun COMPlus_TC_OnStackReplacement COMPlus_TC_PartialCompilation + ExePath=multifolder/multifolder.dll export COMPlus_NativeImageSearchPaths=$__OutputDir - export COMPlus_GCName=$gcstandaloneModeToRestore ]]>