//===- ExprTypeConvert.cpp - Code to change an LLVM Expr Type -------------===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file was developed by the LLVM research group and is distributed under
// the University of Illinois Open Source License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file implements the part of level raising that checks to see if it is
//===----------------------------------------------------------------------===//
#include "TransformInternals.h"
-#include "llvm/iOther.h"
-#include "llvm/iPHINode.h"
-#include "llvm/iMemory.h"
-#include "llvm/ConstantHandling.h"
-#include "llvm/Analysis/Expressions.h"
-#include "Support/STLExtras.h"
-#include "Support/Debug.h"
+#include "llvm/Constants.h"
+#include "llvm/Instructions.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/Debug.h"
#include <algorithm>
-
-namespace llvm {
+#include <iostream>
+using namespace llvm;
static bool OperandConvertibleToType(User *U, Value *V, const Type *Ty,
ValueTypeCache &ConvertedTypes,
static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
ValueMapCache &VMC, const TargetData &TD);
-// 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 MallocConvertibleToType(MallocInst *MI, const Type *Ty,
- ValueTypeCache &CTMap,
- const TargetData &TD) {
- if (!isa<PointerType>(Ty)) return false; // Malloc always returns pointers
-
- // Deal with the type to allocate, not the pointer type...
- Ty = cast<PointerType>(Ty)->getElementType();
- if (!Ty->isSized()) return false; // Can only alloc something with a size
-
- // Analyze the number of bytes allocated...
- ExprType Expr = ClassifyExpression(MI->getArraySize());
-
- // Get information about the base datatype being allocated, before & after
- int ReqTypeSize = TD.getTypeSize(Ty);
- if (ReqTypeSize == 0) return false;
- unsigned OldTypeSize = TD.getTypeSize(MI->getType()->getElementType());
-
- // Must have a scale or offset to analyze it...
- if (!Expr.Offset && !Expr.Scale && OldTypeSize == 1) return false;
-
- // Get the offset and scale of the allocation...
- int64_t OffsetVal = Expr.Offset ? getConstantValue(Expr.Offset) : 0;
- int64_t ScaleVal = Expr.Scale ? getConstantValue(Expr.Scale) :(Expr.Var != 0);
-
- // The old type might not be of unit size, take old size into consideration
- // here...
- int64_t Offset = OffsetVal * OldTypeSize;
- int64_t 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.
- //
- if (Offset/ReqTypeSize*ReqTypeSize != Offset ||
- Scale/ReqTypeSize*ReqTypeSize != Scale)
- return false; // Nope.
-
- return true;
-}
-
-static Instruction *ConvertMallocToType(MallocInst *MI, const Type *Ty,
- const std::string &Name,
- ValueMapCache &VMC,
- const TargetData &TD){
- BasicBlock *BB = MI->getParent();
- BasicBlock::iterator It = BB->end();
-
- // Analyze the number of bytes allocated...
- ExprType Expr = ClassifyExpression(MI->getArraySize());
-
- const PointerType *AllocTy = cast<PointerType>(Ty);
- const Type *ElType = AllocTy->getElementType();
-
- unsigned DataSize = TD.getTypeSize(ElType);
- unsigned OldTypeSize = TD.getTypeSize(MI->getType()->getElementType());
-
- // Get the offset and scale coefficients that we are allocating...
- int64_t OffsetVal = (Expr.Offset ? getConstantValue(Expr.Offset) : 0);
- int64_t ScaleVal = Expr.Scale ? getConstantValue(Expr.Scale) : (Expr.Var !=0);
-
- // The old type might not be of unit size, take old size into consideration
- // here...
- unsigned Offset = (uint64_t)OffsetVal * OldTypeSize / DataSize;
- unsigned Scale = (uint64_t)ScaleVal * OldTypeSize / DataSize;
-
- // Locate the malloc instruction, because we may be inserting instructions
- It = MI;
-
- // If we have a scale, apply it first...
- if (Expr.Var) {
- // Expr.Var is not necessarily unsigned right now, insert a cast now.
- if (Expr.Var->getType() != Type::UIntTy)
- Expr.Var = new CastInst(Expr.Var, Type::UIntTy,
- Expr.Var->getName()+"-uint", It);
-
- if (Scale != 1)
- Expr.Var = BinaryOperator::create(Instruction::Mul, Expr.Var,
- ConstantUInt::get(Type::UIntTy, Scale),
- Expr.Var->getName()+"-scl", It);
-
- } else {
- // If we are not scaling anything, just make the offset be the "var"...
- Expr.Var = ConstantUInt::get(Type::UIntTy, Offset);
- Offset = 0; Scale = 1;
- }
-
- // If we have an offset now, add it in...
- if (Offset != 0) {
- assert(Expr.Var && "Var must be nonnull by now!");
- Expr.Var = BinaryOperator::create(Instruction::Add, Expr.Var,
- ConstantUInt::get(Type::UIntTy, Offset),
- Expr.Var->getName()+"-off", It);
- }
-
- assert(AllocTy == Ty);
- return new MallocInst(AllocTy->getElementType(), Expr.Var, Name);
-}
-
// ExpressionConvertibleToType - Return true if it is possible
-bool ExpressionConvertibleToType(Value *V, const Type *Ty,
+bool llvm::ExpressionConvertibleToType(Value *V, const Type *Ty,
ValueTypeCache &CTMap, const TargetData &TD) {
// Expression type must be holdable in a register.
if (!Ty->isFirstClassType())
return false;
-
+
ValueTypeCache::iterator CTMI = CTMap.find(V);
if (CTMI != CTMap.end()) return CTMI->second == Ty;
// If it's a constant... all constants can be converted to a different
- // type. We just ask the constant propagator to see if it can convert the
- // value...
+ // type.
//
- if (Constant *CPV = dyn_cast<Constant>(V))
- return ConstantFoldCastInstruction(CPV, Ty);
-
+ if (isa<Constant>(V) && !isa<GlobalValue>(V))
+ return true;
+
CTMap[V] = Ty;
if (V->getType() == Ty) return true; // Expression already correct type!
// 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 (const PointerType *SPT =
+ 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 (!ExpressionConvertibleToType(LI->getPointerOperand(),
PointerType::get(Ty), CTMap, TD))
return false;
- break;
+ break;
}
case Instruction::PHI: {
PHINode *PN = cast<PHINode>(I);
+ // Be conservative if we find a giant PHI node.
+ if (PN->getNumIncomingValues() > 32) return false;
+
for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i)
if (!ExpressionConvertibleToType(PN->getIncomingValue(i), Ty, CTMap, TD))
return false;
break;
}
- case Instruction::Malloc:
- if (!MallocConvertibleToType(cast<MallocInst>(I), Ty, CTMap, TD))
- return false;
- break;
-
case Instruction::GetElementPtr: {
// GetElementPtr's are directly convertible to a pointer type if they have
// a number of zeros at the end. Because removing these values does not
// %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; // GEP must always return a pointer...
if (ElTy) break; // Found a number of zeros we can strip off!
- // Otherwise, we can convert a GEP from one form to the other iff the
- // current gep is of the form 'getelementptr sbyte*, long N
- // and we could convert this to an appropriate GEP for the new type.
- //
- if (GEP->getNumOperands() == 2 &&
- GEP->getOperand(1)->getType() == Type::LongTy &&
- GEP->getType() == PointerType::get(Type::SByteTy)) {
-
- // Do not Check to see if our incoming pointer can be converted
- // to be a ptr to an array of the right type... because in more cases than
- // not, it is simply not analyzable because of pointer/array
- // discrepancies. To fix this, we will insert a cast before the GEP.
- //
-
- // Check to see if 'N' is an expression that can be converted to
- // the appropriate size... if so, allow it.
- //
- std::vector<Value*> Indices;
- const Type *ElTy = ConvertibleToGEP(PTy, I->getOperand(1), Indices, TD);
- if (ElTy == PVTy) {
- if (!ExpressionConvertibleToType(I->getOperand(0),
- PointerType::get(ElTy), CTMap, TD))
- return false; // Can't continue, ExConToTy might have polluted set!
- break;
- }
- }
-
// Otherwise, it could be that we have something like this:
// getelementptr [[sbyte] *] * %reg115, long %reg138 ; [sbyte]**
// and want to convert it into something like this:
// getelemenptr [[int] *] * %reg115, long %reg138 ; [int]**
//
- if (GEP->getNumOperands() == 2 &&
- GEP->getOperand(1)->getType() == Type::LongTy &&
+ if (GEP->getNumOperands() == 2 &&
PTy->getElementType()->isSized() &&
- TD.getTypeSize(PTy->getElementType()) ==
+ TD.getTypeSize(PTy->getElementType()) ==
TD.getTypeSize(GEP->getType()->getElementType())) {
const PointerType *NewSrcTy = PointerType::get(PVTy);
if (!ExpressionConvertibleToType(I->getOperand(0), NewSrcTy, CTMap, TD))
//
const PointerType *PT = cast<PointerType>(I->getOperand(0)->getType());
const FunctionType *FT = cast<FunctionType>(PT->getElementType());
- std::vector<const Type *> ArgTys(FT->getParamTypes().begin(),
- FT->getParamTypes().end());
+ std::vector<const Type *> ArgTys(FT->param_begin(), FT->param_end());
const FunctionType *NewTy =
FunctionType::get(Ty, ArgTys, FT->isVarArg());
if (!ExpressionConvertibleToType(I->getOperand(0),
}
-Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC,
- const TargetData &TD) {
+Value *llvm::ConvertExpressionToType(Value *V, const Type *Ty,
+ ValueMapCache &VMC, const TargetData &TD) {
if (V->getType() == Ty) return V; // Already where we need to be?
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;
}
- DEBUG(std::cerr << "CETT: " << (void*)V << " " << V);
+ DEBUG(std::cerr << "CETT: " << (void*)V << " " << *V);
Instruction *I = dyn_cast<Instruction>(V);
if (I == 0) {
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 = ConstantFoldCastInstruction(CPV, Ty);
- assert(Result && "ConstantFoldCastInstruction Failed!!!");
- assert(Result->getType() == Ty && "Const prop of cast failed!");
-
+ Value *Result = ConstantExpr::getCast(CPV, Ty);
// Add the instruction to the expression map
//VMC.ExprMap[V] = Result;
return Result;
Instruction *Res; // Result of conversion
ValueHandle IHandle(VMC, I); // Prevent I from being removed!
-
+
Constant *Dummy = Constant::getNullValue(Ty);
switch (I->getOpcode()) {
Res = new CastInst(I->getOperand(0), Ty, Name);
VMC.NewCasts.insert(ValueHandle(VMC, Res));
break;
-
+
case Instruction::Add:
case Instruction::Sub:
Res = BinaryOperator::create(cast<BinaryOperator>(I)->getOpcode(),
break;
}
- case Instruction::Malloc: {
- Res = ConvertMallocToType(cast<MallocInst>(I), Ty, Name, VMC, TD);
- break;
- }
-
case Instruction::GetElementPtr: {
// GetElementPtr's are directly convertible to a pointer type if they have
// a number of zeros at the end. Because removing these values does not
// %t2 = cast %List * * %t1 to %List *
// into
// %t2 = getelementptr %Hosp * %hosp, ubyte 4 ; <%List *>
- //
+ //
GetElementPtrInst *GEP = cast<GetElementPtrInst>(I);
// Check to see if there are zero elements that we can remove from the
}
}
- if (Res == 0 && GEP->getNumOperands() == 2 &&
- GEP->getOperand(1)->getType() == Type::LongTy &&
- GEP->getType() == PointerType::get(Type::SByteTy)) {
-
- // Otherwise, we can convert a GEP from one form to the other iff the
- // current gep is of the form 'getelementptr [sbyte]*, unsigned N
- // and we could convert this to an appropriate GEP for the new type.
- //
- const PointerType *NewSrcTy = PointerType::get(PVTy);
- BasicBlock::iterator It = I;
-
- // Check to see if 'N' is an expression that can be converted to
- // the appropriate size... if so, allow it.
- //
- std::vector<Value*> Indices;
- const Type *ElTy = ConvertibleToGEP(NewSrcTy, I->getOperand(1),
- Indices, TD, &It);
- if (ElTy) {
- assert(ElTy == PVTy && "Internal error, setup wrong!");
- Res = new GetElementPtrInst(Constant::getNullValue(NewSrcTy),
- Indices, Name);
- VMC.ExprMap[I] = Res;
- Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),
- NewSrcTy, VMC, TD));
- }
- }
-
// Otherwise, it could be that we have something like this:
// getelementptr [[sbyte] *] * %reg115, uint %reg138 ; [sbyte]**
// and want to convert it into something like this:
//
const PointerType *PT = cast<PointerType>(I->getOperand(0)->getType());
const FunctionType *FT = cast<FunctionType>(PT->getElementType());
- std::vector<const Type *> ArgTys(FT->getParamTypes().begin(),
- FT->getParamTypes().end());
+ std::vector<const Type *> ArgTys(FT->param_begin(), FT->param_end());
const FunctionType *NewTy =
FunctionType::get(Ty, ArgTys, FT->isVarArg());
const PointerType *NewPTy = PointerType::get(NewTy);
Res = new CallInst(Constant::getNullValue(NewPTy),
std::vector<Value*>(I->op_begin()+1, I->op_end()),
Name);
+ if (cast<CallInst>(I)->isTailCall())
+ cast<CallInst>(Res)->setTailCall();
+ cast<CallInst>(Res)->setCallingConv(cast<CallInst>(I)->getCallingConv());
VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),NewPTy,VMC,TD));
break;
VMC.ExprMap[I] = Res;
- unsigned NumUses = I->use_size();
+ //// WTF is this code! FIXME: remove this.
+ unsigned NumUses = I->getNumUses();
for (unsigned It = 0; It < NumUses; ) {
unsigned OldSize = NumUses;
Value::use_iterator UI = I->use_begin();
std::advance(UI, It);
ConvertOperandToType(*UI, I, Res, VMC, TD);
- NumUses = I->use_size();
+ NumUses = I->getNumUses();
if (NumUses == OldSize) ++It;
}
- DEBUG(std::cerr << "ExpIn: " << (void*)I << " " << I
- << "ExpOut: " << (void*)Res << " " << Res);
+ DEBUG(std::cerr << "ExpIn: " << (void*)I << " " << *I
+ << "ExpOut: " << (void*)Res << " " << *Res);
return Res;
}
// ValueConvertibleToType - Return true if it is possible
-bool ValueConvertibleToType(Value *V, const Type *Ty,
- ValueTypeCache &ConvertedTypes,
- const TargetData &TD) {
+bool llvm::ValueConvertibleToType(Value *V, const Type *Ty,
+ ValueTypeCache &ConvertedTypes,
+ const TargetData &TD) {
ValueTypeCache::iterator I = ConvertedTypes.find(V);
if (I != ConvertedTypes.end()) return I->second == Ty;
ConvertedTypes[V] = Ty;
// 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 (const PointerType *SPT =
+ 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()))
return true;
case Instruction::Add:
- if (isa<PointerType>(Ty)) {
- Value *IndexVal = I->getOperand(V == I->getOperand(0) ? 1 : 0);
- std::vector<Value*> Indices;
- if (const Type *ETy = ConvertibleToGEP(Ty, IndexVal, Indices, TD)) {
- const Type *RetTy = PointerType::get(ETy);
-
- // Only successful if we can convert this type to the required type
- if (ValueConvertibleToType(I, RetTy, CTMap, TD)) {
- CTMap[I] = RetTy;
- return true;
- }
- // We have to return failure here because ValueConvertibleToType could
- // have polluted our map
- return false;
- }
- }
- // FALLTHROUGH
case Instruction::Sub: {
if (!Ty->isInteger() && !Ty->isFloatingPoint()) return false;
if (const PointerType *PT = dyn_cast<PointerType>(Ty)) {
LoadInst *LI = cast<LoadInst>(I);
-
+
const Type *LoadedTy = PT->getElementType();
// They could be loading the first element of a composite type...
return false;
case Instruction::Store: {
- StoreInst *SI = cast<StoreInst>(I);
-
if (V == I->getOperand(0)) {
ValueTypeCache::iterator CTMI = CTMap.find(I->getOperand(1));
if (CTMI != CTMap.end()) { // Operand #1 is in the table already?
assert(Offset == 0 && "Offset changed!");
if (ElTy == 0) // Element at offset zero in struct doesn't exist!
return false; // Can only happen for {}*
-
+
if (ElTy == Ty) // Looks like the 0th element of structure is
return true; // compatible! Accept now!
}
// Must move the same amount of data...
- if (!ElTy->isSized() ||
+ if (!ElTy->isSized() ||
TD.getTypeSize(ElTy) != TD.getTypeSize(I->getOperand(0)->getType()))
return false;
- // Can convert store if the incoming value is convertible...
- return ExpressionConvertibleToType(I->getOperand(0), ElTy, CTMap, TD);
+ // Can convert store if the incoming value is convertible and if the
+ // result will preserve semantics...
+ const Type *Op0Ty = I->getOperand(0)->getType();
+ if (!(Op0Ty->isIntegral() ^ ElTy->isIntegral()) &&
+ !(Op0Ty->isFloatingPoint() ^ ElTy->isFloatingPoint()))
+ return ExpressionConvertibleToType(I->getOperand(0), ElTy, CTMap, TD);
}
return false;
}
- case Instruction::GetElementPtr:
- if (V != I->getOperand(0) || !isa<PointerType>(Ty)) return false;
-
- // If we have a two operand form of getelementptr, this is really little
- // more than a simple addition. As with addition, check to see if the
- // getelementptr instruction can be changed to index into the new type.
- //
- if (I->getNumOperands() == 2) {
- const Type *OldElTy = cast<PointerType>(I->getType())->getElementType();
- unsigned DataSize = TD.getTypeSize(OldElTy);
- Value *Index = I->getOperand(1);
- Instruction *TempScale = 0;
-
- // If the old data element is not unit sized, we have to create a scale
- // instruction so that ConvertibleToGEP will know the REAL amount we are
- // indexing by. Note that this is never inserted into the instruction
- // stream, so we have to delete it when we're done.
- //
- if (DataSize != 1) {
- TempScale = BinaryOperator::create(Instruction::Mul, Index,
- ConstantSInt::get(Type::LongTy,
- DataSize));
- Index = TempScale;
- }
-
- // 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*> Indices;
- const Type *ElTy = ConvertibleToGEP(Ty, Index, Indices, TD);
- delete TempScale; // Free our temporary multiply if we made it
-
- if (ElTy == 0) return false; // Cannot make conversion...
- return ValueConvertibleToType(I, PointerType::get(ElTy), CTMap, TD);
- }
- return false;
-
case Instruction::PHI: {
PHINode *PN = cast<PHINode>(I);
+ // Be conservative if we find a giant PHI node.
+ if (PN->getNumIncomingValues() > 32) return false;
+
for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i)
if (!ExpressionConvertibleToType(PN->getIncomingValue(i), Ty, CTMap, TD))
return false;
}
case Instruction::Call: {
- User::op_iterator OI = find(I->op_begin(), I->op_end(), V);
+ User::op_iterator OI = std::find(I->op_begin(), I->op_end(), V);
assert (OI != I->op_end() && "Not using value!");
unsigned OpNum = OI - I->op_begin();
// the call provides...
//
if (NumArgs < FTy->getNumParams()) return false;
-
+
// Unless this is a vararg function type, we cannot provide more arguments
// than are desired...
//
// reason for this is that we prefer to have resolved functions but casted
// arguments if possible.
//
- const FunctionType::ParamTypes &PTs = FTy->getParamTypes();
- for (unsigned i = 0, NA = PTs.size(); i < NA; ++i)
- if (!PTs[i]->isLosslesslyConvertibleTo(I->getOperand(i+1)->getType()))
+ for (unsigned i = 0, NA = FTy->getNumParams(); i < NA; ++i)
+ if (!FTy->getParamType(i)->isLosslesslyConvertibleTo(I->getOperand(i+1)->getType()))
return false; // Operands must have compatible types!
// Okay, at this point, we know that all of the arguments can be
//
return ValueConvertibleToType(I, FTy->getReturnType(), CTMap, TD);
}
-
+
const PointerType *MPtr = cast<PointerType>(I->getOperand(0)->getType());
const FunctionType *FTy = cast<FunctionType>(MPtr->getElementType());
if (!FTy->isVarArg()) return false;
- if ((OpNum-1) < FTy->getParamTypes().size())
+ if ((OpNum-1) < FTy->getNumParams())
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
}
-void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC,
- const TargetData &TD) {
+void llvm::ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC,
+ const TargetData &TD) {
ValueHandle VH(VMC, V);
- unsigned NumUses = V->use_size();
+ // FIXME: This is horrible!
+ unsigned NumUses = V->getNumUses();
for (unsigned It = 0; It < NumUses; ) {
unsigned OldSize = NumUses;
Value::use_iterator UI = V->use_begin();
std::advance(UI, It);
ConvertOperandToType(*UI, V, NewVal, VMC, TD);
- NumUses = V->use_size();
+ NumUses = V->getNumUses();
if (NumUses == OldSize) ++It;
}
}
ValueHandle IHandle(VMC, I);
const Type *NewTy = NewVal->getType();
- Constant *Dummy = (NewTy != Type::VoidTy) ?
+ Constant *Dummy = (NewTy != Type::VoidTy) ?
Constant::getNullValue(NewTy) : 0;
switch (I->getOpcode()) {
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 = I;
-
- if (const Type *ETy = ConvertibleToGEP(NewTy, IndexVal, Indices, TD,&It)){
- // If successful, convert the add to a GEP
- //const Type *RetTy = PointerType::get(ETy);
- // First operand is actually the given pointer...
- Res = new GetElementPtrInst(NewVal, Indices, Name);
- assert(cast<PointerType>(Res->getType())->getElementType() == ETy &&
- "ConvertibleToGEP broken!");
- break;
- }
- }
- // FALLTHROUGH
-
case Instruction::Sub:
case Instruction::SetEQ:
case Instruction::SetNE: {
unsigned OtherIdx = (OldVal == I->getOperand(0)) ? 1 : 0;
Value *OtherOp = I->getOperand(OtherIdx);
+ Res->setOperand(!OtherIdx, NewVal);
Value *NewOther = ConvertExpressionToType(OtherOp, NewTy, VMC, TD);
-
Res->setOperand(OtherIdx, NewOther);
- Res->setOperand(!OtherIdx, NewVal);
break;
}
case Instruction::Shl:
if (const CompositeType *CT = dyn_cast<CompositeType>(LoadedTy)) {
std::vector<Value*> Indices;
- Indices.push_back(ConstantSInt::get(Type::LongTy, 0));
+ Indices.push_back(Constant::getNullValue(Type::UIntTy));
unsigned Offset = 0; // No offset, get first leaf.
LoadedTy = getStructOffsetType(CT, Offset, Indices, TD, false);
Src = new GetElementPtrInst(Src, Indices, Name+".idx", I);
}
}
-
+
Res = new LoadInst(Src, Name);
assert(Res->getType()->isFirstClassType() && "Load of structure or array!");
break;
//
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(Constant::getNullValue(Type::LongTy));
+ Indices.push_back(Constant::getNullValue(Type::UIntTy));
unsigned Offset = 0;
const Type *Ty = getStructOffsetType(ElTy, Offset, Indices, TD,false);
if (isa<StructType>(ValTy)) {
std::vector<Value*> Indices;
- Indices.push_back(Constant::getNullValue(Type::LongTy));
+ Indices.push_back(Constant::getNullValue(Type::UIntTy));
unsigned Offset = 0;
ValTy = getStructOffsetType(ValTy, Offset, Indices, TD, false);
break;
}
-
- case Instruction::GetElementPtr: {
- // Convert a one index getelementptr into just about anything that is
- // desired.
- //
- BasicBlock::iterator It = I;
- const Type *OldElTy = cast<PointerType>(I->getType())->getElementType();
- unsigned DataSize = TD.getTypeSize(OldElTy);
- Value *Index = I->getOperand(1);
-
- if (DataSize != 1) {
- // Insert a multiply of the old element type is not a unit size...
- Index = BinaryOperator::create(Instruction::Mul, Index,
- ConstantSInt::get(Type::LongTy, DataSize),
- "scale", It);
- }
-
- // Perform the conversion now...
- //
- std::vector<Value*> Indices;
- const Type *ElTy = ConvertibleToGEP(NewVal->getType(),Index,Indices,TD,&It);
- assert(ElTy != 0 && "GEP Conversion Failure!");
- Res = new GetElementPtrInst(NewVal, Indices, Name);
- assert(Res->getType() == PointerType::get(ElTy) &&
- "ConvertibleToGet failed!");
- }
-#if 0
- if (I->getType() == PointerType::get(Type::SByteTy)) {
- // Convert a getelementptr sbyte * %reg111, uint 16 freely back to
- // anything that is a pointer type...
- //
- 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*> Indices;
- const Type *ElTy = ConvertibleToGEP(NewVal->getType(), I->getOperand(1),
- Indices, TD, &It);
- assert(ElTy != 0 && "GEP Conversion Failure!");
-
- Res = new GetElementPtrInst(NewVal, Indices, Name);
- } else {
- // Convert a getelementptr ulong * %reg123, uint %N
- // to getelementptr long * %reg123, uint %N
- // ... where the type must simply stay the same size...
- //
- GetElementPtrInst *GEP = cast<GetElementPtrInst>(I);
- std::vector<Value*> Indices(GEP->idx_begin(), GEP->idx_end());
- Res = new GetElementPtrInst(NewVal, Indices, Name);
- }
-#endif
- break;
-
case Instruction::PHI: {
PHINode *OldPN = cast<PHINode>(I);
PHINode *NewPN = new PHINode(NewTy, Name);
while (OldPN->getNumOperands()) {
BasicBlock *BB = OldPN->getIncomingBlock(0);
Value *OldVal = OldPN->getIncomingValue(0);
+ ValueHandle OldValHandle(VMC, OldVal);
OldPN->removeIncomingValue(BB, false);
Value *V = ConvertExpressionToType(OldVal, NewTy, VMC, TD);
NewPN->addIncoming(V, BB);
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();
if (NewTy->getReturnType() == Type::VoidTy)
Name = ""; // Make sure not to name a void call!
// 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.
//
- for (unsigned i = 0; i < PTs.size(); ++i)
- if (Params[i]->getType() != PTs[i]) {
+ for (unsigned i = 0; i != NewTy->getNumParams(); ++i)
+ if (Params[i]->getType() != NewTy->getParamType(i)) {
// Create a cast to convert it to the right type, we know that this
// is a lossless cast...
//
- Params[i] = new CastInst(Params[i], PTs[i], "callarg.cast." +
+ Params[i] = new CastInst(Params[i], NewTy->getParamType(i),
+ "callarg.cast." +
Params[i]->getName(), It);
}
Meth = NewVal; // Update call destination to new value
} else { // Changing an argument, must be in vararg area
std::vector<Value*>::iterator OI =
- find(Params.begin(), Params.end(), OldVal);
+ std::find(Params.begin(), Params.end(), OldVal);
assert (OI != Params.end() && "Not using value!");
*OI = NewVal;
}
Res = new CallInst(Meth, Params, Name);
+ if (cast<CallInst>(I)->isTailCall())
+ cast<CallInst>(Res)->setTailCall();
+ cast<CallInst>(Res)->setCallingConv(cast<CallInst>(I)->getCallingConv());
break;
}
default:
assert(It != BB->end() && "Instruction not in own basic block??");
BB->getInstList().insert(It, Res); // Keep It pointing to old instruction
- DEBUG(std::cerr << "COT CREATED: " << (void*)Res << " " << Res
- << "In: " << (void*)I << " " << I << "Out: " << (void*)Res
- << " " << Res);
+ DEBUG(std::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;
if (I->getType() != Res->getType())
ConvertValueToNewType(I, Res, VMC, TD);
else {
- bool FromStart = true;
- Value::use_iterator UI;
- while (1) {
- if (FromStart) UI = I->use_begin();
- if (UI == I->use_end()) break;
-
+ for (Value::use_iterator UI = I->use_begin(), E = I->use_end();
+ UI != E; )
if (isa<ValueHandle>(*UI)) {
++UI;
- FromStart = false;
} else {
- User *U = *UI;
- if (!FromStart) --UI;
- U->replaceUsesOfWith(I, Res);
- if (!FromStart) ++UI;
+ Use &U = UI.getUse();
+ ++UI; // Do not invalidate UI.
+ U.set(Res);
}
- }
}
}
ValueHandle::ValueHandle(ValueMapCache &VMC, Value *V)
- : Instruction(Type::VoidTy, UserOp1, ""), Cache(VMC) {
+ : Instruction(Type::VoidTy, UserOp1, &Op, 1, ""), Op(V, this), Cache(VMC) {
//DEBUG(std::cerr << "VH AQUIRING: " << (void*)V << " " << V);
- Operands.push_back(Use(V, this));
}
ValueHandle::ValueHandle(const ValueHandle &VH)
- : Instruction(Type::VoidTy, UserOp1, ""), Cache(VH.Cache) {
+ : Instruction(Type::VoidTy, UserOp1, &Op, 1, ""),
+ Op(VH.Op, this), Cache(VH.Cache) {
//DEBUG(std::cerr << "VH AQUIRING: " << (void*)V << " " << V);
- Operands.push_back(Use((Value*)VH.getOperand(0), this));
}
static void RecursiveDelete(ValueMapCache &Cache, Instruction *I) {
//DEBUG(std::cerr << "VH DELETING: " << (void*)I << " " << I);
- for (User::op_iterator OI = I->op_begin(), OE = I->op_end();
+ for (User::op_iterator OI = I->op_begin(), OE = I->op_end();
OI != OE; ++OI)
if (Instruction *U = dyn_cast<Instruction>(OI)) {
*OI = 0;
}
ValueHandle::~ValueHandle() {
- if (Operands[0]->hasOneUse()) {
- Value *V = Operands[0];
- Operands[0] = 0; // Drop use!
+ if (Op->hasOneUse()) {
+ Value *V = Op;
+ Op.set(0); // Drop use!
// 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
RecursiveDelete(Cache, dyn_cast<Instruction>(V));
} else {
//DEBUG(std::cerr << "VH RELEASING: " << (void*)Operands[0].get() << " "
- // << Operands[0]->use_size() << " " << Operands[0]);
+ // << Operands[0]->getNumUses() << " " << Operands[0]);
}
}
-} // End llvm namespace