//
// 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 is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
//
//===----------------------------------------------------------------------===//
-#include "ValueMapper.h"
+#include "llvm/Transforms/Utils/ValueMapper.h"
#include "llvm/Constants.h"
#include "llvm/GlobalValue.h"
#include "llvm/Instruction.h"
using namespace llvm;
-Value *llvm::MapValue(const Value *V, std::map<const Value*, Value*> &VM) {
+Value *llvm::MapValue(const Value *V, ValueMapTy &VM) {
Value *&VMSlot = VM[V];
if (VMSlot) return VMSlot; // Does it exist in the map yet?
+
+ // NOTE: VMSlot can be invalidated by any reference to VM, which can grow the
+ // DenseMap. This includes any recursive calls to MapValue.
// Global values do not need to be seeded into the ValueMap if they are using
// the identity mapping.
return VMSlot = const_cast<Value*>(V);
if (Constant *C = const_cast<Constant*>(dyn_cast<Constant>(V))) {
- if (isa<ConstantIntegral>(C) || isa<ConstantFP>(C) ||
+ if (isa<ConstantInt>(C) || isa<ConstantFP>(C) ||
isa<ConstantPointerNull>(C) || isa<ConstantAggregateZero>(C) ||
- isa<UndefValue>(C) || isa<InlineAsm>(V))
+ isa<UndefValue>(C))
return VMSlot = C; // Primitive constants map directly
else if (ConstantArray *CA = dyn_cast<ConstantArray>(C)) {
for (unsigned i = 0, e = CA->getNumOperands(); i != e; ++i) {
Values.push_back(cast<Constant>(MV));
for (++i; i != e; ++i)
Values.push_back(cast<Constant>(MapValue(CA->getOperand(i), VM)));
- return VMSlot = ConstantArray::get(CA->getType(), Values);
+ return VM[V] = ConstantArray::get(CA->getType(), Values);
}
}
- return VMSlot = C;
+ return VM[V] = C;
} else if (ConstantStruct *CS = dyn_cast<ConstantStruct>(C)) {
for (unsigned i = 0, e = CS->getNumOperands(); i != e; ++i) {
Values.push_back(cast<Constant>(MV));
for (++i; i != e; ++i)
Values.push_back(cast<Constant>(MapValue(CS->getOperand(i), VM)));
- return VMSlot = ConstantStruct::get(CS->getType(), Values);
+ return VM[V] = ConstantStruct::get(CS->getType(), Values);
}
}
- return VMSlot = C;
+ return VM[V] = C;
} else if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) {
- if (CE->getOpcode() == Instruction::Cast) {
- Constant *MV = cast<Constant>(MapValue(CE->getOperand(0), VM));
- return VMSlot = ConstantExpr::getCast(MV, CE->getType());
- } else if (CE->getOpcode() == Instruction::GetElementPtr) {
- std::vector<Constant*> Idx;
- Constant *MV = cast<Constant>(MapValue(CE->getOperand(0), VM));
- for (unsigned i = 1, e = CE->getNumOperands(); i != e; ++i)
- Idx.push_back(cast<Constant>(MapValue(CE->getOperand(i), VM)));
- return VMSlot = ConstantExpr::getGetElementPtr(MV, Idx);
- } else if (CE->getOpcode() == Instruction::Select) {
- Constant *MV1 = cast<Constant>(MapValue(CE->getOperand(0), VM));
- Constant *MV2 = cast<Constant>(MapValue(CE->getOperand(1), VM));
- Constant *MV3 = cast<Constant>(MapValue(CE->getOperand(2), VM));
- return VMSlot = ConstantExpr::getSelect(MV1, MV2, MV3);
- } else {
- assert(CE->getNumOperands() == 2 && "Must be binary operator?");
- Constant *MV1 = cast<Constant>(MapValue(CE->getOperand(0), VM));
- Constant *MV2 = cast<Constant>(MapValue(CE->getOperand(1), VM));
- return VMSlot = ConstantExpr::get(CE->getOpcode(), MV1, MV2);
- }
-
- } else if (ConstantPacked *CP = dyn_cast<ConstantPacked>(C)) {
+ std::vector<Constant*> Ops;
+ for (unsigned i = 0, e = CE->getNumOperands(); i != e; ++i)
+ Ops.push_back(cast<Constant>(MapValue(CE->getOperand(i), VM)));
+ return VM[V] = CE->getWithOperands(Ops);
+ } else if (ConstantVector *CP = dyn_cast<ConstantVector>(C)) {
for (unsigned i = 0, e = CP->getNumOperands(); i != e; ++i) {
Value *MV = MapValue(CP->getOperand(i), VM);
if (MV != CP->getOperand(i)) {
- // This packed value must contain a reference to a global, make a new
- // packed constant and return it.
+ // This vector value must contain a reference to a global, make a new
+ // vector constant and return it.
//
std::vector<Constant*> Values;
Values.reserve(CP->getNumOperands());
Values.push_back(cast<Constant>(MV));
for (++i; i != e; ++i)
Values.push_back(cast<Constant>(MapValue(CP->getOperand(i), VM)));
- return VMSlot = ConstantPacked::get(Values);
+ return VM[V] = ConstantVector::get(Values);
}
}
- return VMSlot = C;
+ return VM[V] = C;
} else {
assert(0 && "Unknown type of constant!");
}
}
- V->dump();
- assert(0 && "Unknown value type: why didn't it get resolved?!");
return 0;
}
/// RemapInstruction - Convert the instruction operands from referencing the
/// current values into those specified by ValueMap.
///
-void llvm::RemapInstruction(Instruction *I,
- std::map<const Value *, Value*> &ValueMap) {
+void llvm::RemapInstruction(Instruction *I, ValueMapTy &ValueMap) {
for (unsigned op = 0, E = I->getNumOperands(); op != E; ++op) {
const Value *Op = I->getOperand(op);
Value *V = MapValue(Op, ValueMap);
projects / oota-llvm.git / blobdiff