diff options
author | Reid Spencer <rspencer@reidspencer.com> | 2007-01-22 05:51:25 +0000 |
---|---|---|
committer | Reid Spencer <rspencer@reidspencer.com> | 2007-01-22 05:51:25 +0000 |
commit | 31a4ef4dc19b0c04c243cb2485d0a6cd44d799eb (patch) | |
tree | 0a8cf441028765bc27ce8ab611adcdca3d3e1c8f /llvm/lib | |
parent | e977757ca99dac00cfa7052e8eb94c79e3b3c555 (diff) | |
download | llvm-31a4ef4dc19b0c04c243cb2485d0a6cd44d799eb.zip llvm-31a4ef4dc19b0c04c243cb2485d0a6cd44d799eb.tar.gz llvm-31a4ef4dc19b0c04c243cb2485d0a6cd44d799eb.tar.bz2 |
Cleanup checks in the load and store of casted pointer transforms. Two
changes: (1) don't special case for i1 any more, (2) use the new
TargetData::getTypeSizeInBits method to ensure source and dest are the
same bit width.
llvm-svn: 33427
Diffstat (limited to 'llvm/lib')
-rw-r--r-- | llvm/lib/Transforms/Scalar/InstructionCombining.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp index a87a8ad..d38c7c4 100644 --- a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp @@ -7990,8 +7990,8 @@ static Instruction *InstCombineLoadCast(InstCombiner &IC, LoadInst &LI) { if (const PointerType *SrcTy = dyn_cast<PointerType>(CastOp->getType())) { const Type *SrcPTy = SrcTy->getElementType(); - if ((DestPTy->isInteger() && DestPTy != Type::Int1Ty) || - isa<PointerType>(DestPTy) || isa<PackedType>(DestPTy)) { + if (DestPTy->isInteger() || isa<PointerType>(DestPTy) || + isa<PackedType>(DestPTy)) { // If the source is an array, the code below will not succeed. Check to // see if a trivial 'gep P, 0, 0' will help matters. Only do this for // constants. @@ -8004,13 +8004,13 @@ static Instruction *InstCombineLoadCast(InstCombiner &IC, LoadInst &LI) { SrcPTy = SrcTy->getElementType(); } - if (((SrcPTy->isInteger() && SrcPTy != Type::Int1Ty) || - isa<PointerType>(SrcPTy) || isa<PackedType>(SrcPTy)) && + if ((SrcPTy->isInteger() || isa<PointerType>(SrcPTy) || + isa<PackedType>(SrcPTy)) && // Do not allow turning this into a load of an integer, which is then // casted to a pointer, this pessimizes pointer analysis a lot. (isa<PointerType>(SrcPTy) == isa<PointerType>(LI.getType())) && - IC.getTargetData().getTypeSize(SrcPTy) == - IC.getTargetData().getTypeSize(DestPTy)) { + IC.getTargetData().getTypeSizeInBits(SrcPTy) == + IC.getTargetData().getTypeSizeInBits(DestPTy)) { // Okay, we are casting from one integer or pointer type to another of // the same size. Instead of casting the pointer before the load, cast @@ -8178,8 +8178,7 @@ static Instruction *InstCombineStoreToCast(InstCombiner &IC, StoreInst &SI) { if (const PointerType *SrcTy = dyn_cast<PointerType>(CastOp->getType())) { const Type *SrcPTy = SrcTy->getElementType(); - if ((DestPTy->isInteger() && DestPTy != Type::Int1Ty) || - isa<PointerType>(DestPTy)) { + if (DestPTy->isInteger() || isa<PointerType>(DestPTy)) { // If the source is an array, the code below will not succeed. Check to // see if a trivial 'gep P, 0, 0' will help matters. Only do this for // constants. |