mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-09-24 23:28:41 +00:00
There are two ways of checking for a given type, for example isa<PointerType>(T)
and T->isPointerTy(). Convert most instances of the first form to the second form. Requested by Chris. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96344 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -271,7 +271,7 @@ static bool DominatesMergePoint(Value *V, BasicBlock *BB,
|
||||
ConstantInt *SimplifyCFGOpt::GetConstantInt(Value *V) {
|
||||
// Normal constant int.
|
||||
ConstantInt *CI = dyn_cast<ConstantInt>(V);
|
||||
if (CI || !TD || !isa<Constant>(V) || !isa<PointerType>(V->getType()))
|
||||
if (CI || !TD || !isa<Constant>(V) || !V->getType()->isPointerTy())
|
||||
return CI;
|
||||
|
||||
// This is some kind of pointer constant. Turn it into a pointer-sized
|
||||
@@ -701,7 +701,7 @@ bool SimplifyCFGOpt::FoldValueComparisonIntoPredecessors(TerminatorInst *TI) {
|
||||
AddPredecessorToBlock(NewSuccessors[i], Pred, BB);
|
||||
|
||||
// Convert pointer to int before we switch.
|
||||
if (isa<PointerType>(CV->getType())) {
|
||||
if (CV->getType()->isPointerTy()) {
|
||||
assert(TD && "Cannot switch on pointer without TargetData");
|
||||
CV = new PtrToIntInst(CV, TD->getIntPtrType(CV->getContext()),
|
||||
"magicptr", PTI);
|
||||
@@ -915,7 +915,7 @@ static bool SpeculativelyExecuteBB(BranchInst *BI, BasicBlock *BB1) {
|
||||
case Instruction::Add:
|
||||
case Instruction::Sub:
|
||||
// Not worth doing for vector ops.
|
||||
if (isa<VectorType>(HInst->getType()))
|
||||
if (HInst->getType()->isVectorTy())
|
||||
return false;
|
||||
break;
|
||||
case Instruction::And:
|
||||
@@ -925,7 +925,7 @@ static bool SpeculativelyExecuteBB(BranchInst *BI, BasicBlock *BB1) {
|
||||
case Instruction::LShr:
|
||||
case Instruction::AShr:
|
||||
// Don't mess with vector operations.
|
||||
if (isa<VectorType>(HInst->getType()))
|
||||
if (HInst->getType()->isVectorTy())
|
||||
return false;
|
||||
break; // These are all cheap and non-trapping instructions.
|
||||
}
|
||||
@@ -2068,7 +2068,7 @@ bool SimplifyCFGOpt::run(BasicBlock *BB) {
|
||||
if (!TrueWhenEqual) std::swap(DefaultBB, EdgeBB);
|
||||
|
||||
// Convert pointer to int before we switch.
|
||||
if (isa<PointerType>(CompVal->getType())) {
|
||||
if (CompVal->getType()->isPointerTy()) {
|
||||
assert(TD && "Cannot switch on pointer without TargetData");
|
||||
CompVal = new PtrToIntInst(CompVal,
|
||||
TD->getIntPtrType(CompVal->getContext()),
|
||||
|
Reference in New Issue
Block a user