From adcebdf2d1db958be01ef9b9f52ec7d9bccb27dc Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Fri, 8 Apr 2016 19:17:13 +0000 Subject: [PATCH] ValueMapper: Always use Mapper::mapValue from remapInstruction, NFCI Use Mapper::mapValue instead of llvm::MapValue from Mapper::remapInstruction when mapping an incoming block for a PHINode (follow-up to r265832). This will implicitly pass along the Materializer argument, but when this code was added in r133513 there was no Materializer argument. I suspect this call to MapValue was just missed in r182776 since it's not observable (basic blocks can't be materialized, and they don't reference other values). llvm-svn: 265833 --- llvm/lib/Transforms/Utils/ValueMapper.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/llvm/lib/Transforms/Utils/ValueMapper.cpp b/llvm/lib/Transforms/Utils/ValueMapper.cpp index ffd3a27..5eebccd 100644 --- a/llvm/lib/Transforms/Utils/ValueMapper.cpp +++ b/llvm/lib/Transforms/Utils/ValueMapper.cpp @@ -757,8 +757,7 @@ void Mapper::remapInstruction(Instruction *I) { // Remap phi nodes' incoming blocks. if (PHINode *PN = dyn_cast(I)) { for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) { - // FIXME: Use Mapper::mapValue (but note the missing Materializer flag). - Value *V = MapValue(PN->getIncomingBlock(i), VM, Flags); + Value *V = mapValue(PN->getIncomingBlock(i)); // If we aren't ignoring missing entries, assert that something happened. if (V) PN->setIncomingBlock(i, cast(V)); -- 2.7.4