diff options
| -rw-r--r-- | src/vm/callingconvention.h | 2 | ||||
| -rw-r--r-- | tests/src/reflection/regression/hfa/hfaParam.cs | 60 | ||||
| -rw-r--r-- | tests/src/reflection/regression/hfa/hfaParam.csproj | 36 |
3 files changed, 97 insertions, 1 deletions
diff --git a/src/vm/callingconvention.h b/src/vm/callingconvention.h index 59553fb6e5..b66279c398 100644 --- a/src/vm/callingconvention.h +++ b/src/vm/callingconvention.h @@ -970,7 +970,7 @@ int ArgIteratorTemplate<ARGITERATOR_BASE>::GetNextOffset() m_argSize = argSize; m_argTypeHandle = thValueType; -#if defined(UNIX_AMD64_ABI) +#if defined(UNIX_AMD64_ABI) || defined (_TARGET_ARM64_) m_hasArgLocDescForStructInRegs = false; #endif diff --git a/tests/src/reflection/regression/hfa/hfaParam.cs b/tests/src/reflection/regression/hfa/hfaParam.cs new file mode 100644 index 0000000000..2368a03145 --- /dev/null +++ b/tests/src/reflection/regression/hfa/hfaParam.cs @@ -0,0 +1,60 @@ +// 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; + +public struct HFAStruct +{ + public float f1; + public float f2; + public float f3; +} + +public struct IntStruct +{ + public int i1; + public int i2; + public int i3; +} + + +public class Test +{ + public static int TestMethod(HFAStruct hfaStruct, IntStruct intStruct) + { + if (hfaStruct.f1 != 1.0f) + return 0; + if (hfaStruct.f2 != 2.0f) + return 1; + if (hfaStruct.f3 != 3.0f) + return 2; + if (intStruct.i1 != 1) + return 3; + if (intStruct.i2 != 2) + return 4; + if (intStruct.i3 != 3) + return 5; + + return 100; + } + + public static int Main() + { + HFAStruct hfaStruct = new HFAStruct(); + hfaStruct.f1 = 1.0f; + hfaStruct.f2 = 2.0f; + hfaStruct.f3 = 3.0f; + + IntStruct intStruct = new IntStruct(); + intStruct.i1 = 1; + intStruct.i2 = 2; + intStruct.i3 = 3; + + int result = TestMethod(hfaStruct, intStruct); + if (result != 100) + return -result; + + return (int)typeof(Test).GetMethod("TestMethod").Invoke(null, new object[] {hfaStruct, intStruct}); + } +} diff --git a/tests/src/reflection/regression/hfa/hfaParam.csproj b/tests/src/reflection/regression/hfa/hfaParam.csproj new file mode 100644 index 0000000000..d7711ba240 --- /dev/null +++ b/tests/src/reflection/regression/hfa/hfaParam.csproj @@ -0,0 +1,36 @@ +<?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>{CE893CE4-177E-47D3-A5DA-DF4D64E76812}</ProjectGuid> + <OutputType>Exe</OutputType> + <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <CLRTestKind>BuildAndRun</CLRTestKind> + <CLRTestPriority>1</CLRTestPriority> + </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> + <ItemGroup> + <!-- Add Compile Object Here --> + <Compile Include="hfaParam.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 |