keep existing code for x86

dotnet · Aug 2, 2024 · 6fd3927 · 6fd3927
1 parent 7529e47
commit 6fd3927
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/coreclr/jit/codegenxarch.cpp b/src/coreclr/jit/codegenxarch.cpp
@@ -113,13 +113,13 @@ void CodeGen::genEmitGSCookieCheck(bool pushReg)
         }
         else
         {
-            if (compiler->info.compRetNativeType == TYP_REF)
-            {
-                gcInfo.gcRegGCrefSetCur |= RBM_INTRET;
-            }
-            else if (compiler->info.compRetNativeType == TYP_BYREF)
+            ReturnTypeDesc retTypeDesc = compiler->compRetTypeDesc;
+            const unsigned regCount    = retTypeDesc.GetReturnRegCount();
+
+            for (unsigned i = 0; i < regCount; ++i)
             {
-                gcInfo.gcRegByrefSetCur |= RBM_INTRET;
+                gcInfo.gcMarkRegPtrVal(retTypeDesc.GetABIReturnReg(i, compiler->info.compCallConv),
+                                       retTypeDesc.GetReturnRegType(i));
             }
         }
     }