Merge commit '0a42db682aa0' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit f699a7bf4d46 · 2025-05-21T17:46:08.000-07:00
diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
@@ -7216,8 +7216,7 @@ SDValue DAGTypeLegalizer::WidenVecOp_STORE(SDNode *N) {
     SDValue EVL = DAG.getElementCount(DL, TLI.getVPExplicitVectorLengthTy(),
                                       StVT.getVectorElementCount());
     return DAG.getStoreVP(ST->getChain(), DL, StVal, ST->getBasePtr(),
-                          DAG.getUNDEF(ST->getBasePtr().getValueType()), Mask,
-                          EVL, StVT, ST->getMemOperand(),
+                          ST->getOffset(), Mask, EVL, StVT, ST->getMemOperand(),
                           ST->getAddressingMode());
   }
 

Original file line number	Diff line number	Diff line change
`@@ -7216,8 +7216,7 @@ SDValue DAGTypeLegalizer::WidenVecOp_STORE(SDNode *N) {`
`7216`	`7216`	`SDValue EVL = DAG.getElementCount(DL, TLI.getVPExplicitVectorLengthTy(),`
`7217`	`7217`	`StVT.getVectorElementCount());`
`7218`	`7218`	`return DAG.getStoreVP(ST->getChain(), DL, StVal, ST->getBasePtr(),`
`7219`		`- DAG.getUNDEF(ST->getBasePtr().getValueType()), Mask,`
`7220`		`- EVL, StVT, ST->getMemOperand(),`
	`7219`	`+ ST->getOffset(), Mask, EVL, StVT, ST->getMemOperand(),`
`7221`	`7220`	`ST->getAddressingMode());`
`7222`	`7221`	`}`
`7223`	`7222`