commit 24a96e753a435141e10fc956eaa4ba728919b411
author Duncan P. N. Exon Smith <dexonsmith@apple.com> Fri Apr 08 19:17:13 2016 +0000
committer Copybara-Service <copybara-worker@google.com> Wed Oct 07 06:09:55 2020 -0700
tree 85087cbea87be65092ce04785e36c62013e3eab3
parent ba44115f94e0e005d966860e6fbd3256f7a03252

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
GitOrigin-RevId: adcebdf2d1db958be01ef9b9f52ec7d9bccb27dc

lib/Transforms/Utils/ValueMapper.cpp

diff --git a/lib/Transforms/Utils/ValueMapper.cpp b/lib/Transforms/Utils/ValueMapper.cpp
index ffd3a27..5eebccd 100644
--- a/lib/Transforms/Utils/ValueMapper.cpp
+++ b/lib/Transforms/Utils/ValueMapper.cpp
@@ -757,8 +757,7 @@
   // Remap phi nodes' incoming blocks.
   if (PHINode *PN = dyn_cast<PHINode>(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<BasicBlock>(V));