Revert changes

dotnet · Jun 11, 2024 · 086ebd3 · 086ebd3
1 parent 2f4db44
commit 086ebd3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/coreclr/jit/hwintrinsiccodegenarm64.cpp b/src/coreclr/jit/hwintrinsiccodegenarm64.cpp
@@ -306,6 +306,8 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)
     }
     else if (intrin.category == HW_Category_Special)
     {
+        assert(intrin.id == NI_ArmBase_Yield);
+
         emitSize = EA_UNKNOWN;
         opt      = INS_OPTS_NONE;
     }

diff --git a/src/coreclr/jit/instr.cpp b/src/coreclr/jit/instr.cpp
@@ -1718,6 +1718,7 @@ instruction CodeGen::ins_Move_Extend(var_types srcType, bool srcInReg)
 #if defined(TARGET_XARCH)
         return INS_kmovq_msk;
 #elif defined(TARGET_ARM64)
+        //unreached(); // TODO-SVE: This needs testing
         return INS_sve_mov;
 #endif
     }

diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp
@@ -2330,7 +2330,7 @@ void CallArgs::AddFinalArgsAndDetermineABIInfo(Compiler* comp, GenTreeCall* call
 
         bool      isBackFilled     = false;
         unsigned  nextFltArgRegNum = fltArgRegNum; // This is the next floating-point argument register number to use
-        bool      isStructArg      = varTypeIsStruct(argSigType) && !varTypeIsMask(argx->gtEffectiveVal());
+        bool      isStructArg      = varTypeIsStruct(argSigType);
         var_types structBaseType   = TYP_STRUCT;
         unsigned  structSize       = 0;
         bool      passStructByRef  = false;
@@ -3178,7 +3178,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
             argx->gtType = TYP_I_IMPL;
         }
 
-        bool     isStructArg    = varTypeIsStruct(arg.GetSignatureType()) && !varTypeIsMask(arg.GetSignatureType());
+        bool     isStructArg    = varTypeIsStruct(arg.GetSignatureType());
         GenTree* argObj         = argx->gtEffectiveVal();
         bool     makeOutArgCopy = false;
 

diff --git a/src/coreclr/jit/rationalize.cpp b/src/coreclr/jit/rationalize.cpp
@@ -100,11 +100,7 @@ void Rationalizer::RewriteNodeAsCall(GenTree**             use,
             assert(!operand->OperIsFieldList());
 
             sigTyp = comp->impNormStructType(clsHnd);
-            if (varTypeIsMask(operand) && varTypeIsSIMD(sigTyp))
-            {
-                sigTyp = TYP_MASK;
-            }
-            arg = NewCallArg::Struct(operand, sigTyp, clsHnd);
+            arg    = NewCallArg::Struct(operand, sigTyp, clsHnd);
         }
         else
         {