Index: lib/CodeGen/CGExprScalar.cpp
===================================================================
--- lib/CodeGen/CGExprScalar.cpp	(revision 69882)
+++ lib/CodeGen/CGExprScalar.cpp	(working copy)
@@ -958,14 +958,10 @@
   }
 
   unsigned Width = cast<llvm::IntegerType>(Idx->getType())->getBitWidth();
-  // Only 32 and 64 are valid index widths. So if a target has shorter 
-  // pointe width, extend to 32 at least.
-  unsigned IdxValidWidth 
-    = (CGF.LLVMPointerWidth < 32) ? 32 : CGF.LLVMPointerWidth;
-  if (Width < IdxValidWidth) {
+  if (Width < CGF.LLVMPointerWidth) {
     // Zero or sign extend the pointer value based on whether the index is
     // signed or not.
-    const llvm::Type *IdxType = llvm::IntegerType::get(IdxValidWidth);
+    const llvm::Type *IdxType = llvm::IntegerType::get(CGF.LLVMPointerWidth);
     if (IdxExp->getType()->isSignedIntegerType())
       Idx = Builder.CreateSExt(Idx, IdxType, "idx.ext");
     else
@@ -1008,12 +1004,10 @@
     // pointer - int
     Value *Idx = Ops.RHS;
     unsigned Width = cast<llvm::IntegerType>(Idx->getType())->getBitWidth();
-    unsigned IdxValidWidth 
-      = (CGF.LLVMPointerWidth < 32) ? 32 : CGF.LLVMPointerWidth;
-    if (Width < IdxValidWidth) {
+    if (Width < CGF.LLVMPointerWidth) {
       // Zero or sign extend the pointer value based on whether the index is
       // signed or not.
-      const llvm::Type *IdxType = llvm::IntegerType::get(IdxValidWidth);
+      const llvm::Type *IdxType = llvm::IntegerType::get(CGF.LLVMPointerWidth);
       if (Ops.E->getRHS()->getType()->isSignedIntegerType())
         Idx = Builder.CreateSExt(Idx, IdxType, "idx.ext");
       else
Index: lib/CodeGen/CGExpr.cpp
===================================================================
--- lib/CodeGen/CGExpr.cpp	(revision 69882)
+++ lib/CodeGen/CGExpr.cpp	(working copy)
@@ -805,11 +805,8 @@
   QualType IdxTy  = E->getIdx()->getType();
   bool IdxSigned = IdxTy->isSignedIntegerType();
   unsigned IdxBitwidth = cast<llvm::IntegerType>(Idx->getType())->getBitWidth();
-  
-  // If Pointer width is less than 32 than extend to 32.
-  unsigned IdxValidWidth = (LLVMPointerWidth < 32 ) ? 32 : LLVMPointerWidth;
-  if (IdxBitwidth != IdxValidWidth)
-    Idx = Builder.CreateIntCast(Idx, llvm::IntegerType::get(IdxValidWidth),
+  if (IdxBitwidth != LLVMPointerWidth)
+    Idx = Builder.CreateIntCast(Idx, llvm::IntegerType::get(LLVMPointerWidth),
                                 IdxSigned, "idxprom");
 
   // We know that the pointer points to a type of the correct size, unless the
