//===----------------------------------------------------------------------===//
#include "TransformInternals.h"
-#include "llvm/Method.h"
#include "llvm/iOther.h"
#include "llvm/iPHINode.h"
#include "llvm/iMemory.h"
-#include "llvm/ConstantVals.h"
-#include "llvm/Transforms/Scalar/ConstantHandling.h"
-#include "llvm/Transforms/Scalar/DCE.h"
+#include "llvm/ConstantHandling.h"
#include "llvm/Analysis/Expressions.h"
#include "Support/STLExtras.h"
-#include <map>
+#include "Support/StatisticReporter.h"
#include <algorithm>
#include <iostream>
using std::cerr;
-#include "llvm/Assembly/Writer.h"
-
-//#define DEBUG_EXPR_CONVERT 1
-
static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
ValueTypeCache &ConvertedTypes);
static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
ValueMapCache &VMC);
-// AllIndicesZero - Return true if all of the indices of the specified memory
-// access instruction are zero, indicating an effectively nil offset to the
-// pointer value.
-//
-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())
- return false;
- return true;
-}
-
-
// Peephole Malloc instructions: we take a look at the use chain of the
// malloc instruction, and try to find out if the following conditions hold:
// 1. The malloc is of the form: 'malloc [sbyte], uint <constant>'
analysis::ExprType Expr = analysis::ClassifyExpression(MI->getArraySize());
// Get information about the base datatype being allocated, before & after
- unsigned ReqTypeSize = TD.getTypeSize(Ty);
+ int ReqTypeSize = TD.getTypeSize(Ty);
unsigned OldTypeSize = TD.getTypeSize(MI->getType()->getElementType());
// Must have a scale or offset to analyze it...
// Get the offset and scale of the allocation...
int OffsetVal = Expr.Offset ? getConstantValue(Expr.Offset) : 0;
int ScaleVal = Expr.Scale ? getConstantValue(Expr.Scale) : (Expr.Var ? 1 : 0);
- if (ScaleVal < 0 || OffsetVal < 0) {
- cerr << "malloc of a negative number???\n";
- return false;
- }
// The old type might not be of unit size, take old size into consideration
// here...
- unsigned Offset = (unsigned)OffsetVal * OldTypeSize;
- unsigned Scale = (unsigned)ScaleVal * OldTypeSize;
+ int Offset = OffsetVal * OldTypeSize;
+ int Scale = ScaleVal * OldTypeSize;
// In order to be successful, both the scale and the offset must be a multiple
// of the requested data type's size.
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;
}
// ExpressionConvertableToType - Return true if it is possible
bool ExpressionConvertableToType(Value *V, const Type *Ty,
ValueTypeCache &CTMap) {
- if (V->getType() == Ty) return true; // Expression already correct type!
-
// Expression type must be holdable in a register.
if (!Ty->isFirstClassType())
return false;
if (CTMI != CTMap.end()) return CTMI->second == Ty;
CTMap[V] = Ty;
+ if (V->getType() == Ty) return true; // Expression already correct type!
Instruction *I = dyn_cast<Instruction>(V);
if (I == 0) {
// 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:
case Instruction::Load: {
LoadInst *LI = cast<LoadInst>(I);
- if (LI->hasIndices() && !AllIndicesZero(LI)) {
- // We can't convert a load expression if it has indices... unless they are
- // all zero.
- return false;
- }
-
if (!ExpressionConvertableToType(LI->getPointerOperand(),
PointerType::get(Ty), CTMap))
return false;
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
// index array. If there are, check to see if removing them causes us to
// get to the right type...
//
- std::vector<Value*> Indices = GEP->copyIndices();
+ std::vector<Value*> Indices(GEP->idx_begin(), GEP->idx_end());
const Type *BaseType = GEP->getPointerOperand()->getType();
const Type *ElTy = 0;
return false; // No match, maybe next time.
}
-#endif
default:
return false;
ValueMapCache::ExprMapTy::iterator VMCI = VMC.ExprMap.find(V);
if (VMCI != VMC.ExprMap.end()) {
+ const Value *GV = VMCI->second;
+ const Type *GTy = VMCI->second->getType();
assert(VMCI->second->getType() == Ty);
if (Instruction *I = dyn_cast<Instruction>(V))
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)
ValueHandle IHandle(VMC, I); // Prevent I from being removed!
- Constant *Dummy = Constant::getNullConstant(Ty);
+ Constant *Dummy = Constant::getNullValue(Ty);
switch (I->getOpcode()) {
case Instruction::Cast:
+ assert(VMC.NewCasts.count(ValueHandle(VMC, I)) == 0);
Res = new CastInst(I->getOperand(0), Ty, Name);
+ VMC.NewCasts.insert(ValueHandle(VMC, Res));
break;
case Instruction::Add:
case Instruction::Load: {
LoadInst *LI = cast<LoadInst>(I);
- assert(!LI->hasIndices() || AllIndicesZero(LI));
- Res = new LoadInst(Constant::getNullConstant(PointerType::get(Ty)), Name);
+ Res = new LoadInst(Constant::getNullValue(PointerType::get(Ty)), Name);
VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(LI->getPointerOperand(),
PointerType::get(Ty), VMC));
// index array. If there are, check to see if removing them causes us to
// get to the right type...
//
- std::vector<Value*> Indices = GEP->copyIndices();
+ std::vector<Value*> Indices(GEP->idx_begin(), GEP->idx_end());
const Type *BaseType = GEP->getPointerOperand()->getType();
const Type *PVTy = cast<PointerType>(Ty)->getElementType();
Res = 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.
Indices, &It);
if (ElTy) {
assert(ElTy == PVTy && "Internal error, setup wrong!");
- Res = new GetElementPtrInst(Constant::getNullConstant(NewSrcTy),
+ Res = new GetElementPtrInst(Constant::getNullValue(NewSrcTy),
Indices, Name);
VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),
//
if (Res == 0) {
const PointerType *NewSrcTy = PointerType::get(PVTy);
- Res = new GetElementPtrInst(Constant::getNullConstant(NewSrcTy),
- GEP->copyIndices(), Name);
+ std::vector<Value*> Indices(GEP->idx_begin(), GEP->idx_end());
+ Res = new GetElementPtrInst(Constant::getNullValue(NewSrcTy),
+ Indices, Name);
VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),
NewSrcTy, VMC));
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
-
- if (I->use_empty()) {
-#ifdef DEBUG_EXPR_CONVERT
- cerr << "EXPR DELETING: " << (void*)I << " " << I;
-#endif
- BIL.remove(I);
- VMC.OperandsMapped.erase(I);
- VMC.ExprMap.erase(I);
- delete I;
- }
+ DEBUG(cerr << "ExpIn: " << (void*)I << " " << I
+ << "ExpOut: " << (void*)Res << " " << Res);
return Res;
}
I->getType() == I->getOperand(0)->getType())
return false;
+ // Do not allow a 'cast ushort %V to uint' to have it's first operand be
+ // converted to a 'short' type. Doing so changes the way sign promotion
+ // happens, and breaks things. Only allow the cast to take place if the
+ // signedness doesn't change... or if the current cast is not a lossy
+ // conversion.
+ //
+ if (!I->getType()->isLosslesslyConvertableTo(I->getOperand(0)->getType()) &&
+ 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:
if (const PointerType *PT = dyn_cast<PointerType>(Ty)) {
LoadInst *LI = cast<LoadInst>(I);
- if (LI->hasIndices() && !AllIndicesZero(LI))
- return false;
-
const Type *LoadedTy = PT->getElementType();
// They could be loading the first element of a composite type...
case Instruction::Store: {
StoreInst *SI = cast<StoreInst>(I);
- if (SI->hasIndices()) return false;
if (V == I->getOperand(0)) {
ValueTypeCache::iterator CTMI = CTMap.find(I->getOperand(1));
// 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);
}
// Must move the same amount of data...
- if (TD.getTypeSize(ElTy) != TD.getTypeSize(I->getOperand(0)->getType()))
+ if (!ElTy->isSized() ||
+ TD.getTypeSize(ElTy) != TD.getTypeSize(I->getOperand(0)->getType()))
return false;
// Can convert store if the incoming value is convertable...
assert (OI != I->op_end() && "Not using value!");
unsigned OpNum = OI - I->op_begin();
- // Are we trying to change the method pointer value to a new type?
+ // 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());
- if (MTy == 0) return false; // Can't convert to a non ptr to method...
+ 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 method type has the
+ // Perform sanity checks to make sure that new function type has the
// correct number of arguments...
//
- unsigned NumArgs = I->getNumOperands()-1; // Don't include method ptr
+ unsigned NumArgs = I->getNumOperands()-1; // Don't include function ptr
// Cannot convert to a type that requires more fixed arguments than
// the call provides...
//
if (NumArgs < MTy->getParamTypes().size()) return false;
- // Unless this is a vararg method type, we cannot provide more arguments
+ // Unless this is a vararg function type, we cannot provide more arguments
// than are desired...
//
if (!MTy->isVarArg() && NumArgs > MTy->getParamTypes().size())
return false;
- // Okay, at this point, we know that the call and the method type match
+ // Okay, at this point, we know that the call and the function type match
// number of arguments. Now we see if we can convert the arguments
// themselves. Note that we do not require operands to be convertable,
// we can insert casts if they are convertible but not compatible. The
- // reason for this is that we prefer to have resolved methods but casted
+ // reason for this is that we prefer to have resolved functions but casted
// arguments if possible.
//
const FunctionType::ParamTypes &PTs = MTy->getParamTypes();
return false; // It's not in the varargs section...
// If we get this far, we know the value is in the varargs section of the
- // method! We can convert if we don't reinterpret the value...
+ // function! We can convert if we don't reinterpret the value...
//
return Ty->isLosslesslyConvertableTo(V->getType());
}
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("");
+ std::string Name = I->getName();
+ I->setName("");
Instruction *Res; // Result of conversion
//cerr << endl << endl << "Type:\t" << Ty << "\nInst: " << I << "BB Before: " << BB << endl;
const Type *NewTy = NewVal->getType();
Constant *Dummy = (NewTy != Type::VoidTy) ?
- Constant::getNullConstant(NewTy) : 0;
+ Constant::getNullValue(NewTy) : 0;
switch (I->getOpcode()) {
case Instruction::Cast:
- assert(I->getOperand(0) == OldVal);
- Res = new CastInst(NewVal, I->getType(), Name);
+ if (VMC.NewCasts.count(ValueHandle(VMC, I))) {
+ // This cast has already had it's value converted, causing a new cast to
+ // be created. We don't want to create YET ANOTHER cast instruction
+ // representing the original one, so just modify the operand of this cast
+ // instruction, which we know is newly created.
+ I->setOperand(0, NewVal);
+ I->setName(Name); // give I its name back
+ return;
+
+ } else {
+ Res = new CastInst(NewVal, I->getType(), Name);
+ }
break;
case Instruction::Add:
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
const Type *LoadedTy =
cast<PointerType>(NewVal->getType())->getElementType();
- std::vector<Value*> Indices;
- Indices.push_back(ConstantUInt::get(Type::UIntTy, 0));
+ Value *Src = NewVal;
if (const CompositeType *CT = dyn_cast<CompositeType>(LoadedTy)) {
+ std::vector<Value*> Indices;
+ Indices.push_back(ConstantUInt::get(Type::UIntTy, 0));
+
unsigned Offset = 0; // No offset, get first leaf.
LoadedTy = getStructOffsetType(CT, Offset, Indices, false);
- }
- assert(LoadedTy->isFirstClassType());
+ assert(LoadedTy->isFirstClassType());
- Res = new LoadInst(NewVal, Indices, Name);
+ if (Indices.size() != 1) { // Do not generate load X, 0
+ Src = new GetElementPtrInst(Src, Indices, Name+".idx");
+ // Insert the GEP instruction before this load.
+ BIL.insert(I, cast<Instruction>(Src));
+ }
+ }
+
+ Res = new LoadInst(Src, Name);
assert(Res->getType()->isFirstClassType() && "Load of structure or array!");
break;
}
case Instruction::Store: {
if (I->getOperand(0) == OldVal) { // Replace the source value
- const PointerType *NewPT = PointerType::get(NewTy);
- Res = new StoreInst(NewVal, Constant::getNullConstant(NewPT));
- VMC.ExprMap[I] = Res;
- Res->setOperand(1, ConvertExpressionToType(I->getOperand(1), NewPT, VMC));
+ // Check to see if operand #1 has already been converted...
+ ValueMapCache::ExprMapTy::iterator VMCI =
+ VMC.ExprMap.find(I->getOperand(1));
+ if (VMCI != VMC.ExprMap.end()) {
+ // Comments describing this stuff are in the OperandConvertableToType
+ // switch statement for Store...
+ //
+ const Type *ElTy =
+ cast<PointerType>(VMCI->second->getType())->getElementType();
+
+ Value *SrcPtr = VMCI->second;
+
+ if (ElTy != NewTy) {
+ // We check that this is a struct in the initial scan...
+ const StructType *SElTy = cast<StructType>(ElTy);
+
+ std::vector<Value*> Indices;
+ Indices.push_back(ConstantUInt::get(Type::UIntTy, 0));
+
+ unsigned Offset = 0;
+ const Type *Ty = getStructOffsetType(ElTy, Offset, Indices, false);
+ assert(Offset == 0 && "Offset changed!");
+ assert(NewTy == Ty && "Did not convert to correct type!");
+
+ SrcPtr = new GetElementPtrInst(SrcPtr, Indices,
+ SrcPtr->getName()+".idx");
+ // Insert the GEP instruction before this load.
+ BIL.insert(I, cast<Instruction>(SrcPtr));
+ }
+ Res = new StoreInst(NewVal, SrcPtr);
+
+ VMC.ExprMap[I] = Res;
+ } else {
+ // Otherwise, we haven't converted Operand #1 over yet...
+ const PointerType *NewPT = PointerType::get(NewTy);
+ Res = new StoreInst(NewVal, Constant::getNullValue(NewPT));
+ VMC.ExprMap[I] = Res;
+ Res->setOperand(1, ConvertExpressionToType(I->getOperand(1),
+ NewPT, VMC));
+ }
} else { // Replace the source pointer
const Type *ValTy = cast<PointerType>(NewTy)->getElementType();
- std::vector<Value*> Indices;
+
+ Value *SrcPtr = NewVal;
if (isa<StructType>(ValTy)) {
- unsigned Offset = 0;
+ std::vector<Value*> Indices;
Indices.push_back(ConstantUInt::get(Type::UIntTy, 0));
+
+ unsigned Offset = 0;
ValTy = getStructOffsetType(ValTy, Offset, Indices, false);
+
assert(Offset == 0 && ValTy);
+
+ SrcPtr = new GetElementPtrInst(SrcPtr, Indices,
+ SrcPtr->getName()+".idx");
+ // Insert the GEP instruction before this load.
+ BIL.insert(I, cast<Instruction>(SrcPtr));
}
- Res = new StoreInst(Constant::getNullConstant(ValTy), NewVal, Indices);
+ Res = new StoreInst(Constant::getNullValue(ValTy), SrcPtr);
VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), ValTy, VMC));
}
// 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.
// to getelementptr long * %reg123, uint %N
// ... where the type must simply stay the same size...
//
- Res = new GetElementPtrInst(NewVal,
- cast<GetElementPtrInst>(I)->copyIndices(),
- Name);
+ GetElementPtrInst *GEP = cast<GetElementPtrInst>(I);
+ std::vector<Value*> Indices(GEP->idx_begin(), GEP->idx_end());
+ Res = new GetElementPtrInst(NewVal, Indices, Name);
}
#endif
break;
Value *Meth = I->getOperand(0);
std::vector<Value*> Params(I->op_begin()+1, I->op_end());
- if (Meth == OldVal) { // Changing the method pointer?
- PointerType *NewPTy = cast<PointerType>(NewVal->getType());
- FunctionType *NewTy = cast<FunctionType>(NewPTy->getElementType());
+ if (Meth == OldVal) { // Changing the function pointer?
+
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
// operands if needbe. Note that we do not require operands to be
// convertable, we can insert casts if they are convertible but not
// compatible. The reason for this is that we prefer to have resolved
- // methods but casted arguments if possible.
+ // 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;
Use->replaceUsesOfWith(I, Res);
}
- if (I->use_empty()) {
- // Now we just need to remove the old instruction so we don't get infinite
- // 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
- BIL.remove(I);
- VMC.OperandsMapped.erase(I);
- VMC.ExprMap.erase(I);
- delete I;
- } else {
- for (Value::use_iterator UI = I->use_begin(), UE = I->use_end();
- UI != UE; ++UI)
- assert(isa<ValueHandle>((Value*)*UI) &&"Uses of Instruction remain!!!");
- }
+ for (Value::use_iterator UI = I->use_begin(), UE = I->use_end();
+ UI != UE; ++UI)
+ assert(isa<ValueHandle>((Value*)*UI) &&"Uses of Instruction remain!!!");
}
}
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));
}
+ValueHandle::ValueHandle(const ValueHandle &VH)
+ : Instruction(Type::VoidTy, UserOp1, ""), Cache(VH.Cache) {
+ //DEBUG(cerr << "VH AQUIRING: " << (void*)V << " " << V);
+ Operands.push_back(Use((Value*)VH.getOperand(0), this));
+}
+
static void RecursiveDelete(ValueMapCache &Cache, Instruction *I) {
if (!I || !I->use_empty()) return;
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