PIC jump table entries are always 32-bit even in 64-bit mode.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29422 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index f3c9802..4327e47 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -846,15 +846,22 @@
// Emit the code for the jump table
MVT::ValueType PTy = TLI.getPointerTy();
- unsigned PTyBytes = MVT::getSizeInBits(PTy)/8;
+ assert((PTy == MVT::i32 || PTy == MVT::i64) &&
+ "Jump table entries are 32-bit values");
+ // PIC jump table entries are 32-bit values.
+ unsigned EntrySize =
+ (TLI.getTargetMachine().getRelocationModel() == Reloc::PIC_)
+ ? 4 : MVT::getSizeInBits(PTy)/8;
SDOperand Copy = DAG.getCopyFromReg(getRoot(), JT.Reg, PTy);
SDOperand IDX = DAG.getNode(ISD::MUL, PTy, Copy,
- DAG.getConstant(PTyBytes, PTy));
+ DAG.getConstant(EntrySize, PTy));
SDOperand TAB = DAG.getJumpTable(JT.JTI,PTy);
SDOperand ADD = DAG.getNode(ISD::ADD, PTy, IDX, TAB);
- SDOperand LD = DAG.getLoad(PTy, Copy.getValue(1), ADD, DAG.getSrcValue(0));
+ SDOperand LD = DAG.getLoad(MVT::i32, Copy.getValue(1), ADD,
+ DAG.getSrcValue(0));
if (TLI.getTargetMachine().getRelocationModel() == Reloc::PIC_) {
- ADD = DAG.getNode(ISD::ADD, PTy, LD.getValue(0), TAB);
+ ADD = DAG.getNode(ISD::ADD, PTy,
+ ((PTy != MVT::i32) ? DAG.getNode(ISD::SIGN_EXTEND, PTy, LD) : LD), TAB);
DAG.setRoot(DAG.getNode(ISD::BRIND, MVT::Other, LD.getValue(1), ADD));
} else {
DAG.setRoot(DAG.getNode(ISD::BRIND, MVT::Other, LD.getValue(1), LD));