Fixed a problem in IRForTarget where we would not

delete a constant after we replaced it with a
dynamically-computed value.  Also ensured that we
replace all users of the constant if there are
multiple ones.  Added a testcase.

<rdar://problem/14379043>

llvm-svn: 186363

1 files changed, 9 insertions, 2 deletions

diff --git a/lldb/source/Expression/IRForTarget.cpp b/lldb/source/Expression/IRForTarget.cpp
index 711943401db..dc27b65548e 100644
--- a/lldb/source/Expression/IRForTarget.cpp
+++ b/lldb/source/Expression/IRForTarget.cpp
@@ -2210,7 +2210,8 @@ IRForTarget::UnfoldConstant(Constant *old_constant,
                                                    llvm::cast<Instruction>(entry_instruction_finder.GetValue(function)));
                         });
                         
-                        return UnfoldConstant(constant_expr, bit_cast_maker, entry_instruction_finder);
+                        if (!UnfoldConstant(constant_expr, bit_cast_maker, entry_instruction_finder))
+                            return false;
                     }
                     break;
                 case Instruction::GetElementPtr:
@@ -2247,7 +2248,8 @@ IRForTarget::UnfoldConstant(Constant *old_constant,
                             return GetElementPtrInst::Create(ptr, indices, "", llvm::cast<Instruction>(entry_instruction_finder.GetValue(function)));
                         });
                         
-                        return UnfoldConstant(constant_expr, get_element_pointer_maker, entry_instruction_finder);
+                        if (!UnfoldConstant(constant_expr, get_element_pointer_maker, entry_instruction_finder))
+                            return false;
                     }
                     break;
                 }
@@ -2274,6 +2276,11 @@ IRForTarget::UnfoldConstant(Constant *old_constant,
         }
     }
     
+    if (!isa<GlobalValue>(old_constant))
+    {
+        old_constant->destroyConstant();
+    }
+    
     return true;
 }