Change ConditionalSelect nodes' type to the mask type if the containe…

…d node is of the mask type
dotnet · Jun 13, 2024 · 1ecb98f · 1ecb98f
1 parent 4327570
commit 1ecb98f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/coreclr/jit/lowerarmarch.cpp b/src/coreclr/jit/lowerarmarch.cpp
@@ -1311,9 +1311,14 @@ GenTree* Lowering::LowerHWIntrinsic(GenTreeHWIntrinsic* node)
                 GenTree*    trueMask        = comp->gtNewSimdAllTrueMaskNode(simdBaseJitType, simdSize);
                 GenTree*    trueVal         = node;
                 GenTree*    falseVal        = comp->gtNewZeroConNode(simdType);
+                var_types   nodeType        = simdType;
+                if (HWIntrinsicInfo::ReturnsPerElementMask(node->GetHWIntrinsicId()))
+                {
+                    nodeType = TYP_MASK;
+                }
 
                 GenTreeHWIntrinsic* condSelNode =
-                    comp->gtNewSimdHWIntrinsicNode(simdType, trueMask, trueVal, falseVal, NI_Sve_ConditionalSelect,
+                    comp->gtNewSimdHWIntrinsicNode(nodeType, trueMask, trueVal, falseVal, NI_Sve_ConditionalSelect,
                                                    simdBaseJitType, simdSize);
 
                 BlockRange().InsertBefore(node, trueMask);