commit bf3eeb2dfc1d7e4e4236ec1da7e20f58733b30cc
author Micah Villmow <villmow@gmail.com> Wed Oct 24 18:36:13 2012 +0000
committer Micah Villmow <villmow@gmail.com> Wed Oct 24 18:36:13 2012 +0000
tree 2514c697ab48d047ec6d2a104b35833dbf281645
parent c9d17591d990b036df70bce2ed176357863cd417

Add some cleanup to the DataLayout changes requested by Chandler.

llvm-svn: 166607

llvm/lib/Analysis/ConstantFolding.cpp

diff --git a/llvm/lib/Analysis/ConstantFolding.cpp b/llvm/lib/Analysis/ConstantFolding.cpp
index c0e9020..de6d61d 100644
--- a/llvm/lib/Analysis/ConstantFolding.cpp
+++ b/llvm/lib/Analysis/ConstantFolding.cpp
@@ -937,8 +937,7 @@
     // pointer, so it can't be done in ConstantExpr::getCast.
     if (ConstantExpr *CE = dyn_cast<ConstantExpr>(Ops[0]))
       if (TD && CE->getOpcode() == Instruction::PtrToInt &&
-          TD->getPointerSizeInBits(
-            cast<PointerType>(CE->getOperand(0)->getType())->getAddressSpace())
+          TD->getTypeSizeInBits(CE->getOperand(0)->getType())
           <= CE->getType()->getScalarSizeInBits())
         return FoldBitCast(CE->getOperand(0), DestTy, *TD);