Fix a serious bug that would cause deadlock during abstract type refinement. The constant creation

gets involved, and we end up trying to recursively acquire a writer lock.  The fix for this is slightly horrible,
and involves passing a boolean "locked" parameter around in Constants.cpp, but it's better than having locked and
unlocked versions of most of the code.


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

1 files changed, 2 insertions, 2 deletions

diff --git a/include/llvm/MDNode.h b/include/llvm/MDNode.h
index d632e4e..06b7177 100644
--- a/include/llvm/MDNode.h
+++ b/include/llvm/MDNode.h
@@ -78,7 +78,7 @@ public:
 
   /// get() - Static factory methods - Return objects of the specified value.
   ///
-  static MDNode *get(Value*const* Vals, unsigned NumVals);
+  static MDNode *get(Value*const* Vals, unsigned NumVals, bool locked = true);
 
   Value *getElement(unsigned i) const {
     return Node[i];
@@ -117,7 +117,7 @@ public:
   /// duplicates
   void Profile(FoldingSetNodeID &ID) const;
 
-  virtual void destroyConstant();
+  virtual void destroyConstant(bool locked = true);
   virtual void replaceUsesOfWithOnConstant(Value *From, Value *To, Use *U) {
     assert(0 && "This should never be called because MDNodes have no ops");
     abort();