fixup! Address review comments

Author: mshockwave

llvm/lib/Target/RISCV/RISCVISelLowering.cpp

@@ -21160,26 +21160,28 @@ SDValue RISCVTargetLowering::PerformDAGCombine(SDNode *N,
     // If the scalar we're sliding in was extracted from the first element of a
     // vector, we can use that vector as the passthru in a normal slideup of 1.
     // This saves us an extract_element instruction (i.e. vfmv.f.s, vmv.x.s).
-    if (N->getOperand(0).isUndef() &&
-        sd_match(N->getOperand(2),
-                 m_AnyOf(m_ExtractElt(m_Value(SrcVec), m_Zero()),
-                         m_Node(RISCVISD::VMV_X_S, m_Value(SrcVec))))) {
-      MVT SrcVecVT = SrcVec.getSimpleValueType();
-      // Adapt the value type of source vector.
-      if (SrcVecVT.isFixedLengthVector()) {
-        SrcVecVT = getContainerForFixedLengthVector(SrcVecVT);
-        SrcVec = convertToScalableVector(SrcVecVT, SrcVec, DAG, Subtarget);
-      }
-      if (SrcVecVT.getVectorMinNumElements() < VT.getVectorMinNumElements())
-        SrcVec = DAG.getInsertSubvector(DL, DAG.getUNDEF(VT), SrcVec, 0);
-      else
-        SrcVec = DAG.getExtractSubvector(DL, VT, SrcVec, 0);
+    if (!N->getOperand(0).isUndef() ||
+        !sd_match(N->getOperand(2),
+                  m_AnyOf(m_ExtractElt(m_Value(SrcVec), m_Zero()),
+                          m_Node(RISCVISD::VMV_X_S, m_Value(SrcVec)))))
+      break;
 
-      return getVSlideup(DAG, Subtarget, DL, VT, SrcVec, N->getOperand(1),
-                         DAG.getConstant(1, DL, XLenVT), N->getOperand(3),
-                         N->getOperand(4));
+    MVT SrcVecVT = SrcVec.getSimpleValueType();
+    if (SrcVecVT.getVectorElementType() != VT.getVectorElementType())
+      break;
+    // Adapt the value type of source vector.
+    if (SrcVecVT.isFixedLengthVector()) {
+      SrcVecVT = getContainerForFixedLengthVector(SrcVecVT);
+      SrcVec = convertToScalableVector(SrcVecVT, SrcVec, DAG, Subtarget);
     }
-    break;
+    if (SrcVecVT.getVectorMinNumElements() < VT.getVectorMinNumElements())
+      SrcVec = DAG.getInsertSubvector(DL, DAG.getUNDEF(VT), SrcVec, 0);
+    else
+      SrcVec = DAG.getExtractSubvector(DL, VT, SrcVec, 0);
+
+    return getVSlideup(DAG, Subtarget, DL, VT, SrcVec, N->getOperand(1),
+                       DAG.getConstant(1, DL, XLenVT), N->getOperand(3),
+                       N->getOperand(4));
   }
   }