We might as well strip off any CPRs before propagation

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9437 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/Transforms/IPO/IPConstantPropagation.cpp b/lib/Transforms/IPO/IPConstantPropagation.cpp
index dc8698e162..bb21f11ffc 100644
--- a/lib/Transforms/IPO/IPConstantPropagation.cpp
+++ b/lib/Transforms/IPO/IPConstantPropagation.cpp
@@ -103,7 +103,10 @@ bool IPCP::processFunction(Function &F) {
     // Do we have a constant argument!?
     if (!ArgumentConstants[i].second) {
       assert(ArgumentConstants[i].first && "Unknown constant value!");
-      AI->replaceAllUsesWith(ArgumentConstants[i].first);
+      Value *V = ArgumentConstants[i].first;
+      if (ConstantPointerRef *CPR = dyn_cast<ConstantPointerRef>(V))
+        V = CPR->getValue();
+      AI->replaceAllUsesWith(V);
       ++NumArgumentsProped;
     }
   return true;