diff --git a/llvm/lib/Analysis/ConstantFolding.cpp b/llvm/lib/Analysis/ConstantFolding.cpp
index 6c99ad3..95e8bde 100644
--- a/llvm/lib/Analysis/ConstantFolding.cpp
+++ b/llvm/lib/Analysis/ConstantFolding.cpp
@@ -341,14 +341,10 @@
   }
   
   if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) {
-    if (CE->getOpcode() == Instruction::IntToPtr) {
-      uint64_t PtrSize = TD.getTypeAllocSize(C->getType());
-      uint64_t IntSize = TD.getTypeAllocSize(C->getOperand(0)->getType());
-
-      if (PtrSize == IntSize)
+    if (CE->getOpcode() == Instruction::IntToPtr &&
+        CE->getOperand(0)->getType() == TD.getIntPtrType(CE->getContext())) 
         return ReadDataFromGlobal(CE->getOperand(0), ByteOffset, CurPtr, 
                                   BytesLeft, TD);
-    }
   }
 
   // Otherwise, unknown initializer type.