Disable VN optimizations on arm64 because of the bug.

dotnet · Jul 29, 2021 · bc184e9 · bc184e9
1 parent 03cbaca
commit bc184e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/tests/JIT/IL_Conformance/Convert/TestConvertFromIntegral.cs b/src/tests/JIT/IL_Conformance/Convert/TestConvertFromIntegral.cs
@@ -1167,8 +1167,6 @@ static void TestConvertFromDoubleToU8()
 
         static int Main(string[] args)
         {
-            sbyte Zero = 0;
-            Debug.Assert(Zero.Equals(0));
             TestConvertFromInt4();
             TestConvertFromInt8();
             TestConvertFromFloat();

diff --git a/src/tests/JIT/IL_Conformance/Convert/TestConvertFromIntegral.csproj b/src/tests/JIT/IL_Conformance/Convert/TestConvertFromIntegral.csproj
@@ -7,6 +7,17 @@
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetArchitecture)' == 'arm64'">
+    <!-- https://github.com/dotnet/runtime/issues/56522 -->
+    <CLRTestBatchPreCommands><![CDATA[
+$(CLRTestBatchPreCommands)
+set COMPlus_JitDoValueNumber=0
+]]></CLRTestBatchPreCommands>
+    <BashCLRTestPreCommands><![CDATA[
+$(BashCLRTestPreCommands)
+export COMPlus_JitDoValueNumber=0
+]]></BashCLRTestPreCommands>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
   </ItemGroup>