PR16995: DebugInfo: Don't overwrite existing member lists when adding template arguments

With the added debug assertions this fix is covered by existing Clang
tests. (& found some other issues, also fixed)

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

diff --git a/lib/IR/DebugInfo.cpp b/lib/IR/DebugInfo.cpp
index 8fad393e5ae6e749e1d2c7f89e98d24613f8cca7..8e062a032574a51baab62a1d57b2f45f2d6f3dce 100644 (file)
--- a/lib/IR/DebugInfo.cpp
+++ b/lib/IR/DebugInfo.cpp
@@ -655,7 +655,24 @@ void DICompositeType::setTypeArray(DIArray Elements, DIArray TParams) {
          "If you're setting the template parameters this should include a slot "
          "for that!");
   TrackingVH<MDNode> N(*this);
-  N->replaceOperandWith(10, Elements);
+  if (Elements) {
+#ifndef NDEBUG
+    // Check that we're not dropping any elements on the floor here
+    if (const MDNode *El = cast_or_null<MDNode>(N->getOperand(10))) {
+      for (unsigned i = 0; i != El->getNumOperands(); ++i) {
+        if (i == 0 && isa<ConstantInt>(El->getOperand(i)))
+          continue;
+        const MDNode *E = cast<MDNode>(El->getOperand(i));
+        bool found = false;
+        for (unsigned j = 0; !found && j != Elements.getNumElements(); ++j) {
+          found = E == Elements.getElement(j);
+        }
+        assert(found && "Losing a member during member list replacement");
+      }
+    }
+#endif
+    N->replaceOperandWith(10, Elements);
+  }
   if (TParams)
     N->replaceOperandWith(13, TParams);
   DbgNode = N;