Skip to content

Commit 9f09e1f

Browse files
committed
Generic bugs
1 parent fbb7786 commit 9f09e1f

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1955,7 +1955,7 @@ SDValue SelectionDAG::getJumpTable(int JTI, EVT VT, bool isTarget,
19551955
SDValue SelectionDAG::getJumpTableDebugInfo(int JTI, SDValue Chain,
19561956
const SDLoc &DL) {
19571957
EVT PTy = getTargetLoweringInfo().getPointerTy(getDataLayout());
1958-
return getNode(ISD::JUMP_TABLE_DEBUG_INFO, DL, MVT::Glue, Chain,
1958+
return getNode(ISD::JUMP_TABLE_DEBUG_INFO, DL, MVT::Other, Chain,
19591959
getTargetConstant(static_cast<uint64_t>(JTI), DL, PTy, true));
19601960
}
19611961

llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3186,8 +3186,7 @@ void SelectionDAGBuilder::visitSPDescriptorParent(StackProtectorDescriptor &SPD,
31863186
Guard, GuardVal, ISD::SETNE);
31873187

31883188
// If the guard/stackslot do not equal, branch to failure MBB.
3189-
SDValue BrCond = DAG.getNode(ISD::BRCOND, dl,
3190-
MVT::Other, GuardVal.getOperand(0),
3189+
SDValue BrCond = DAG.getNode(ISD::BRCOND, dl, MVT::Other, getControlRoot(),
31913190
Cmp, DAG.getBasicBlock(SPD.getFailureMBB()));
31923191
// Otherwise branch to success MBB.
31933192
SDValue Br = DAG.getNode(ISD::BR, dl,

llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2717,7 +2717,7 @@ getSimpleVT(const unsigned char *MatcherTable, unsigned &MatcherIndex) {
27172717

27182718
void SelectionDAGISel::Select_JUMP_TABLE_DEBUG_INFO(SDNode *N) {
27192719
SDLoc dl(N);
2720-
CurDAG->SelectNodeTo(N, TargetOpcode::JUMP_TABLE_DEBUG_INFO, MVT::Glue,
2720+
CurDAG->SelectNodeTo(N, TargetOpcode::JUMP_TABLE_DEBUG_INFO, MVT::Other,
27212721
CurDAG->getTargetConstant(N->getConstantOperandVal(1),
27222722
dl, MVT::i64, true));
27232723
}

0 commit comments

Comments
 (0)