* Fix ARM's genPutArgStk codegen
When the OBJ node wraps a LCL_VAR node the code uses the type information (struct size, GC layout) from LclVarDsc. This is not always correct because the OBJ may actually have a different struct type due to type reinterpretation (e.g. Unsafe.As<X, Y>).
* Fix genPutArgStk comment
Commit migrated from https://github.com/dotnet/coreclr/commit/
8ce1e716841e4a9d6c54be45eb75e740872a4b3e
BYTE* gcPtrs = gcPtrArray;
unsigned gcPtrCount; // The count of GC pointers in the struct
- int structSize;
+ unsigned structSize;
bool isHfa;
// This is the varNum for our load operations,
hiReg = addrReg;
}
#endif // _TARGET_ARM64_
+ }
+ if (source->OperIs(GT_OBJ))
+ {
+ // If the source is an OBJ node then we need to use the type information
+ // it provides (size and GC layout) even if the node wraps a lclvar. Due
+ // to struct reinterpretation (e.g. Unsafe.As<X, Y>) it is possible that
+ // the OBJ node has a different type than the lclvar.
CORINFO_CLASS_HANDLE objClass = source->gtObj.gtClass;
structSize = compiler->info.compCompHnd->getClassSize(objClass);
- isHfa = compiler->IsHfa(objClass);
+
+ // The codegen code below doesn't have proper support for struct sizes
+ // that are not multiple of the slot size. Call arg morphing handles this
+ // case by copying non-local values to temporary local variables.
+ // More generally, we can always round up the struct size when the OBJ node
+ // wraps a local variable because the local variable stack allocation size
+ // is also rounded up to be a multiple of the slot size.
+ if (varNode != nullptr)
+ {
+ structSize = roundUp(structSize, TARGET_POINTER_SIZE);
+ }
+ else
+ {
+ assert((structSize % TARGET_POINTER_SIZE) == 0);
+ }
+
+ isHfa = compiler->IsHfa(objClass);
+
#ifdef _TARGET_ARM64_
+ // On ARM32, Lowering places the correct GC layout information in the
+ // GenTreePutArgStk node and the code above already use that. On ARM64,
+ // this information is not available (in order to keep GenTreePutArgStk
+ // nodes small) and we need to retrieve it from the VM here.
gcPtrCount = compiler->info.compCompHnd->getClassGClayout(objClass, &gcPtrs[0]);
#endif
}
--- /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.InteropServices;
+
+class Program
+{
+ [StructLayout(LayoutKind.Sequential)]
+ struct S
+ {
+ public uint i0;
+ public uint i1;
+ public uint i2;
+ public uint i3;
+
+ public int i4;
+ public int i5;
+ }
+
+ [StructLayout(LayoutKind.Sequential)]
+ struct S16
+ {
+ public uint i0;
+ public uint i1;
+ public uint i2;
+ public uint i3;
+ }
+
+ static int Main()
+ {
+ S s = new S();
+ s.i0 = 0x12345678;
+ s.i1 = 0x87654321;
+ return Test(s);
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ static int Call(int r0, int r1, int r2, int r3, int r4, int r5, int r6, S16 s)
+ {
+ return (s.i0 == 0x12345678 && s.i1 == 0x87654321) ? 100 : 1;
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ static void Escape<T>(ref T t)
+ {
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ static int Test(S p)
+ {
+ S s = p;
+ Escape(ref s);
+ return Call(0, 1, 2, 3, 4, 5, 6, Unsafe.As<S, S16>(ref s));
+ }
+}
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+ <OutputType>Exe</OutputType>
+ <DebugType></DebugType>
+ <Optimize>True</Optimize>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Include="$(MSBuildProjectName).cs" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+ <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>