diff options
| author | Matt Arsenault <Matthew.Arsenault@amd.com> | 2013-08-03 01:03:12 +0000 |
|---|---|---|
| committer | Matt Arsenault <Matthew.Arsenault@amd.com> | 2013-08-03 01:03:12 +0000 |
| commit | 6b4dde71cfdcb2e1f2105dd8a677c14d8c3bb4b4 (patch) | |
| tree | 6c20995c226b29101dc53676a637e2676673415e /lib/Analysis/InstructionSimplify.cpp | |
| parent | f3289e7d74ac7f4d03f54b56ab4b0d50795c1e7f (diff) | |
| download | external_llvm-6b4dde71cfdcb2e1f2105dd8a677c14d8c3bb4b4.zip external_llvm-6b4dde71cfdcb2e1f2105dd8a677c14d8c3bb4b4.tar.gz external_llvm-6b4dde71cfdcb2e1f2105dd8a677c14d8c3bb4b4.tar.bz2 | |
Minor address space code simplification.
Remove assertion that the verifier should catch.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187692 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Analysis/InstructionSimplify.cpp')
| -rw-r--r-- | lib/Analysis/InstructionSimplify.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/Analysis/InstructionSimplify.cpp b/lib/Analysis/InstructionSimplify.cpp index c8a6827..b275dfe 100644 --- a/lib/Analysis/InstructionSimplify.cpp +++ b/lib/Analysis/InstructionSimplify.cpp @@ -676,9 +676,8 @@ static Constant *stripAndComputeConstantOffsets(const DataLayout *TD, if (!TD) return ConstantInt::get(IntegerType::get(V->getContext(), 64), 0); - unsigned AS = V->getType()->getPointerAddressSpace(); - unsigned IntPtrWidth = TD->getPointerSizeInBits(AS); - APInt Offset = APInt::getNullValue(IntPtrWidth); + Type *IntPtrTy = TD->getIntPtrType(V->getType())->getScalarType(); + APInt Offset = APInt::getNullValue(IntPtrTy->getIntegerBitWidth()); // Even though we don't look through PHI nodes, we could be called on an // instruction in an unreachable block, which may be on a cycle. @@ -690,11 +689,7 @@ static Constant *stripAndComputeConstantOffsets(const DataLayout *TD, break; V = GEP->getPointerOperand(); } else if (Operator::getOpcode(V) == Instruction::BitCast) { - Value *Op0 = cast<Operator>(V)->getOperand(0); - assert(TD->getPointerTypeSizeInBits(V->getType()) == - TD->getPointerTypeSizeInBits(Op0->getType()) && - "Bitcasting between pointers from different size address spaces"); - V = Op0; + V = cast<Operator>(V)->getOperand(0); } else if (GlobalAlias *GA = dyn_cast<GlobalAlias>(V)) { if (GA->mayBeOverridden()) break; @@ -706,7 +701,6 @@ static Constant *stripAndComputeConstantOffsets(const DataLayout *TD, "Unexpected operand type!"); } while (Visited.insert(V)); - Type *IntPtrTy = TD->getIntPtrType(V->getContext(), AS); Constant *OffsetIntPtr = ConstantInt::get(IntPtrTy, Offset); if (V->getType()->isVectorTy()) return ConstantVector::getSplat(V->getType()->getVectorNumElements(), |