RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 19:23:23 +01:00
Code Issues Projects Releases Wiki Activity

Minor address space code simplification.

Browse Source 
Remove assertion that the verifier should catch.

llvm-svn: 187692
This commit is contained in:
Matt Arsenault 2013-08-03 01:03:12 +00:00
parent 0aa768f37b
commit a93e2d4fd1
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/Transforms/Utils/Local.h
View File

@ -181,8 +181,7 @@ template<typename IRBuilderTy>
Value *EmitGEPOffset(IRBuilderTy *Builder, const DataLayout &TD, User *GEP,
bool NoAssumptions = false) {
GEPOperator *GEPOp = cast<GEPOperator>(GEP);
unsigned AS = GEPOp->getPointerAddressSpace();
Type *IntPtrTy = TD.getIntPtrType(GEP->getContext(), AS);
Type *IntPtrTy = TD.getIntPtrType(GEP->getType());
Value *Result = Constant::getNullValue(IntPtrTy);
// If the GEP is inbounds, we know that none of the addressing operations will
@ -190,7 +189,7 @@ Value *EmitGEPOffset(IRBuilderTy *Builder, const DataLayout &TD, User *GEP,
bool isInBounds = GEPOp->isInBounds() && !NoAssumptions;
// Build a mask for high order bits.
unsigned IntPtrWidth = TD.getPointerSizeInBits(AS);
unsigned IntPtrWidth = IntPtrTy->getScalarType()->getIntegerBitWidth();
uint64_t PtrSizeMask = ~0ULL >> (64 - IntPtrWidth);
gep_type_iterator GTI = gep_type_begin(GEP);

12
lib/Analysis/InstructionSimplify.cpp
View File

@ -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(),