diff options
author | Andy Ayers <andya@microsoft.com> | 2018-06-27 09:49:54 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-27 09:49:54 -0700 |
commit | aa00dad99dff3af496b245e6b10500a5e631a8ba (patch) | |
tree | 1275079defa8f857841f5ed3c537951f06c4ce72 /tests/src/JIT/Regression | |
parent | 373b10e0edf959665d9fdaf312b3dceb8cedbe81 (diff) | |
download | coreclr-aa00dad99dff3af496b245e6b10500a5e631a8ba.tar.gz coreclr-aa00dad99dff3af496b245e6b10500a5e631a8ba.tar.bz2 coreclr-aa00dad99dff3af496b245e6b10500a5e631a8ba.zip |
JIT: Fix bug in finally cloning caused by unsound callfinally reordering
Port of #18348 to release/2.1
We need to make sure that if we reorder a callfinally during finally cloning
that the callfinally is actually the one being targeted by the last block in
the try range.
Closes #18332. Linked issue has some more detailed notes.
Diffstat (limited to 'tests/src/JIT/Regression')
-rw-r--r-- | tests/src/JIT/Regression/JitBlue/GitHub_18332/GitHub_18332.cs | 56 | ||||
-rw-r--r-- | tests/src/JIT/Regression/JitBlue/GitHub_18332/GitHub_18332.csproj | 34 |
2 files changed, 90 insertions, 0 deletions
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_18332/GitHub_18332.cs b/tests/src/JIT/Regression/JitBlue/GitHub_18332/GitHub_18332.cs new file mode 100644 index 0000000000..57d6239d44 --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_18332/GitHub_18332.cs @@ -0,0 +1,56 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Collections.Generic; + +internal class Foo : IDisposable +{ + public void Dispose() + { + } +} + +class GitHub_18332 +{ + // In Aargh there is a finally with two distinct exit paths. + // Finally cloning may choose the non-fall through ("wibble") exit + // path to clone, and then will try to incorrectly arrange for + // that path to become the fall through. + public static string Aargh() + { + using (var foo = new Foo()) + { + foreach (var i in new List<int>()) + { + try + { + Console.WriteLine("here"); + } + catch (Exception) + { + return "wibble"; + } + } + + foreach (var i in new List<int>()) + { + } + } + + return "wobble"; + } + + public static int Main(string[] args) + { + string expected = "wobble"; + string actual = Aargh(); + if (actual != expected) + { + Console.WriteLine($"FAIL: Aargh() returns '{actual}' expected '{expected}'"); + return 0; + } + return 100; + } +} diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_18332/GitHub_18332.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_18332/GitHub_18332.csproj new file mode 100644 index 0000000000..c776f7dd22 --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_18332/GitHub_18332.csproj @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <AssemblyName>$(MSBuildProjectName)</AssemblyName> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> + <OutputType>Exe</OutputType> + <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + </PropertyGroup> + <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup> + <ItemGroup> + <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> + <Visible>False</Visible> + </CodeAnalysisDependentAssemblyPaths> + </ItemGroup> + <PropertyGroup> + <DebugType></DebugType> + <Optimize>True</Optimize> + </PropertyGroup> + <ItemGroup> + <Compile Include="GitHub_18332.cs" /> + </ItemGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> +</Project>
\ No newline at end of file |