When `impSIMDPopStack` pops a struct value, it needs to retype the `OBJ` if it exists and doesn't match.
Fix #22850
// Normalizes TYP_STRUCT value in case of GT_CALL, GT_RET_EXPR and arg nodes.
//
// Arguments:
-// type - the type of value that the caller expects to be popped off the stack.
-// expectAddr - if true indicates we are expecting type stack entry to be a TYP_BYREF.
-// structType - the class handle to use when normalizing if it is not the same as the stack entry class handle;
-// this can happen for certain scenarios, such as folding away a static cast, where we want the
-// value popped to have the type that would have been returned.
+// type - the type of value that the caller expects to be popped off the stack.
+// expectAddr - if true indicates we are expecting type stack entry to be a TYP_BYREF.
+// structHandle - the class handle to use when normalizing if it is not the same as the stack entry class handle;
+// this can happen for certain scenarios, such as folding away a static cast, where we want the
+// value popped to have the type that would have been returned.
//
// Notes:
// If the popped value is a struct, and the expected type is a simd type, it will be set
// to that type, otherwise it will assert if the type being popped is not the expected type.
-GenTree* Compiler::impSIMDPopStack(var_types type, bool expectAddr, CORINFO_CLASS_HANDLE structType)
+GenTree* Compiler::impSIMDPopStack(var_types type, bool expectAddr, CORINFO_CLASS_HANDLE structHandle)
{
StackEntry se = impPopStack();
typeInfo ti = se.seTypeInfo;
// If we have a ldobj of a SIMD local we need to transform it.
if (tree->OperGet() == GT_OBJ)
{
- GenTree* addr = tree->gtOp.gtOp1;
- if ((addr->OperGet() == GT_ADDR) && isSIMDTypeLocal(addr->gtOp.gtOp1))
+ if (tree->AsObj()->gtClass != structHandle)
{
- tree = addr->gtOp.gtOp1;
+ // In this case we need to retain the GT_OBJ to retype the value.
+ tree->AsObj()->gtClass = structHandle;
+ }
+ else
+ {
+ GenTree* addr = tree->gtOp.gtOp1;
+ if ((addr->OperGet() == GT_ADDR) && isSIMDTypeLocal(addr->gtOp.gtOp1))
+ {
+ tree = addr->gtOp.gtOp1;
+ }
}
}
{
assert(ti.IsType(TI_STRUCT));
- if (structType == nullptr)
+ if (structHandle == nullptr)
{
- structType = ti.GetClassHandleForValueClass();
+ structHandle = ti.GetClassHandleForValueClass();
}
- tree = impNormStructVal(tree, structType, (unsigned)CHECK_SPILL_ALL);
+ tree = impNormStructVal(tree, structHandle, (unsigned)CHECK_SPILL_ALL);
}
// Now set the type of the tree to the specialized SIMD struct type, if applicable.
--- /dev/null
+// 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;
+using System.Runtime.Intrinsics;
+using System.Runtime.Intrinsics.X86;
+
+public static class GitHub_22850
+{
+ static int Main(string[] args)
+ {
+ return test128((byte)90) ? 100 : -1;
+ }
+
+ static unsafe bool test128(int i)
+ {
+ Vector128<int> v = Vector128.Create(i);
+ return MyEquals(ref v, Vector128.Create(i));
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ public static bool MyEquals(ref Vector128<int> left, Vector128<int> right)
+ {
+ if (Sse2.IsSupported)
+ {
+ Vector128<byte> result = MyCompareEqual(left.AsByte(), right.AsByte());
+ return Sse2.MoveMask(result) == 0b1111_1111_1111_1111; // We have one bit per element
+ }
+
+ return true;
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ public static Vector128<byte> MyCompareEqual(this Vector128<byte> left, Vector128<byte> right)
+ {
+ return Sse2.CompareEqual(left, right);
+ }
+}
+
+
--- /dev/null
+<?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>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{2649FAFE-07BF-4F93-8120-BA9A69285ABB}</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>
+ <PropertyGroup>
+ <DebugType>None</DebugType>
+ <Optimize>False</Optimize>
+ <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+ </PropertyGroup>
+ <ItemGroup>
+ <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+ <Visible>False</Visible>
+ </CodeAnalysisDependentAssemblyPaths>
+ </ItemGroup>
+ <ItemGroup>
+ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="$(MSBuildProjectName).cs" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+ <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>