diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index cbc2aabc478..42f217a6741 100644
--- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -529,6 +529,7 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) {
     break;
   case ISD::ZERO_EXTEND:
   case ISD::SIGN_EXTEND:
+  case ISD::TRUNCATE:
   case ISD::FP_EXTEND:
   case ISD::FP_ROUND:
     switch (getTypeAction(Node->getOperand(0).getValueType())) {
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 4ba16f6d982..167d2f7e359 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -477,9 +477,20 @@ void SelectionDAGLowering::visitGetElementPtr(User &I) {
       if (!isa<Constant>(Idx) || !cast<Constant>(Idx)->isNullValue()) {
         // N = N + Idx * ElementSize;
         uint64_t ElementSize = TD.getTypeSize(Ty);
-        SDOperand IdxN = getValue(Idx);
-        IdxN = DAG.getNode(ISD::MUL, N.getValueType(), IdxN,
-			   getIntPtrConstant(ElementSize));
+        SDOperand IdxN = getValue(Idx), Scale = getIntPtrConstant(ElementSize);
+
+        // If the index is smaller or larger than intptr_t, truncate or extend
+        // it.
+        if (IdxN.getValueType() < Scale.getValueType()) {
+          if (Idx->getType()->isSigned())
+            IdxN = DAG.getNode(ISD::SIGN_EXTEND, Scale.getValueType(), IdxN);
+          else
+            IdxN = DAG.getNode(ISD::ZERO_EXTEND, Scale.getValueType(), IdxN);
+        } else if (IdxN.getValueType() > Scale.getValueType())
+          IdxN = DAG.getNode(ISD::TRUNCATE, Scale.getValueType(), IdxN);
+
+        IdxN = DAG.getNode(ISD::MUL, N.getValueType(), IdxN, Scale);
+			   
         N = DAG.getNode(ISD::ADD, N.getValueType(), N, IdxN);
       }
     }