Generic bugs

s-barannikov · s-barannikov · commit ae8970517a60 · 2025-02-01T22:06:21.000+03:00
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -1961,7 +1961,7 @@ SDValue SelectionDAG::getJumpTable(int JTI, EVT VT, bool isTarget,
 SDValue SelectionDAG::getJumpTableDebugInfo(int JTI, SDValue Chain,
                                             const SDLoc &DL) {
   EVT PTy = getTargetLoweringInfo().getPointerTy(getDataLayout());
-  return getNode(ISD::JUMP_TABLE_DEBUG_INFO, DL, MVT::Glue, Chain,
+  return getNode(ISD::JUMP_TABLE_DEBUG_INFO, DL, MVT::Other, Chain,
                  getTargetConstant(static_cast<uint64_t>(JTI), DL, PTy, true));
 }
 
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -3161,9 +3161,8 @@ void SelectionDAGBuilder::visitSPDescriptorParent(StackProtectorDescriptor &SPD,
                              Guard, GuardVal, ISD::SETNE);
 
   // If the guard/stackslot do not equal, branch to failure MBB.
-  SDValue BrCond = DAG.getNode(ISD::BRCOND, dl,
-                               MVT::Other, GuardVal.getOperand(0),
-                               Cmp, DAG.getBasicBlock(SPD.getFailureMBB()));
+  SDValue BrCond = DAG.getNode(ISD::BRCOND, dl, MVT::Other, Chain, Cmp,
+                               DAG.getBasicBlock(SPD.getFailureMBB()));
   // Otherwise branch to success MBB.
   SDValue Br = DAG.getNode(ISD::BR, dl,
                            MVT::Other, BrCond,

Original file line number	Diff line number	Diff line change
`@@ -1961,7 +1961,7 @@ SDValue SelectionDAG::getJumpTable(int JTI, EVT VT, bool isTarget,`
`1961`	`1961`	`SDValue SelectionDAG::getJumpTableDebugInfo(int JTI, SDValue Chain,`
`1962`	`1962`	`const SDLoc &DL) {`
`1963`	`1963`	`EVT PTy = getTargetLoweringInfo().getPointerTy(getDataLayout());`
`1964`		`- return getNode(ISD::JUMP_TABLE_DEBUG_INFO, DL, MVT::Glue, Chain,`
	`1964`	`+ return getNode(ISD::JUMP_TABLE_DEBUG_INFO, DL, MVT::Other, Chain,`
`1965`	`1965`	`getTargetConstant(static_cast<uint64_t>(JTI), DL, PTy, true));`
`1966`	`1966`	`}`
`1967`	`1967`