#include "llvm/iPHINode.h"
#include "llvm/iMemory.h"
#include "llvm/ConstantHandling.h"
-#include "llvm/Transforms/Scalar/DCE.h"
#include "llvm/Analysis/Expressions.h"
#include "Support/STLExtras.h"
+#include "Support/StatisticReporter.h"
#include <algorithm>
#include <iostream>
using std::cerr;
-//#define DEBUG_EXPR_CONVERT 1
-
static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
ValueTypeCache &ConvertedTypes);
static bool AllIndicesZero(const MemAccessInst *MAI) {
for (User::const_op_iterator S = MAI->idx_begin(), E = MAI->idx_end();
S != E; ++S)
- if (!isa<Constant>(*S) || !cast<Constant>(*S)->isNullValue())
+ if (!isa<Constant>(S->get()) || !cast<Constant>(S->get())->isNullValue())
return false;
return true;
}
unsigned Scale = (unsigned)ScaleVal * OldTypeSize / DataSize;
// Locate the malloc instruction, because we may be inserting instructions
- It = find(BB->getInstList().begin(), BB->getInstList().end(), MI);
+ It = MI;
// If we have a scale, apply it first...
if (Expr.Var) {
if (Expr.Var->getType() != Type::UIntTy) {
Instruction *CI = new CastInst(Expr.Var, Type::UIntTy);
if (Expr.Var->hasName()) CI->setName(Expr.Var->getName()+"-uint");
- It = BB->getInstList().insert(It, CI)+1;
+ It = ++BB->getInstList().insert(It, CI);
Expr.Var = CI;
}
BinaryOperator::create(Instruction::Mul, Expr.Var,
ConstantUInt::get(Type::UIntTy, Scale));
if (Expr.Var->hasName()) ScI->setName(Expr.Var->getName()+"-scl");
- It = BB->getInstList().insert(It, ScI)+1;
+ It = ++BB->getInstList().insert(It, ScI);
Expr.Var = ScI;
}
BinaryOperator::create(Instruction::Add, Expr.Var,
ConstantUInt::get(Type::UIntTy, Offset));
if (Expr.Var->hasName()) AddI->setName(Expr.Var->getName()+"-off");
- It = BB->getInstList().insert(It, AddI)+1;
+ It = ++BB->getInstList().insert(It, AddI);
Expr.Var = AddI;
}
// We can convert the expr if the cast destination type is losslessly
// convertable to the requested type.
if (!Ty->isLosslesslyConvertableTo(I->getType())) return false;
-#if 1
+
// We also do not allow conversion of a cast that casts from a ptr to array
// of X to a *X. For example: cast [4 x %List *] * %val to %List * *
//
- if (PointerType *SPT = dyn_cast<PointerType>(I->getOperand(0)->getType()))
- if (PointerType *DPT = dyn_cast<PointerType>(I->getType()))
- if (ArrayType *AT = dyn_cast<ArrayType>(SPT->getElementType()))
+ if (const PointerType *SPT =
+ dyn_cast<PointerType>(I->getOperand(0)->getType()))
+ if (const PointerType *DPT = dyn_cast<PointerType>(I->getType()))
+ if (const ArrayType *AT = dyn_cast<ArrayType>(SPT->getElementType()))
if (AT->getElementType() == DPT->getElementType())
return false;
-#endif
break;
case Instruction::Add:
return false;
break;
-#if 1
case Instruction::GetElementPtr: {
// GetElementPtr's are directly convertable to a pointer type if they have
// a number of zeros at the end. Because removing these values does not
return false; // No match, maybe next time.
}
-#endif
default:
return false;
return VMCI->second;
}
-#ifdef DEBUG_EXPR_CONVERT
- cerr << "CETT: " << (void*)V << " " << V;
-#endif
+ DEBUG(cerr << "CETT: " << (void*)V << " " << V);
Instruction *I = dyn_cast<Instruction>(V);
if (I == 0)
// and we could convert this to an appropriate GEP for the new type.
//
const PointerType *NewSrcTy = PointerType::get(PVTy);
- BasicBlock::iterator It = find(BIL.begin(), BIL.end(), I);
+ BasicBlock::iterator It = I;
// Check to see if 'N' is an expression that can be converted to
// the appropriate size... if so, allow it.
assert(Res->getType() == Ty && "Didn't convert expr to correct type!");
- BasicBlock::iterator It = find(BIL.begin(), BIL.end(), I);
- assert(It != BIL.end() && "Instruction not in own basic block??");
- BIL.insert(It, Res);
+ BIL.insert(I, Res);
// Add the instruction to the expression map
VMC.ExprMap[I] = Res;
if (NumUses == OldSize) ++It;
}
-#ifdef DEBUG_EXPR_CONVERT
- cerr << "ExpIn: " << (void*)I << " " << I
- << "ExpOut: " << (void*)Res << " " << Res;
-#endif
+ DEBUG(cerr << "ExpIn: " << (void*)I << " " << I
+ << "ExpOut: " << (void*)Res << " " << Res);
if (I->use_empty()) {
-#ifdef DEBUG_EXPR_CONVERT
- cerr << "EXPR DELETING: " << (void*)I << " " << I;
-#endif
+ DEBUG(cerr << "EXPR DELETING: " << (void*)I << " " << I);
BIL.remove(I);
VMC.OperandsMapped.erase(I);
VMC.ExprMap.erase(I);
I->getOperand(0)->getType()->isSigned() != Ty->isSigned())
return false;
-#if 1
// We also do not allow conversion of a cast that casts from a ptr to array
// of X to a *X. For example: cast [4 x %List *] * %val to %List * *
//
- if (PointerType *SPT = dyn_cast<PointerType>(I->getOperand(0)->getType()))
- if (PointerType *DPT = dyn_cast<PointerType>(I->getType()))
- if (ArrayType *AT = dyn_cast<ArrayType>(SPT->getElementType()))
+ if (const PointerType *SPT =
+ dyn_cast<PointerType>(I->getOperand(0)->getType()))
+ if (const PointerType *DPT = dyn_cast<PointerType>(I->getType()))
+ if (const ArrayType *AT = dyn_cast<ArrayType>(SPT->getElementType()))
if (AT->getElementType() == DPT->getElementType())
return false;
-#endif
return true;
case Instruction::Add:
// a whole structure at a time), so the level raiser must be trying to
// store into the first field. Check for this and allow it now:
//
- if (StructType *SElTy = dyn_cast<StructType>(ElTy)) {
+ if (const StructType *SElTy = dyn_cast<StructType>(ElTy)) {
unsigned Offset = 0;
std::vector<Value*> Indices;
ElTy = getStructOffsetType(ElTy, Offset, Indices, false);
// Are we trying to change the function pointer value to a new type?
if (OpNum == 0) {
- PointerType *PTy = dyn_cast<PointerType>(Ty);
+
const PointerType *PTy = dyn_cast<PointerType>(Ty);
if (PTy == 0) return false; // Can't convert to a non-pointer type...
- FunctionType *MTy = dyn_cast<FunctionType>(PTy->getElementType());
+ const FunctionType *MTy = dyn_cast<FunctionType>(PTy->getElementType());
if (MTy == 0) return false; // Can't convert to a non ptr to function...
// Perform sanity checks to make sure that new function type has the
Instruction *I = cast<Instruction>(U); // Only Instructions convertable
BasicBlock *BB = I->getParent();
+ assert(BB != 0 && "Instruction not embedded in basic block!");
BasicBlock::InstListType &BIL = BB->getInstList();
std::string Name = I->getName(); if (!Name.empty()) I->setName("");
Instruction *Res; // Result of conversion
if (isa<PointerType>(NewTy)) {
Value *IndexVal = I->getOperand(OldVal == I->getOperand(0) ? 1 : 0);
std::vector<Value*> Indices;
- BasicBlock::iterator It = find(BIL.begin(), BIL.end(), I);
+ BasicBlock::iterator It = I;
if (const Type *ETy = ConvertableToGEP(NewTy, IndexVal, Indices, &It)) {
// If successful, convert the add to a GEP
// Convert a one index getelementptr into just about anything that is
// desired.
//
- BasicBlock::iterator It = find(BIL.begin(), BIL.end(), I);
+ BasicBlock::iterator It = I;
const Type *OldElTy = cast<PointerType>(I->getType())->getElementType();
unsigned DataSize = TD.getTypeSize(OldElTy);
Value *Index = I->getOperand(1);
// Insert a multiply of the old element type is not a unit size...
Index = BinaryOperator::create(Instruction::Mul, Index,
ConstantUInt::get(Type::UIntTy, DataSize));
- It = BIL.insert(It, cast<Instruction>(Index))+1;
+ It = ++BIL.insert(It, cast<Instruction>(Index));
}
// Perform the conversion now...
// Convert a getelementptr sbyte * %reg111, uint 16 freely back to
// anything that is a pointer type...
//
- BasicBlock::iterator It = find(BIL.begin(), BIL.end(), I);
+ BasicBlock::iterator It = I;
// Check to see if the second argument is an expression that can
// be converted to the appropriate size... if so, allow it.
std::vector<Value*> Params(I->op_begin()+1, I->op_end());
if (Meth == OldVal) { // Changing the function pointer?
- PointerType *NewPTy = cast<PointerType>(NewVal->getType());
- FunctionType *NewTy = cast<FunctionType>(NewPTy->getElementType());
+
const PointerType *NewPTy = cast<PointerType>(NewVal->getType());
+ const FunctionType *NewTy = cast<FunctionType>(NewPTy->getElementType());
const FunctionType::ParamTypes &PTs = NewTy->getParamTypes();
// Get an iterator to the call instruction so that we can insert casts for
// compatible. The reason for this is that we prefer to have resolved
// functions but casted arguments if possible.
//
- BasicBlock::iterator It = find(BIL.begin(), BIL.end(), I);
+ BasicBlock::iterator It = I;
// Convert over all of the call operands to their new types... but only
// convert over the part that is not in the vararg section of the call.
// is a lossless cast...
//
Params[i] = new CastInst(Params[i], PTs[i], "call.resolve.cast");
- It = BIL.insert(It, cast<Instruction>(Params[i]))+1;
+ It = ++BIL.insert(It, cast<Instruction>(Params[i]));
}
Meth = NewVal; // Update call destination to new value
// If the instruction was newly created, insert it into the instruction
// stream.
//
- BasicBlock::iterator It = find(BIL.begin(), BIL.end(), I);
+ BasicBlock::iterator It = I;
assert(It != BIL.end() && "Instruction not in own basic block??");
BIL.insert(It, Res); // Keep It pointing to old instruction
-#ifdef DEBUG_EXPR_CONVERT
- cerr << "COT CREATED: " << (void*)Res << " " << Res;
- cerr << "In: " << (void*)I << " " << I << "Out: " << (void*)Res << " " << Res;
-#endif
+ DEBUG(cerr << "COT CREATED: " << (void*)Res << " " << Res
+ << "In: " << (void*)I << " " << I << "Out: " << (void*)Res
+ << " " << Res);
// Add the instruction to the expression map
VMC.ExprMap[I] = Res;
// loops. Note that we cannot use DCE because DCE won't remove a store
// instruction, for example.
//
-#ifdef DEBUG_EXPR_CONVERT
- cerr << "DELETING: " << (void*)I << " " << I;
-#endif
+ DEBUG(cerr << "DELETING: " << (void*)I << " " << I);
BIL.remove(I);
VMC.OperandsMapped.erase(I);
VMC.ExprMap.erase(I);
ValueHandle::ValueHandle(ValueMapCache &VMC, Value *V)
: Instruction(Type::VoidTy, UserOp1, ""), Cache(VMC) {
-#ifdef DEBUG_EXPR_CONVERT
- //cerr << "VH AQUIRING: " << (void*)V << " " << V;
-#endif
+ //DEBUG(cerr << "VH AQUIRING: " << (void*)V << " " << V);
Operands.push_back(Use(V, this));
}
assert(I->getParent() && "Inst not in basic block!");
-#ifdef DEBUG_EXPR_CONVERT
- //cerr << "VH DELETING: " << (void*)I << " " << I;
-#endif
+ //DEBUG(cerr << "VH DELETING: " << (void*)I << " " << I);
for (User::op_iterator OI = I->op_begin(), OE = I->op_end();
OI != OE; ++OI)
- if (Instruction *U = dyn_cast<Instruction>(*OI)) {
+ if (Instruction *U = dyn_cast<Instruction>(OI->get())) {
*OI = 0;
RecursiveDelete(Cache, U);
}
//
RecursiveDelete(Cache, dyn_cast<Instruction>(V));
} else {
-#ifdef DEBUG_EXPR_CONVERT
- //cerr << "VH RELEASING: " << (void*)Operands[0].get() << " " << Operands[0]->use_size() << " " << Operands[0];
-#endif
+ //DEBUG(cerr << "VH RELEASING: " << (void*)Operands[0].get() << " "
+ // << Operands[0]->use_size() << " " << Operands[0]);
}
}
projects / oota-llvm.git / blobdiff