#include "TransformInternals.h"
#include "llvm/Method.h"
-#include "llvm/Support/STLExtras.h"
#include "llvm/iOther.h"
+#include "llvm/iPHINode.h"
#include "llvm/iMemory.h"
-#include "llvm/ConstPoolVals.h"
+#include "llvm/ConstantVals.h"
#include "llvm/Optimizations/ConstantHandling.h"
#include "llvm/Optimizations/DCE.h"
+#include "llvm/Analysis/Expressions.h"
+#include "Support/STLExtras.h"
#include <map>
#include <algorithm>
//#define DEBUG_EXPR_CONVERT 1
-static inline const Type *getTy(const Value *V, ValueTypeCache &CT) {
- ValueTypeCache::iterator I = CT.find(V);
- if (I == CT.end()) return V->getType();
- return I->second;
+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::op_const_iterator S = MAI->idx_begin(), E = MAI->idx_end();
+ S != E; ++S)
+ if (!isa<Constant>(*S) || !cast<Constant>(*S)->isNullValue())
+ return false;
+ return true;
+}
+
+static unsigned getBaseTypeSize(const Type *Ty) {
+ if (const ArrayType *ATy = dyn_cast<ArrayType>(Ty))
+ if (ATy->isUnsized())
+ return getBaseTypeSize(ATy->getElementType());
+ return TD.getTypeSize(Ty);
}
-GetElementPtrInst *getAddToGEPResult(const Type *Ty, const Value *V) {
- const StructType *StructTy = getPointedToStruct(Ty);
- if (StructTy == 0) return 0; // Must be a pointer to a struct...
-
- // Must be a constant unsigned offset value... get it now...
- if (!isa<ConstPoolUInt>(V)) return 0;
- unsigned Offset = cast<ConstPoolUInt>(V)->getValue();
-
- // Check to make sure the offset is somewhat legitiment w.r.t the struct
- // type...
- if (Offset >= TD.getTypeSize(StructTy)) return 0;
+
+// 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>'
+// 2. The only users of the malloc are cast & add instructions
+// 3. Of the cast instructions, there is only one destination pointer type
+// [RTy] where the size of the pointed to object is equal to the number
+// of bytes allocated.
+//
+// If these conditions hold, we convert the malloc to allocate an [RTy]
+// element. TODO: This comment is out of date WRT arrays
+//
+static bool MallocConvertableToType(MallocInst *MI, const Type *Ty,
+ ValueTypeCache &CTMap) {
+ if (!MI->isArrayAllocation() || // No array allocation?
+ !isa<PointerType>(Ty)) return false; // Malloc always returns pointers
+
+ // Deal with the type to allocate, not the pointer type...
+ Ty = cast<PointerType>(Ty)->getValueType();
+
+ // Analyze the number of bytes allocated...
+ analysis::ExprType Expr = analysis::ClassifyExpression(MI->getArraySize());
+
+ // Must have a scale or offset to analyze it...
+ if (!Expr.Offset && !Expr.Scale) return false;
+
+ if (Expr.Offset && (Expr.Scale || Expr.Var)) {
+ // This is wierd, shouldn't happen, but if it does, I wanna know about it!
+ cerr << "LevelRaise.cpp: Crazy allocation detected!\n";
+ return false;
+ }
+
+ // Get the number of bytes allocated...
+ int SizeVal = getConstantValue(Expr.Offset ? Expr.Offset : Expr.Scale);
+ if (SizeVal <= 0) {
+ cerr << "malloc of a negative number???\n";
+ return false;
+ }
+ unsigned Size = (unsigned)SizeVal;
+ unsigned ReqTypeSize = getBaseTypeSize(Ty);
+
+ // Does the size of the allocated type match the number of bytes
+ // allocated?
+ //
+ if (ReqTypeSize == Size)
+ return true;
+
+ // If not, it's possible that an array of constant size is being allocated.
+ // In this case, the Size will be a multiple of the data size.
+ //
+ if (!Expr.Offset) return false; // Offset must be set, not scale...
+
+#if 1
+ return false;
+#else // THIS CAN ONLY BE RUN VERY LATE, after several passes to make sure
+ // things are adequately raised!
+ // See if the allocated amount is a multiple of the type size...
+ if (Size/ReqTypeSize*ReqTypeSize != Size)
+ return false; // Nope.
+
+ // Unfortunately things tend to be powers of two, so there may be
+ // many false hits. We don't want to optimistically assume that we
+ // have the right type on the first try, so scan the use list of the
+ // malloc instruction, looking for the cast to the biggest type...
+ //
+ for (Value::use_iterator I = MI->use_begin(), E = MI->use_end(); I != E; ++I)
+ if (CastInst *CI = dyn_cast<CastInst>(*I))
+ if (const PointerType *PT =
+ dyn_cast<PointerType>(CI->getOperand(0)->getType()))
+ if (getBaseTypeSize(PT->getValueType()) > ReqTypeSize)
+ return false; // We found a type bigger than this one!
- // If we get this far, we have succeeded... TODO: We need to handle array
- // indexing as well...
- const StructLayout *SL = TD.getStructLayout(StructTy);
- vector<ConstPoolVal*> Offsets;
- unsigned ActualOffset = Offset;
- const Type *ElTy = getStructOffsetType(StructTy, ActualOffset, Offsets);
-
- if (ActualOffset != Offset) return 0; // TODO: Handle Array indexing...
-
- // Success! Return the GEP instruction, with a dummy first argument.
- ConstPoolVal *Dummy = ConstPoolVal::getNullConstant(Ty);
- return new GetElementPtrInst(Dummy, Offsets);
+ return true;
+#endif
}
+static Instruction *ConvertMallocToType(MallocInst *MI, const Type *Ty,
+ const string &Name, ValueMapCache &VMC){
+ BasicBlock *BB = MI->getParent();
+ BasicBlock::iterator It = BB->end();
+ // Analyze the number of bytes allocated...
+ analysis::ExprType Expr = analysis::ClassifyExpression(MI->getArraySize());
-static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
- ValueTypeCache &ConvertedTypes);
+ const PointerType *AllocTy = cast<PointerType>(Ty);
+ const Type *ElType = AllocTy->getValueType();
-static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
- ValueMapCache &VMC);
+ if (Expr.Var && !isa<ArrayType>(ElType)) {
+ ElType = ArrayType::get(AllocTy->getValueType());
+ AllocTy = PointerType::get(ElType);
+ }
+
+ // If the array size specifier is not an unsigned integer, insert a cast now.
+ if (Expr.Var && Expr.Var->getType() != Type::UIntTy) {
+ It = find(BB->getInstList().begin(), BB->getInstList().end(), MI);
+ CastInst *SizeCast = new CastInst(Expr.Var, Type::UIntTy);
+ It = BB->getInstList().insert(It, SizeCast)+1;
+ Expr.Var = SizeCast;
+ }
+
+ // Check to see if they are allocating a constant sized array of a type...
+#if 0 // THIS CAN ONLY BE RUN VERY LATE
+ if (!Expr.Var) {
+ unsigned OffsetAmount = (unsigned)getConstantValue(Expr.Offset);
+ unsigned DataSize = TD.getTypeSize(ElType);
+
+ if (OffsetAmount > DataSize) // Allocate a sized array amount...
+ Expr.Var = ConstantUInt::get(Type::UIntTy, OffsetAmount/DataSize);
+ }
+#endif
+
+ Instruction *NewI = new MallocInst(AllocTy, Expr.Var, Name);
+
+ if (AllocTy != Ty) { // Create a cast instruction to cast it to the correct ty
+ if (It == BB->end())
+ It = find(BB->getInstList().begin(), BB->getInstList().end(), MI);
+
+ // Insert the new malloc directly into the code ourselves
+ assert(It != BB->getInstList().end());
+ It = BB->getInstList().insert(It, NewI)+1;
+
+ // Return the cast as the value to use...
+ NewI = new CastInst(NewI, Ty);
+ }
+
+ return NewI;
+}
// 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 (!isFirstClassType(Ty))
return false;
ValueTypeCache::iterator CTMI = CTMap.find(V);
if (CTMI != CTMap.end()) return CTMI->second == Ty;
- CTMap[V] = Ty;
- // Expressions are only convertable if all of the users of the expression can
- // have this value converted. This makes use of the map to avoid infinite
- // recursion.
- //
- if (isa<Instruction>(V)) {
- for (Value::use_iterator I = V->use_begin(), E = V->use_end(); I != E; ++I)
- if (!OperandConvertableToType(*I, V, Ty, CTMap))
- return false;
- }
+ CTMap[V] = Ty;
Instruction *I = dyn_cast<Instruction>(V);
if (I == 0) {
// const prop'd in general). We just ask the constant propogator to see if
// it can convert the value...
//
- if (ConstPoolVal *CPV = dyn_cast<ConstPoolVal>(V))
+ if (Constant *CPV = dyn_cast<Constant>(V))
if (opt::ConstantFoldCastInstruction(CPV, Ty))
return true; // Don't worry about deallocating, it's a constant.
return false; // Otherwise, we can't convert!
}
- if (I->getType() == Ty) return false; // Expression already correct type!
switch (I->getOpcode()) {
case Instruction::Cast:
// We can convert the expr if the cast destination type is losslessly
// convertable to the requested type.
- return losslessCastableTypes(Ty, I->getType());
+ 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->getValueType()))
+ if (AT->getElementType() == DPT->getValueType())
+ return false;
+#endif
+ break;
case Instruction::Add:
case Instruction::Sub:
- return ExpressionConvertableToType(I->getOperand(0), Ty, CTMap) &&
- ExpressionConvertableToType(I->getOperand(1), Ty, CTMap);
+ if (!ExpressionConvertableToType(I->getOperand(0), Ty, CTMap) ||
+ !ExpressionConvertableToType(I->getOperand(1), Ty, CTMap))
+ return false;
+ break;
case Instruction::Shr:
if (Ty->isSigned() != V->getType()->isSigned()) return false;
// FALL THROUGH
case Instruction::Shl:
- return ExpressionConvertableToType(I->getOperand(0), Ty, CTMap);
+ if (!ExpressionConvertableToType(I->getOperand(0), Ty, CTMap))
+ return false;
+ break;
case Instruction::Load: {
LoadInst *LI = cast<LoadInst>(I);
- if (LI->hasIndices()) return false;
+ if (LI->hasIndices() && !AllIndicesZero(LI)) {
+ // We can't convert a load expression if it has indices... unless they are
+ // all zero.
+ return false;
+ }
- return ExpressionConvertableToType(LI->getPtrOperand(),
- PointerType::get(Ty), CTMap);
+ if (!ExpressionConvertableToType(LI->getPointerOperand(),
+ PointerType::get(Ty), CTMap))
+ return false;
+ break;
}
case Instruction::PHINode: {
PHINode *PN = cast<PHINode>(I);
for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i)
if (!ExpressionConvertableToType(PN->getIncomingValue(i), Ty, CTMap))
return false;
- return true;
+ break;
}
+ case Instruction::Malloc:
+ if (!MallocConvertableToType(cast<MallocInst>(I), Ty, CTMap))
+ 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...
//
- vector<ConstPoolVal*> Indices = GEP->getIndices();
- const Type *BaseType = GEP->getPtrOperand()->getType();
+ vector<Value*> Indices = GEP->copyIndices();
+ const Type *BaseType = GEP->getPointerOperand()->getType();
+ const Type *ElTy = 0;
- while (Indices.size() &&
- cast<ConstPoolUInt>(Indices.back())->getValue() == 0) {
+ while (!Indices.empty() && isa<ConstantUInt>(Indices.back()) &&
+ cast<ConstantUInt>(Indices.back())->getValue() == 0) {
Indices.pop_back();
- const Type *ElTy = GetElementPtrInst::getIndexedType(BaseType, Indices,
+ ElTy = GetElementPtrInst::getIndexedType(BaseType, Indices,
true);
if (ElTy == PTy->getValueType())
- return true; // Found a match!!
+ break; // Found a match!!
+ ElTy = 0;
}
- break; // No match, maybe next time.
+
+ if (ElTy) break;
+ return false; // No match, maybe next time.
}
+#endif
+
+ default:
+ return false;
}
- return false;
-}
+ // Expressions are only convertable if all of the users of the expression can
+ // have this value converted. This makes use of the map to avoid infinite
+ // recursion.
+ //
+ for (Value::use_iterator It = I->use_begin(), E = I->use_end(); It != E; ++It)
+ if (!OperandConvertableToType(*It, I, Ty, CTMap))
+ return false;
+ return true;
+}
Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
ValueMapCache::ExprMapTy::iterator VMCI = VMC.ExprMap.find(V);
- if (VMCI != VMC.ExprMap.end())
+ if (VMCI != VMC.ExprMap.end()) {
+ assert(VMCI->second->getType() == Ty);
return VMCI->second;
+ }
#ifdef DEBUG_EXPR_CONVERT
cerr << "CETT: " << (void*)V << " " << V;
Instruction *I = dyn_cast<Instruction>(V);
if (I == 0)
- if (ConstPoolVal *CPV = cast<ConstPoolVal>(V)) {
+ if (Constant *CPV = cast<Constant>(V)) {
// Constants are converted by constant folding the cast that is required.
// We assume here that all casts are implemented for constant prop.
Value *Result = opt::ConstantFoldCastInstruction(CPV, Ty);
assert(Result && "ConstantFoldCastInstruction Failed!!!");
+ assert(Result->getType() == Ty && "Const prop of cast failed!");
// Add the instruction to the expression map
VMC.ExprMap[V] = Result;
string Name = I->getName(); if (!Name.empty()) I->setName("");
Instruction *Res; // Result of conversion
- ValueHandle IHandle(I); // Prevent I from being removed!
+ ValueHandle IHandle(VMC, I); // Prevent I from being removed!
- ConstPoolVal *Dummy = ConstPoolVal::getNullConstant(Ty);
+ Constant *Dummy = Constant::getNullConstant(Ty);
//cerr << endl << endl << "Type:\t" << Ty << "\nInst: " << I << "BB Before: " << BB << endl;
case Instruction::Load: {
LoadInst *LI = cast<LoadInst>(I);
- assert(!LI->hasIndices());
- Res = new LoadInst(ConstPoolVal::getNullConstant(PointerType::get(Ty)),
- Name);
+ assert(!LI->hasIndices() || AllIndicesZero(LI));
+
+ Res = new LoadInst(Constant::getNullConstant(PointerType::get(Ty)), Name);
VMC.ExprMap[I] = Res;
- Res->setOperand(0, ConvertExpressionToType(LI->getPtrOperand(),
+ Res->setOperand(0, ConvertExpressionToType(LI->getPointerOperand(),
PointerType::get(Ty), VMC));
+ assert(Res->getOperand(0)->getType() == PointerType::get(Ty));
+ assert(Ty == Res->getType());
+ assert(isFirstClassType(Res->getType()) && "Load of structure or array!");
break;
}
while (OldPN->getNumOperands()) {
BasicBlock *BB = OldPN->getIncomingBlock(0);
Value *OldVal = OldPN->getIncomingValue(0);
- ValueHandle OldValHandle(OldVal);
+ ValueHandle OldValHandle(VMC, OldVal);
OldPN->removeIncomingValue(BB);
Value *V = ConvertExpressionToType(OldVal, Ty, VMC);
NewPN->addIncoming(V, BB);
break;
}
+ case Instruction::Malloc: {
+ Res = ConvertMallocToType(cast<MallocInst>(I), Ty, Name, VMC);
+ break;
+ }
+
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...
//
- vector<ConstPoolVal*> Indices = GEP->getIndices();
- const Type *BaseType = GEP->getPtrOperand()->getType();
+ vector<Value*> Indices = GEP->copyIndices();
+ const Type *BaseType = GEP->getPointerOperand()->getType();
const Type *PVTy = cast<PointerType>(Ty)->getValueType();
Res = 0;
- while (Indices.size() &&
- cast<ConstPoolUInt>(Indices.back())->getValue() == 0) {
+ while (!Indices.empty() && isa<ConstantUInt>(Indices.back()) &&
+ cast<ConstantUInt>(Indices.back())->getValue() == 0) {
Indices.pop_back();
if (GetElementPtrInst::getIndexedType(BaseType, Indices, true) == PVTy) {
if (Indices.size() == 0) {
- Res = new CastInst(GEP->getPtrOperand(), BaseType); // NOOP
+ Res = new CastInst(GEP->getPointerOperand(), BaseType); // NOOP
} else {
- Res = new GetElementPtrInst(GEP->getPtrOperand(), Indices, Name);
+ Res = new GetElementPtrInst(GEP->getPointerOperand(), Indices, Name);
}
break;
}
return 0;
}
+ 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);
cerr << "EXPR DELETING: " << (void*)I << " " << I;
#endif
BIL.remove(I);
+ VMC.OperandsMapped.erase(I);
+ VMC.ExprMap.erase(I);
delete I;
}
-// RetValConvertableToType - Return true if it is possible
-bool RetValConvertableToType(Value *V, const Type *Ty,
+// ValueConvertableToType - Return true if it is possible
+bool ValueConvertableToType(Value *V, const Type *Ty,
ValueTypeCache &ConvertedTypes) {
ValueTypeCache::iterator I = ConvertedTypes.find(V);
if (I != ConvertedTypes.end()) return I->second == Ty;
ConvertedTypes[V] = Ty;
- assert(isa<Instruction>(V) && "Can't convert ret val of non instruction");
-
// It is safe to convert the specified value to the specified type IFF all of
// the uses of the value can be converted to accept the new typed value.
//
-
-
// OperandConvertableToType - Return true if it is possible to convert operand
// V of User (instruction) U to the specified type. This is true iff it is
// possible to change the specified instruction to accept this. CTMap is a map
//
static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
ValueTypeCache &CTMap) {
- if (V->getType() == Ty) return true; // Already the right type?
+ if (V->getType() == Ty) return true; // Operand already the right type?
// Expression type must be holdable in a register.
if (!isFirstClassType(Ty))
assert(I->getOperand(0) == V);
// We can convert the expr if the cast destination type is losslessly
// convertable to the requested type.
- return losslessCastableTypes(Ty, I->getOperand(0)->getType());
+ if (!Ty->isLosslesslyConvertableTo(I->getOperand(0)->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->getValueType()))
+ if (AT->getElementType() == DPT->getValueType())
+ return false;
+#endif
+ return true;
case Instruction::Add:
- if (V == I->getOperand(0) && isa<CastInst>(I->getOperand(1))) {
- Instruction *GEP =
- getAddToGEPResult(Ty, cast<CastInst>(I->getOperand(1))->getOperand(0));
- if (GEP) { // If successful, this Add can be converted to a GEP.
- const Type *RetTy = GEP->getType(); // Get the new type...
- delete GEP; // We don't want the actual instruction yet...
+ if (V == I->getOperand(0) && isa<CastInst>(I->getOperand(1)) &&
+ isa<PointerType>(Ty)) {
+ Value *IndexVal = cast<CastInst>(I->getOperand(1))->getOperand(0);
+ vector<Value*> Indices;
+ if (const Type *ETy = ConvertableToGEP(Ty, IndexVal, Indices)) {
+ const Type *RetTy = PointerType::get(ETy);
+
// Only successful if we can convert this type to the required type
- return RetValConvertableToType(I, RetTy, CTMap);
+ if (ValueConvertableToType(I, RetTy, CTMap)) {
+ CTMap[I] = RetTy;
+ return true;
+ }
}
}
// FALLTHROUGH
case Instruction::Sub: {
- CTMap[I] = Ty;
Value *OtherOp = I->getOperand((V == I->getOperand(0)) ? 1 : 0);
- return RetValConvertableToType(I, Ty, CTMap) &&
+ return ValueConvertableToType(I, Ty, CTMap) &&
ExpressionConvertableToType(OtherOp, Ty, CTMap);
}
case Instruction::SetEQ:
// FALL THROUGH
case Instruction::Shl:
assert(I->getOperand(0) == V);
- CTMap[I] = Ty;
- return RetValConvertableToType(I, Ty, CTMap);
+ return ValueConvertableToType(I, Ty, CTMap);
case Instruction::Load:
- assert(I->getOperand(0) == V);
+ // Cannot convert the types of any subscripts...
+ if (I->getOperand(0) != V) return false;
+
if (const PointerType *PT = dyn_cast<PointerType>(Ty)) {
LoadInst *LI = cast<LoadInst>(I);
- const Type *PVTy = PT->getValueType();
-
- if (LI->hasIndices() || isa<ArrayType>(PVTy))
+
+ if (LI->hasIndices() && !AllIndicesZero(LI))
return false;
- if (!isFirstClassType(PVTy)) {
- // They could be loading the first element of a structure type...
- if (const StructType *ST = dyn_cast<StructType>(PVTy)) {
- unsigned Offset = 0; // No offset, get first leaf.
- vector<ConstPoolVal*> Offsets; // Discarded...
- const Type *Ty = getStructOffsetType(ST, Offset, Offsets, false);
- assert(Offset == 0 && "Offset changed from zero???");
- if (!isFirstClassType(Ty)) return false;
-
- // See if the leaf type is compatible with the old return type...
- if (TD.getTypeSize(Ty) != TD.getTypeSize(LI->getType()))
- return false;
+ const Type *LoadedTy = PT->getValueType();
- CTMap[LI] = Ty;
- return RetValConvertableToType(LI, Ty, CTMap);
- }
- return false;
+ // They could be loading the first element of a composite type...
+ if (const CompositeType *CT = dyn_cast<CompositeType>(LoadedTy)) {
+ unsigned Offset = 0; // No offset, get first leaf.
+ vector<Value*> Indices; // Discarded...
+ LoadedTy = getStructOffsetType(CT, Offset, Indices, false);
+ assert(Offset == 0 && "Offset changed from zero???");
}
- if (TD.getTypeSize(PVTy) != TD.getTypeSize(LI->getType()))
+ if (!isFirstClassType(LoadedTy))
+ return false;
+
+ if (TD.getTypeSize(LoadedTy) != TD.getTypeSize(LI->getType()))
return false;
- CTMap[LI] = PVTy;
- return RetValConvertableToType(LI, PVTy, CTMap);
+ return ValueConvertableToType(LI, LoadedTy, CTMap);
}
return false;
return false;
}
+ case Instruction::GetElementPtr:
+ // Convert a getelementptr [sbyte] * %reg111, uint 16 freely back to
+ // anything that is a pointer type...
+ //
+ if (I->getType() != PointerType::get(Type::SByteTy) ||
+ I->getNumOperands() != 2 || V != I->getOperand(0) ||
+ I->getOperand(1)->getType() != Type::UIntTy || !isa<PointerType>(Ty))
+ return false;
+ return true;
+
case Instruction::PHINode: {
- CTMap[I] = Ty;
PHINode *PN = cast<PHINode>(I);
for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i)
if (!ExpressionConvertableToType(PN->getIncomingValue(i), Ty, CTMap))
return false;
- return RetValConvertableToType(PN, Ty, CTMap);
+ return ValueConvertableToType(PN, Ty, CTMap);
}
-#if 0
- 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
- // change the logical offset of the GEP, it is okay and fair to remove them.
- // This can change this:
- // %t1 = getelementptr %Hosp * %hosp, ubyte 4, ubyte 0 ; <%List **>
- // %t2 = cast %List * * %t1 to %List *
- // into
- // %t2 = getelementptr %Hosp * %hosp, ubyte 4 ; <%List *>
- //
- GetElementPtrInst *GEP = cast<GetElementPtrInst>(I);
- const PointerType *PTy = dyn_cast<PointerType>(Ty);
- if (!PTy) return false;
+ case Instruction::Call: {
+ User::op_iterator OI = find(I->op_begin(), I->op_end(), V);
+ assert (OI != I->op_end() && "Not using value!");
+ unsigned OpNum = OI - I->op_begin();
- // Check to see if there are zero elements that we can remove from the
- // index array. If there are, check to see if removing them causes us to
- // get to the right type...
- //
- vector<ConstPoolVal*> Indices = GEP->getIndices();
- const Type *BaseType = GEP->getPtrOperand()->getType();
+ if (OpNum == 0)
+ return false; // Can't convert method pointer type yet. FIXME
+
+ const PointerType *MPtr = cast<PointerType>(I->getOperand(0)->getType());
+ const MethodType *MTy = cast<MethodType>(MPtr->getValueType());
+ if (!MTy->isVarArg()) return false;
- while (Indices.size() &&
- cast<ConstPoolUInt>(Indices.back())->getValue() == 0) {
- Indices.pop_back();
- const Type *ElTy = GetElementPtrInst::getIndexedType(BaseType, Indices,
- true);
- if (ElTy == PTy->getValueType())
- return true; // Found a match!!
- }
- break; // No match, maybe next time.
+ if ((OpNum-1) < MTy->getParamTypes().size())
+ 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...
+ //
+ return Ty->isLosslesslyConvertableTo(V->getType());
}
-#endif
}
return false;
}
-void ConvertUsersType(Value *V, Value *NewVal, ValueMapCache &VMC) {
- ValueHandle VH(V);
+void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC) {
+ ValueHandle VH(VMC, V);
unsigned NumUses = V->use_size();
for (unsigned It = 0; It < NumUses; ) {
//cerr << endl << endl << "Type:\t" << Ty << "\nInst: " << I << "BB Before: " << BB << endl;
// Prevent I from being removed...
- ValueHandle IHandle(I);
+ ValueHandle IHandle(VMC, I);
const Type *NewTy = NewVal->getType();
- ConstPoolVal *Dummy = (NewTy != Type::VoidTy) ?
- ConstPoolVal::getNullConstant(NewTy) : 0;
+ Constant *Dummy = (NewTy != Type::VoidTy) ?
+ Constant::getNullConstant(NewTy) : 0;
switch (I->getOpcode()) {
case Instruction::Cast:
break;
case Instruction::Add:
- if (OldVal == I->getOperand(0) && isa<CastInst>(I->getOperand(1))) {
- Res = getAddToGEPResult(NewVal->getType(),
- cast<CastInst>(I->getOperand(1))->getOperand(0));
- if (Res) { // If successful, this Add should be converted to a GEP.
+ if (OldVal == I->getOperand(0) && isa<CastInst>(I->getOperand(1)) &&
+ isa<PointerType>(NewTy)) {
+ Value *IndexVal = cast<CastInst>(I->getOperand(1))->getOperand(0);
+ vector<Value*> Indices;
+ BasicBlock::iterator It = find(BIL.begin(), BIL.end(), I);
+
+ if (const Type *ETy = ConvertableToGEP(NewTy, IndexVal, Indices, &It)) {
+ // If successful, convert the add to a GEP
+ const Type *RetTy = PointerType::get(ETy);
// First operand is actually the given pointer...
- Res->setOperand(0, NewVal);
+ Res = new GetElementPtrInst(NewVal, Indices);
+ assert(cast<PointerType>(Res->getType())->getValueType() == ETy &&
+ "ConvertableToGEP broken!");
break;
}
}
case Instruction::Load: {
assert(I->getOperand(0) == OldVal && isa<PointerType>(NewVal->getType()));
- const Type *PVTy = cast<PointerType>(NewVal->getType())->getValueType();
- if (!isFirstClassType(PVTy)) { // Must be an indirect load then...
- assert(isa<StructType>(PVTy));
+ const Type *LoadedTy = cast<PointerType>(NewVal->getType())->getValueType();
+
+ vector<Value*> Indices;
+
+ if (const CompositeType *CT = dyn_cast<CompositeType>(LoadedTy)) {
unsigned Offset = 0; // No offset, get first leaf.
- vector<ConstPoolVal*> Offsets; // Discarded...
- const Type *Ty = getStructOffsetType(PVTy, Offset, Offsets, false);
- Res = new LoadInst(NewVal, Offsets, Name);
- } else {
- Res = new LoadInst(NewVal, Name);
+ LoadedTy = getStructOffsetType(CT, Offset, Indices, false);
}
+ assert(isFirstClassType(LoadedTy));
+
+ Res = new LoadInst(NewVal, Indices, Name);
assert(isFirstClassType(Res->getType()) && "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, ConstPoolVal::getNullConstant(NewPT));
+ Res = new StoreInst(NewVal, Constant::getNullConstant(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)->getValueType();
- Res = new StoreInst(ConstPoolVal::getNullConstant(ValTy), NewVal);
+ Res = new StoreInst(Constant::getNullConstant(ValTy), NewVal);
VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), ValTy, VMC));
}
break;
}
+
+ case Instruction::GetElementPtr: {
+ // 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);
+
+ // Insert a cast right before this instruction of the index value...
+ CastInst *CIdx = new CastInst(I->getOperand(1), NewTy);
+ It = BIL.insert(It, CIdx)+1;
+
+ // Insert an add right before this instruction
+ Instruction *AddInst = BinaryOperator::create(Instruction::Add, NewVal,
+ CIdx, Name);
+ It = BIL.insert(It, AddInst)+1;
+
+ // Finally, cast the result back to our previous type...
+ Res = new CastInst(AddInst, I->getType());
+ break;
+ }
+
case Instruction::PHINode: {
PHINode *OldPN = cast<PHINode>(I);
PHINode *NewPN = new PHINode(NewTy, Name);
break;
}
-#if 0
- 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
- // change the logical offset of the GEP, it is okay and fair to remove them.
- // This can change this:
- // %t1 = getelementptr %Hosp * %hosp, ubyte 4, ubyte 0 ; <%List **>
- // %t2 = cast %List * * %t1 to %List *
- // into
- // %t2 = getelementptr %Hosp * %hosp, ubyte 4 ; <%List *>
- //
- GetElementPtrInst *GEP = cast<GetElementPtrInst>(I);
+ case Instruction::Call: {
+ Value *Meth = I->getOperand(0);
+ vector<Value*> Params(I->op_begin()+1, I->op_end());
- // Check to see if there are zero elements that we can remove from the
- // index array. If there are, check to see if removing them causes us to
- // get to the right type...
- //
- vector<ConstPoolVal*> Indices = GEP->getIndices();
- const Type *BaseType = GEP->getPtrOperand()->getType();
- const Type *PVTy = cast<PointerType>(Ty)->getValueType();
- Res = 0;
- while (Indices.size() &&
- cast<ConstPoolUInt>(Indices.back())->getValue() == 0) {
- Indices.pop_back();
- if (GetElementPtrInst::getIndexedType(BaseType, Indices, true) == PVTy) {
- if (Indices.size() == 0) {
- Res = new CastInst(GEP->getPtrOperand(), BaseType); // NOOP
- } else {
- Res = new GetElementPtrInst(GEP->getPtrOperand(), Indices, Name);
- }
- break;
- }
- }
- assert(Res && "Didn't find match!");
- break; // No match, maybe next time.
- }
-#endif
+ vector<Value*>::iterator OI = find(Params.begin(), Params.end(), OldVal);
+ assert (OI != Params.end() && "Not using value!");
+ *OI = NewVal;
+ Res = new CallInst(Meth, Params, Name);
+ break;
+ }
default:
assert(0 && "Expression convertable, but don't know how to convert?");
return;
VMC.ExprMap[I] = Res;
if (I->getType() != Res->getType())
- ConvertUsersType(I, Res, VMC);
+ ConvertValueToNewType(I, Res, VMC);
else {
for (unsigned It = 0; It < I->use_size(); ) {
User *Use = *(I->use_begin()+It);
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!!!");
+ assert(isa<ValueHandle>((Value*)*UI) &&"Uses of Instruction remain!!!");
}
}
}
-ValueHandle::ValueHandle(Value *V) : Instruction(Type::VoidTy, UserOp1, "") {
+
+ValueHandle::ValueHandle(ValueMapCache &VMC, Value *V)
+ : Instruction(Type::VoidTy, UserOp1, ""), Cache(VMC) {
#ifdef DEBUG_EXPR_CONVERT
cerr << "VH AQUIRING: " << (void*)V << " " << V;
#endif
Operands.push_back(Use(V, this));
}
-static void RecursiveDelete(Instruction *I) {
+static void RecursiveDelete(ValueMapCache &Cache, Instruction *I) {
if (!I || !I->use_empty()) return;
assert(I->getParent() && "Inst not in basic block!");
Instruction *U = dyn_cast<Instruction>(*OI);
if (U) {
*OI = 0;
- RecursiveDelete(dyn_cast<Instruction>(U));
+ RecursiveDelete(Cache, dyn_cast<Instruction>(U));
}
}
I->getParent()->getInstList().remove(I);
+
+ Cache.OperandsMapped.erase(I);
+ Cache.ExprMap.erase(I);
delete I;
}
-
ValueHandle::~ValueHandle() {
if (Operands[0]->use_size() == 1) {
Value *V = Operands[0];
// loops. Note that we cannot use DCE because DCE won't remove a store
// instruction, for example.
//
- RecursiveDelete(dyn_cast<Instruction>(V));
+ RecursiveDelete(Cache, dyn_cast<Instruction>(V));
} else {
#ifdef DEBUG_EXPR_CONVERT
cerr << "VH RELEASING: " << (void*)Operands[0].get() << " " << Operands[0]->use_size() << " " << Operands[0];
projects / oota-llvm.git / blobdiff