Imported Upstream version 1.1.0upstream/1.1.0

2 files changed, 136 insertions, 0 deletions

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.il b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.il
new file mode 100644
index 0000000000..df3ac0fdc5
--- /dev/null
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.il
@@ -0,0 +1,96 @@
+// 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.
+
+// ctor_merge2.il
+//
+// NEGATIVE
+// merge of instance and static method
+
+.assembly extern mscorlib { }
+.assembly extern System.Console
+{
+  .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
+  .ver 4:0:0:0
+}
+.assembly ctor_merge2 { }
+.class public auto ansi beforefieldinit TestClass
+       extends [mscorlib]System.Object
+{
+  .field private static bool _sel
+  .field private bool dummy
+  .method public hidebysig static void
+          DelegateFunc1(int32) il managed
+  {
+    .maxstack  3
+    IL_0000:  ldstr      "DelegateFunc1"
+    IL_0005:  call       void [System.Console]System.Console::WriteLine(class System.String)
+    IL_001a:  ret
+  }
+  .method public hidebysig instance void DelegateFunc2(int32) il managed
+  {
+    .maxstack  8
+    .locals (int32[] V_0)
+    ldarg.0
+    castclass [mscorlib]System.Object
+    pop
+    
+    IL_0000:  ldstr      "DelegateFunc2"
+    IL_0005:  call       void [System.Console]System.Console::WriteLine(class System.String)
+    IL_000f:  ret
+  }
+  .method private hidebysig static bool sel() il managed
+  {
+    .maxstack  2
+    .locals (bool V_0)
+    IL_0000:  ldsfld     bool TestClass::_sel
+    IL_0005:  ldc.i4.0
+    IL_0006:  ceq
+    IL_0008:  stsfld     bool TestClass::_sel
+    IL_000d:  ldsfld     bool TestClass::_sel
+    IL_0012:  stloc.0
+    IL_0013:  br.s       IL_0015
+    IL_0015:  ldloc.0
+    IL_0016:  ret
+  }
+  .method public hidebysig static int32 Main(class System.String[] args) il managed
+  {
+    .entrypoint
+    .maxstack  8
+    newobj     instance void TestClass::.ctor()
+	ldc.i4.1
+    dup
+    brfalse.s   BRANCH
+    ldftn      instance void TestClass::DelegateFunc2(int32)
+    pop
+	pop
+    br.s       MERGE
+
+BRANCH:
+	pop
+    ldftn      void TestClass::DelegateFunc1(int32)
+    pop
+
+MERGE:
+	pop
+
+	ldc.i4 100    
+    ret
+  }
+  .method private hidebysig specialname rtspecialname static 
+          void .cctor() il managed
+  {
+    .maxstack  8
+    IL_0000:  ldc.i4.0
+    IL_0001:  stsfld     bool TestClass::_sel
+    IL_0006:  ret
+  }
+  .method public hidebysig specialname rtspecialname 
+          instance void .ctor() il managed
+  {
+    .maxstack  8
+    IL_0000:  ldarg.0
+    IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
+    IL_0006:  ret
+  }
+}
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.ilproj
new file mode 100644
index 0000000000..dbdd1a9090
--- /dev/null
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.ilproj
@@ -0,0 +1,40 @@
+<?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>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
+  </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>
+    
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="b66620.il" />
+  </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