Morph ByRef args of SIMD field assign

Fix #19674

diff --git a/src/jit/morph.cpp b/src/jit/morph.cpp
index 7935a82..3eb833e 100644 (file)
--- a/src/jit/morph.cpp
+++ b/src/jit/morph.cpp
@@ -11184,9 +11184,23 @@ GenTree* Compiler::fgMorphFieldAssignToSIMDIntrinsicSet(GenTree* tree)
 
         GenTree* target = gtClone(simdOp1Struct);
         assert(target != nullptr);
-        GenTree* simdTree = gtNewSIMDNode(target->gtType, simdOp1Struct, op2, simdIntrinsicID, baseType, simdSize);
-        tree->gtOp.gtOp1  = target;
-        tree->gtOp.gtOp2  = simdTree;
+        var_types simdType = target->gtType;
+        GenTree*  simdTree = gtNewSIMDNode(simdType, simdOp1Struct, op2, simdIntrinsicID, baseType, simdSize);
+
+        tree->gtOp.gtOp1 = target;
+        tree->gtOp.gtOp2 = simdTree;
+
+        // fgMorphTree has already called fgMorphImplicitByRefArgs() on this assignment, but the source
+        // and target have not yet been morphed.
+        // Therefore, in case the source and/or target are now implicit byrefs, we need to call it again.
+        if (fgMorphImplicitByRefArgs(tree))
+        {
+            if (tree->gtGetOp1()->OperIsBlk())
+            {
+                assert(tree->gtGetOp1()->TypeGet() == simdType);
+                fgMorphBlkToInd(tree->gtGetOp1()->AsBlk(), simdType);
+            }
+        }
 #ifdef DEBUG
         tree->gtDebugFlags |= GTF_DEBUG_NODE_MORPHED;
 #endif

diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_19674/GitHub_19674.cs b/tests/src/JIT/Regression/JitBlue/GitHub_19674/GitHub_19674.cs
new file mode 100644 (file)
index 0000000..965b131
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_19674/GitHub_19674.cs
@@ -0,0 +1,54 @@
+// 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.Numerics;
+using System.Runtime.CompilerServices;
+
+static class GitHub_19674
+{
+    static int Main(string[] args)
+    {
+        int returnVal = 100;
+        try
+        {
+            var vec0 = new Vector3(0, 0, 0);
+            Test1(vec0);
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine("FAIL Test1: " + e.Message);
+            returnVal = -1;
+        }
+        try
+        {
+            var vec0 = new Vector3(0, 0, 0);
+            Test2(vec0);
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine("FAIL Test1: " + e.Message);
+            returnVal = -1;
+        }
+        if (returnVal == 100)
+        {
+            Console.WriteLine("PASS");
+        }
+        return returnVal;
+    }
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    static void Test1(Vector3 vec0)
+    {
+        // This was causing an assert (in Checked) or an access violation on the `new` line.
+        vec0.X = -vec0.X;
+        new Vector3(vec0.X, vec0.Y, vec0.Z);
+    }
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    static void Test2(Vector3 vec0)
+    {
+        // This was causing an assert (in Checked) or a null reference exception on the `new` line
+        vec0.X = 0;
+        new Vector3(vec0.X, vec0.Y, vec0.Z);
+    }
+}

diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_19674/GitHub_19674.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_19674/GitHub_19674.csproj
new file mode 100644 (file)
index 0000000..e191e01
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_19674/GitHub_19674.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>None</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildProjectName).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>