diff options
| -rw-r--r-- | src/jit/lower.cpp | 4 | ||||
| -rw-r--r-- | tests/src/JIT/Regression/JitBlue/GitHub_13486/GitHub_13486.cs | 33 | ||||
| -rw-r--r-- | tests/src/JIT/Regression/JitBlue/GitHub_13486/GitHub_13486.csproj | 25 |
3 files changed, 60 insertions, 2 deletions
diff --git a/src/jit/lower.cpp b/src/jit/lower.cpp index f40c4aa5a9..6c06480d80 100644 --- a/src/jit/lower.cpp +++ b/src/jit/lower.cpp @@ -518,7 +518,7 @@ GenTree* Lowering::LowerSwitch(GenTree* node) assert(temp->gtOper == GT_LCL_VAR); unsigned tempLclNum = temp->gtLclVarCommon.gtLclNum; LclVarDsc* tempVarDsc = comp->lvaTable + tempLclNum; - var_types tempLclType = tempVarDsc->TypeGet(); + var_types tempLclType = temp->TypeGet(); BasicBlock* defaultBB = jumpTab[jumpCnt - 1]; BasicBlock* followingBB = originalSwitchBB->bbNext; @@ -548,7 +548,7 @@ GenTree* Lowering::LowerSwitch(GenTree* node) // both GT_SWITCH lowering code paths. // This condition is of the form: if (temp > jumpTableLength - 2){ goto jumpTable[jumpTableLength - 1]; } GenTreePtr gtDefaultCaseCond = comp->gtNewOperNode(GT_GT, TYP_INT, comp->gtNewLclvNode(tempLclNum, tempLclType), - comp->gtNewIconNode(jumpCnt - 2, tempLclType)); + comp->gtNewIconNode(jumpCnt - 2, genActualType(tempLclType))); // Make sure we perform an unsigned comparison, just in case the switch index in 'temp' // is now less than zero 0 (that would also hit the default case). diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_13486/GitHub_13486.cs b/tests/src/JIT/Regression/JitBlue/GitHub_13486/GitHub_13486.cs new file mode 100644 index 0000000000..cb4bd4e2b6 --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_13486/GitHub_13486.cs @@ -0,0 +1,33 @@ +// 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.Runtime.CompilerServices; + +class Program +{ + enum LongEnum : long + { + Option0, Option1, Option2 + } + + [MethodImpl(MethodImplOptions.NoInlining)] + static string Test(LongEnum v) + { + string s; + switch (v) + { + case LongEnum.Option0: s = "Option0"; break; + case LongEnum.Option1: s = "Option1"; break; + case LongEnum.Option2: s = "Option2"; break; + default: throw new Exception(); + } + return s; + } + + static int Main() + { + return (Test(LongEnum.Option0) == "Option0") ? 100 : 1; + } +} diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_13486/GitHub_13486.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_13486/GitHub_13486.csproj new file mode 100644 index 0000000000..4bf984a832 --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_13486/GitHub_13486.csproj @@ -0,0 +1,25 @@ +<?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> + <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> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + </PropertyGroup> + <PropertyGroup> + <DebugType></DebugType> + <Optimize>False</Optimize> + </PropertyGroup> + <ItemGroup> + <Compile Include="$(MSBuildProjectName).cs" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> |