fix some other build failures

Author: kunalspathak

src/coreclr/jit/lsra.h

@@ -1782,30 +1782,6 @@ class LinearScan : public LinearScanInterface
     //-----------------------------------------------------------------------
 
     regMaskTP m_AvailableRegs;
-    regNumber getRegForType(regNumber reg, var_types regType)
-    {
-#ifdef TARGET_ARM
-        if ((regType == TYP_DOUBLE) && !genIsValidDoubleReg(reg))
-        {
-            reg = REG_PREV(reg);
-        }
-#endif // TARGET_ARM
-        return reg;
-    }
-
-    regMaskTP getRegMask(regNumber reg, var_types regType)
-    {
-        reg               = getRegForType(reg, regType);
-        regMaskTP regMask = genRegMask(reg);
-#ifdef TARGET_ARM
-        if (regType == TYP_DOUBLE)
-        {
-            assert(genIsValidDoubleReg(reg));
-            regMask |= (regMask << 1);
-        }
-#endif // TARGET_ARM
-        return regMask;
-    }
 
     void resetAvailableRegs()
     {

src/coreclr/jit/lsrabuild.cpp

@@ -851,9 +851,15 @@ regMaskTP LinearScan::getKillSetForCall(GenTreeCall* call)
     if (!compiler->compFloatingPointUsed)
     {
 #if defined(TARGET_XARCH)
-        
+
+#ifdef TARGET_AMD64
         killMask.RemoveRegsetForType(RBM_FLT_CALLEE_TRASH.getLow(), FloatRegisterType);
         killMask.RemoveRegsetForType(RBM_MSK_CALLEE_TRASH.getLow(), MaskRegisterType);
+#else
+        killMask.RemoveRegsetForType(RBM_FLT_CALLEE_TRASH, FloatRegisterType);
+        killMask &= ~RBM_MSK_CALLEE_TRASH;
+#endif // TARGET_AMD64
+
 #else
         killMask.RemoveRegsetForType(RBM_FLT_CALLEE_TRASH, FloatRegisterType);
 #endif // TARGET_XARCH

src/coreclr/jit/regMaskTPOps.cpp

@@ -5,7 +5,6 @@
 
 struct regMaskTP;
 
-
 //------------------------------------------------------------------------
 // encodeForRegisterIndex: Shifts the high-32 bits of float to low-32 bits
 //      and return. For gpr and predicate registers, it returns the same value.
@@ -34,7 +33,6 @@ struct regMaskTP;
     return ((regMaskSmall)value << shiftAmount);
 }
 
-
 // ----------------------------------------------------------
 //  AddRegNumForType: Adds `reg` to the mask.
 //
@@ -102,7 +100,7 @@ void regMaskTP::AddGprRegs(SingleTypeRegSet gprRegs)
 void regMaskTP::AddRegNum(regNumber reg, var_types type)
 {
 #ifdef TARGET_ARM
-    low |= getRegMask(reg, type);
+    low |= getRegMask(reg, type).getLow();
 #else
     AddRegNumInMask(reg);
 #endif
@@ -167,7 +165,7 @@ bool regMaskTP::IsRegNumInMask(regNumber reg) const
 bool regMaskTP::IsRegNumPresent(regNumber reg, var_types type) const
 {
 #ifdef TARGET_ARM
-    return (low & getRegMask(reg, type)) != RBM_NONE;
+    return (low & getRegMask(reg, type).getLow()) != RBM_NONE;
 #else
     return IsRegNumInMask(reg);
 #endif
@@ -200,7 +198,7 @@ void regMaskTP::RemoveRegNumFromMask(regNumber reg)
 void regMaskTP::RemoveRegNum(regNumber reg, var_types type)
 {
 #ifdef TARGET_ARM
-    low &= ~getRegMask(reg, type);
+    low &= ~getRegMask(reg, type).getLow();
 #else
     RemoveRegNumFromMask(reg);
 #endif

src/coreclr/jit/target.h

@@ -996,6 +996,31 @@ inline regMaskTP genRegMask(regNumber regNum, var_types type)
     return result;
 }
 
+inline regNumber getRegForType(regNumber reg, var_types regType)
+{
+#ifdef TARGET_ARM
+    if ((regType == TYP_DOUBLE) && !genIsValidDoubleReg(reg))
+    {
+        reg = REG_PREV(reg);
+    }
+#endif // TARGET_ARM
+    return reg;
+}
+
+inline regMaskTP getRegMask(regNumber reg, var_types regType)
+{
+    reg               = getRegForType(reg, regType);
+    regMaskTP regMask = genRegMask(reg);
+#ifdef TARGET_ARM
+    if (regType == TYP_DOUBLE)
+    {
+        assert(genIsValidDoubleReg(reg));
+        regMask |= (regMask << 1);
+    }
+#endif // TARGET_ARM
+    return regMask;
+}
+
 /*****************************************************************************
  *
  *  These arrays list the callee-saved register numbers (and bitmaps, respectively) for