JIT: Update type when return temp is freshly created

src/coreclr/jit/compiler.h

@@ -4091,6 +4091,8 @@ class Compiler
     unsigned lvaInlineeReturnSpillTemp = BAD_VAR_NUM; // The temp to spill the non-VOID return expression
                                         // in case there are multiple BBJ_RETURN blocks in the inlinee
                                         // or if the inlinee has GC ref locals.
+
+    bool lvaInlineeReturnSpillTempFreshlyCreated = false; // True if the temp was freshly created for the inlinee return
 
 #if FEATURE_FIXED_OUT_ARGS
     unsigned            lvaOutgoingArgSpaceVar = BAD_VAR_NUM;  // var that represents outgoing argument space

src/coreclr/jit/fgbasic.cpp

@@ -3562,6 +3562,8 @@ void Compiler::fgFindBasicBlocks()
                         lvaSetClass(lvaInlineeReturnSpillTemp, retClassHnd);
                     }
                 }
+
+                lvaInlineeReturnSpillTempFreshlyCreated = true;
             }
         }
 

src/coreclr/jit/fgopt.cpp

@@ -317,9 +317,23 @@ PhaseStatus Compiler::fgPostImportationCleanup()
             {
                 LclVarDsc* returnSpillVarDsc = lvaGetDesc(lvaInlineeReturnSpillTemp);
 
-                if ((returnSpillVarDsc->lvType == TYP_REF) && returnSpillVarDsc->lvSingleDef)
+                if ((returnSpillVarDsc->lvType == TYP_REF))
                 {
-                    lvaUpdateClass(lvaInlineeReturnSpillTemp, retExprClassHnd, impInlineInfo->retExprClassHndIsExact);
+                    if (returnSpillVarDsc->lvSingleDef)
+                    {
+                        lvaUpdateClass(lvaInlineeReturnSpillTemp, retExprClassHnd,
+                                       impInlineInfo->retExprClassHndIsExact);
+                    }
+                    else if (lvaInlineeReturnSpillTempFreshlyCreated)
+                    {
+                        // If the inlinee return spill temp was freshly created in fgFindBasicBlocks, we can update the
+                        // type regardless of whether it is single def or not.
+                        returnSpillVarDsc->lvClassHnd     = retExprClassHnd;
+                        returnSpillVarDsc->lvClassIsExact = impInlineInfo->retExprClassHndIsExact;
+#if DEBUG
+                        returnSpillVarDsc->lvClassInfoUpdated = true;
+#endif
+                    }
                 }
             }
         }