Fix scalar check when fixing up struct return. (dotnet#38644)

Fix dotnet#38455
YesReddy1 · Jul 1, 2020 · 60713cb · 60713cb
1 parent b534378
commit 60713cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/coreclr/src/jit/importer.cpp b/src/coreclr/src/jit/importer.cpp
@@ -9237,7 +9237,8 @@ GenTree* Compiler::impFixupStructReturnType(GenTree* op, CORINFO_CLASS_HANDLE re
     {
         // It is possible that we now have a lclVar of scalar type.
         // If so, don't transform it to GT_LCL_FLD.
-        if (lvaTable[op->AsLclVar()->GetLclNum()].lvType != info.compRetNativeType)
+        LclVarDsc* varDsc = lvaGetDesc(op->AsLclVarCommon());
+        if (genActualType(varDsc->TypeGet()) != genActualType(info.compRetNativeType))
         {
             op->ChangeOper(GT_LCL_FLD);
         }

diff --git a/src/libraries/System.Runtime/tests/System/DoubleTests.cs b/src/libraries/System.Runtime/tests/System/DoubleTests.cs
@@ -551,7 +551,6 @@ public static void IsNormal(double d, bool expected)
         }
 
         [Theory]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/38455", TestRuntimes.CoreCLR)]
         [InlineData(double.NegativeInfinity, false)]    // Negative Infinity
         [InlineData(double.MinValue, false)]            // Min Negative Normal
         [InlineData(-2.2250738585072014E-308, false)]   // Max Negative Normal