diff options
author | Devang Patel <dpatel@apple.com> | 2010-06-22 05:16:56 +0000 |
---|---|---|
committer | Devang Patel <dpatel@apple.com> | 2010-06-22 05:16:56 +0000 |
commit | 52e0612f7da7c711a94e0ea130b7205c6a6e6d63 (patch) | |
tree | 57ee416d43b3b6d3f70fd5e6b254bae779ddd063 /lib/Transforms | |
parent | ec688648779b9ce1e2e6fb737f569263cf463739 (diff) | |
download | external_llvm-52e0612f7da7c711a94e0ea130b7205c6a6e6d63.zip external_llvm-52e0612f7da7c711a94e0ea130b7205c6a6e6d63.tar.gz external_llvm-52e0612f7da7c711a94e0ea130b7205c6a6e6d63.tar.bz2 |
Do not rely on DenseMap slot which can be easily invalidated when DenseMap grows.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@106528 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms')
-rw-r--r-- | lib/Transforms/Utils/ValueMapper.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/Transforms/Utils/ValueMapper.cpp b/lib/Transforms/Utils/ValueMapper.cpp index 87ce631..16ab910 100644 --- a/lib/Transforms/Utils/ValueMapper.cpp +++ b/lib/Transforms/Utils/ValueMapper.cpp @@ -21,17 +21,15 @@ using namespace llvm; Value *llvm::MapValue(const Value *V, ValueToValueMapTy &VM) { - Value *&VMSlot = VM[V]; - if (VMSlot) return VMSlot; // Does it exist in the map yet? + ValueToValueMapTy::iterator VMI = VM.find(V); + if (VMI != VM.end()) + return VMI->second; - // NOTE: VMSlot can be invalidated by any reference to VM, which can grow the - // DenseMap. This includes any recursive calls to MapValue. - // Global values and non-function-local metadata do not need to be seeded into // the ValueMap if they are using the identity mapping. if (isa<GlobalValue>(V) || isa<InlineAsm>(V) || isa<MDString>(V) || (isa<MDNode>(V) && !cast<MDNode>(V)->isFunctionLocal())) - return VMSlot = const_cast<Value*>(V); + return VM[V] = const_cast<Value*>(V); if (const MDNode *MD = dyn_cast<MDNode>(V)) { SmallVector<Value*, 4> Elts; @@ -46,7 +44,7 @@ Value *llvm::MapValue(const Value *V, ValueToValueMapTy &VM) { if (isa<ConstantInt>(C) || isa<ConstantFP>(C) || isa<ConstantPointerNull>(C) || isa<ConstantAggregateZero>(C) || isa<UndefValue>(C) || isa<MDString>(C)) - return VMSlot = C; // Primitive constants map directly + return VM[V] = C; // Primitive constants map directly if (ConstantArray *CA = dyn_cast<ConstantArray>(C)) { for (User::op_iterator b = CA->op_begin(), i = b, e = CA->op_end(); |