Skip to content

Commit eec0335

Browse files
committed
Generic bugs
1 parent 0523ff2 commit eec0335

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
@@ -1953,7 +1953,7 @@ SDValue SelectionDAG::getJumpTable(int JTI, EVT VT, bool isTarget,
19531953
SDValue SelectionDAG::getJumpTableDebugInfo(int JTI, SDValue Chain,
19541954
const SDLoc &DL) {
19551955
EVT PTy = getTargetLoweringInfo().getPointerTy(getDataLayout());
1956-
return getNode(ISD::JUMP_TABLE_DEBUG_INFO, DL, MVT::Glue, Chain,
1956+
return getNode(ISD::JUMP_TABLE_DEBUG_INFO, DL, MVT::Other, Chain,
19571957
getTargetConstant(static_cast<uint64_t>(JTI), DL, PTy, true));
19581958
}
19591959

llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

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

31093109
// If the guard/stackslot do not equal, branch to failure MBB.
3110-
SDValue BrCond = DAG.getNode(ISD::BRCOND, dl,
3111-
MVT::Other, GuardVal.getOperand(0),
3110+
SDValue BrCond = DAG.getNode(ISD::BRCOND, dl, MVT::Other, getControlRoot(),
31123111
Cmp, DAG.getBasicBlock(SPD.getFailureMBB()));
31133112
// Otherwise branch to success MBB.
31143113
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
@@ -2670,7 +2670,7 @@ getSimpleVT(const unsigned char *MatcherTable, unsigned &MatcherIndex) {
26702670

26712671
void SelectionDAGISel::Select_JUMP_TABLE_DEBUG_INFO(SDNode *N) {
26722672
SDLoc dl(N);
2673-
CurDAG->SelectNodeTo(N, TargetOpcode::JUMP_TABLE_DEBUG_INFO, MVT::Glue,
2673+
CurDAG->SelectNodeTo(N, TargetOpcode::JUMP_TABLE_DEBUG_INFO, MVT::Other,
26742674
CurDAG->getTargetConstant(N->getConstantOperandVal(1),
26752675
dl, MVT::i64, true));
26762676
}

0 commit comments

Comments
 (0)