Enable return address hijacking for arm64.

And also fixes a bug in HijackFrame::GCScanRoots

1 files changed, 5 insertions, 9 deletions

diff --git a/src/vm/frames.cpp b/src/vm/frames.cpp
index a0410960f9..ec7e7be63c 100644
--- a/src/vm/frames.cpp
+++ b/src/vm/frames.cpp
@@ -1142,14 +1142,14 @@ void HijackFrame::GcScanRoots(promote_func *fn, ScanContext* sc)
     _ASSERTE(IsValidReturnKind(returnKind));
 
     int regNo = 0;
-    bool moreRegisters;
+    bool moreRegisters = false;
 
     do 
     {
-        moreRegisters = false;
+        ReturnKind r = ExtractRegReturnKind(returnKind, regNo, moreRegisters);
         PTR_PTR_Object objPtr = dac_cast<PTR_PTR_Object>(&m_Args->ReturnValue[regNo]);
 
-        switch (returnKind)
+        switch (r)
         {
 #ifdef _TARGET_X86_
         case RT_Float: // Fall through
@@ -1173,14 +1173,10 @@ void HijackFrame::GcScanRoots(promote_func *fn, ScanContext* sc)
             break;
 
         default:
-#ifdef FEATURE_MULTIREG_RETURN
-            moreRegisters = true;
-            regNo++;
-            returnKind = ExtractRegReturnKind(returnKind, regNo);
-#else
             _ASSERTE(!"Impossible two bit encoding"); 
-#endif
         }
+        
+        regNo++;
     } while (moreRegisters);
 }