diff options
author | Jan Kotas <jkotas@microsoft.com> | 2018-01-05 14:44:18 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-05 14:44:18 -0800 |
commit | 6c12105bb8cc1821ba5d5c3d36aad609a44308e0 (patch) | |
tree | 408da7569d779ca1dc1e70fe812155a18848774c /tests | |
parent | 7a785420a57925d1ea67fa9361e1f826a7e74f2b (diff) | |
download | coreclr-6c12105bb8cc1821ba5d5c3d36aad609a44308e0.tar.gz coreclr-6c12105bb8cc1821ba5d5c3d36aad609a44308e0.tar.bz2 coreclr-6c12105bb8cc1821ba5d5c3d36aad609a44308e0.zip |
Detect ByRefLike types using attribute (#15745)
* Detect ByRefLike types using attribute and improve error messages for their invalid use
Fixes #11371 and #15458
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/Loader/classloader/regressions/GitHub_11371/Negative_ByRefLikeType.il | 186 | ||||
-rw-r--r-- | tests/src/Loader/classloader/regressions/GitHub_11371/Negative_ByRefLikeType.ilproj | 23 |
2 files changed, 209 insertions, 0 deletions
diff --git a/tests/src/Loader/classloader/regressions/GitHub_11371/Negative_ByRefLikeType.il b/tests/src/Loader/classloader/regressions/GitHub_11371/Negative_ByRefLikeType.il new file mode 100644 index 0000000000..a23128505c --- /dev/null +++ b/tests/src/Loader/classloader/regressions/GitHub_11371/Negative_ByRefLikeType.il @@ -0,0 +1,186 @@ +// 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. + +.assembly extern System.Console { } +.assembly extern System.Runtime { } +.assembly Negative_ByRefLikeType { } + +.class sequential ansi sealed beforefieldinit MyByRefLikeType + extends [System.Runtime]System.ValueType +{ + .custom instance void [System.Runtime]System.Runtime.CompilerServices.IsByRefLikeAttribute::.ctor() = ( 01 00 00 00 ) +} + +.class sequential ansi sealed beforefieldinit ByRefLikeStaticField +{ + .field private static valuetype MyByRefLikeType s +} + +.class sequential ansi sealed beforefieldinit ByRefLikeFieldInNonValueType +{ + .field private valuetype MyByRefLikeType f +} + +.class sequential ansi sealed beforefieldinit ByRefLikeFieldInNonByRefLikeType +{ + .field private valuetype MyByRefLikeType f +} + +.class public auto ansi beforefieldinit Test + extends [System.Runtime]System.Object +{ + .method private hidebysig static void ByRefLikeBoxing() cil managed + { + .maxstack 1 + .locals init (valuetype MyByRefLikeType V_0) + ldloc.0 + box valuetype MyByRefLikeType + pop + ret + } + + .method private hidebysig static void ByRefLikeStaticField() cil managed + { + .maxstack 1 + ldsfld valuetype MyByRefLikeType ByRefLikeStaticField::s + pop + ret + } + + .method private hidebysig static void ByRefLikeFieldInNonValueType() cil managed + { + .maxstack 1 + ldnull + ldfld valuetype MyByRefLikeType ByRefLikeFieldInNonValueType::f + pop + ret + } + + .method private hidebysig static void ByRefLikeFieldInNonByRefLikeType() cil managed + { + .maxstack 1 + .locals init (valuetype ByRefLikeFieldInNonByRefLikeType V_0) + ldloc.0 + ldfld valuetype MyByRefLikeType ByRefLikeFieldInNonValueType::f + pop + ret + } + + .method private hidebysig static void ByRefLikeArray() cil managed + { + .maxstack 1 + ldc.i4.1 + newarr valuetype MyByRefLikeType + pop + ret + } + + .method private hidebysig static void ByRefLikeGenericInstantiation() cil managed + { + .maxstack 1 + newobj instance void class [System.Runtime]System.Collections.Generic.List`1<valuetype MyByRefLikeType>::.ctor() + pop + ret + } + + .method public hidebysig static int32 Main() cil managed + { + .entrypoint + .maxstack 1 + + ldstr "ByRefLikeBoxing" + call void [System.Console]System.Console::WriteLine(string) + .try + { + call void Test::ByRefLikeBoxing() + leave TestFailed + } + catch [System.Runtime]System.InvalidProgramException + { + pop + leave ByRefLikeBoxing_Done + } +ByRefLikeBoxing_Done: + + ldstr "ByRefLikeStaticField" + call void [System.Console]System.Console::WriteLine(string) + .try + { + call void Test::ByRefLikeStaticField() + leave TestFailed + } + catch [System.Runtime]System.TypeLoadException + { + pop + leave ByRefLikeStaticField_Done + } +ByRefLikeStaticField_Done: + + ldstr "ByRefLikeFieldInNonValueType" + call void [System.Console]System.Console::WriteLine(string) + .try + { + call void Test::ByRefLikeFieldInNonValueType() + leave TestFailed + } + catch [System.Runtime]System.TypeLoadException + { + pop + leave ByRefLikeFieldInNonValueType_Done + } +ByRefLikeFieldInNonValueType_Done: + + ldstr "ByRefLikeFieldInNonByRefLikeType" + call void [System.Console]System.Console::WriteLine(string) + .try + { + call void Test::ByRefLikeFieldInNonByRefLikeType() + leave TestFailed + } + catch [System.Runtime]System.TypeLoadException + { + pop + leave ByRefLikeFieldInNonByRefLikeType_Done + } +ByRefLikeFieldInNonByRefLikeType_Done: + + ldstr "ByRefLikeArray" + call void [System.Console]System.Console::WriteLine(string) + .try + { + call void Test::ByRefLikeArray() + leave TestFailed + } + catch [System.Runtime]System.TypeLoadException + { + pop + leave ByRefLikeArray_Done + } +ByRefLikeArray_Done: + + ldstr "ByRefLikeGenericInstantiation" + call void [System.Console]System.Console::WriteLine(string) + .try + { + call void Test::ByRefLikeGenericInstantiation() + leave TestFailed + } + catch [System.Runtime]System.TypeLoadException + { + pop + leave ByRefLikeGenericInstantiation_Done + } +ByRefLikeGenericInstantiation_Done: + + ldstr "All Tests Passed" + call void [System.Console]System.Console::WriteLine(string) + ldc.i4.s 100 + ret + TestFailed: + ldstr "Test Failed" + call void [System.Console]System.Console::WriteLine(string) + ldc.i4.1 + ret + } +} diff --git a/tests/src/Loader/classloader/regressions/GitHub_11371/Negative_ByRefLikeType.ilproj b/tests/src/Loader/classloader/regressions/GitHub_11371/Negative_ByRefLikeType.ilproj new file mode 100644 index 0000000000..deca7f13ef --- /dev/null +++ b/tests/src/Loader/classloader/regressions/GitHub_11371/Negative_ByRefLikeType.ilproj @@ -0,0 +1,23 @@ +<?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> + <AssemblyName>Negative_ByRefLikeType</AssemblyName> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> + <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <OutputType>Exe</OutputType> + <CLRTestKind>BuildAndRun</CLRTestKind> + <CLRTestPriority>0</CLRTestPriority> + </PropertyGroup> + <ItemGroup> + <Compile Include="Negative_ByRefLikeType.il" /> + </ItemGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> |