Add a forgotten fgMorphInitBlock to fix jitstress issue. (#56893)

Sergey Andreenko · web-flow · commit 1fb151f63dca · 2021-08-05T12:47:13.000-07:00
* reenable the failing tests.

* Fix  a jitstress failure on x86.
diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp
@@ -16169,6 +16169,10 @@ void Compiler::fgMergeBlockReturn(BasicBlock* block)
             {
                 tree = fgMorphCopyBlock(tree);
             }
+            else if (tree->OperIsInitBlkOp())
+            {
+                tree = fgMorphInitBlock(tree);
+            }
 
             if (pAfterStatement == lastStmt)
             {
diff --git a/src/tests/Interop/PInvoke/Vector2_3_4/Vector2_3_4.csproj b/src/tests/Interop/PInvoke/Vector2_3_4/Vector2_3_4.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <!-- https://github.com/dotnet/runtime/issues/49189 -->
-    <JitOptimizationSensitive Condition="'$(TargetArchitecture)' == 'x86'">true</JitOptimizationSensitive>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/_il_relldobj_V.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/_il_relldobj_V.ilproj
@@ -2,8 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
-    <!-- https://github.com/dotnet/runtime/issues/49189 -->
-    <JitOptimizationSensitive Condition="'$(TargetArchitecture)' == 'x86'">true</JitOptimizationSensitive>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>

Original file line number	Diff line number	Diff line change
`@@ -16169,6 +16169,10 @@ void Compiler::fgMergeBlockReturn(BasicBlock* block)`
`16169`	`16169`	`{`
`16170`	`16170`	`tree = fgMorphCopyBlock(tree);`
`16171`	`16171`	`}`
	`16172`	`+ else if (tree->OperIsInitBlkOp())`
	`16173`	`+ {`
	`16174`	`+ tree = fgMorphInitBlock(tree);`
	`16175`	`+ }`
`16172`	`16176`
`16173`	`16177`	`if (pAfterStatement == lastStmt)`
`16174`	`16178`	`{`