Skip to content

Commit 086ebd3

Browse files
committed
Revert changes
1 parent 2f4db44 commit 086ebd3

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

src/coreclr/jit/hwintrinsiccodegenarm64.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,8 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)
306306
}
307307
else if (intrin.category == HW_Category_Special)
308308
{
309+
assert(intrin.id == NI_ArmBase_Yield);
310+
309311
emitSize = EA_UNKNOWN;
310312
opt = INS_OPTS_NONE;
311313
}

src/coreclr/jit/instr.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,6 +1718,7 @@ instruction CodeGen::ins_Move_Extend(var_types srcType, bool srcInReg)
17181718
#if defined(TARGET_XARCH)
17191719
return INS_kmovq_msk;
17201720
#elif defined(TARGET_ARM64)
1721+
//unreached(); // TODO-SVE: This needs testing
17211722
return INS_sve_mov;
17221723
#endif
17231724
}

src/coreclr/jit/morph.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2330,7 +2330,7 @@ void CallArgs::AddFinalArgsAndDetermineABIInfo(Compiler* comp, GenTreeCall* call
23302330

23312331
bool isBackFilled = false;
23322332
unsigned nextFltArgRegNum = fltArgRegNum; // This is the next floating-point argument register number to use
2333-
bool isStructArg = varTypeIsStruct(argSigType) && !varTypeIsMask(argx->gtEffectiveVal());
2333+
bool isStructArg = varTypeIsStruct(argSigType);
23342334
var_types structBaseType = TYP_STRUCT;
23352335
unsigned structSize = 0;
23362336
bool passStructByRef = false;
@@ -3178,7 +3178,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
31783178
argx->gtType = TYP_I_IMPL;
31793179
}
31803180

3181-
bool isStructArg = varTypeIsStruct(arg.GetSignatureType()) && !varTypeIsMask(arg.GetSignatureType());
3181+
bool isStructArg = varTypeIsStruct(arg.GetSignatureType());
31823182
GenTree* argObj = argx->gtEffectiveVal();
31833183
bool makeOutArgCopy = false;
31843184

src/coreclr/jit/rationalize.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,7 @@ void Rationalizer::RewriteNodeAsCall(GenTree** use,
100100
assert(!operand->OperIsFieldList());
101101

102102
sigTyp = comp->impNormStructType(clsHnd);
103-
if (varTypeIsMask(operand) && varTypeIsSIMD(sigTyp))
104-
{
105-
sigTyp = TYP_MASK;
106-
}
107-
arg = NewCallArg::Struct(operand, sigTyp, clsHnd);
103+
arg = NewCallArg::Struct(operand, sigTyp, clsHnd);
108104
}
109105
else
110106
{

0 commit comments

Comments
 (0)