From ffa1a450c3fb1fd1f5a9f4d78eb0c04c685b705e Mon Sep 17 00:00:00 2001
From: "Duncan P. N. Exon Smith" <dexonsmith@apple.com>
Date: Wed, 14 Jan 2015 01:24:38 +0000
Subject: [PATCH] Utils: Thread distinct-ness through the cloneMD*() functions,
 NFC

The new logic isn't actually reachable yet, so no functionality change.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225918 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Transforms/Utils/ValueMapper.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/Transforms/Utils/ValueMapper.cpp b/lib/Transforms/Utils/ValueMapper.cpp
index 04c5ff2b012..9ba39e8f3c6 100644
--- a/lib/Transforms/Utils/ValueMapper.cpp
+++ b/lib/Transforms/Utils/ValueMapper.cpp
@@ -183,21 +183,24 @@ static Metadata *mapMetadataOp(Metadata *Op, ValueToValueMapTy &VM,
 static Metadata *cloneMDTuple(const MDTuple *Node, ValueToValueMapTy &VM,
                               RemapFlags Flags,
                               ValueMapTypeRemapper *TypeMapper,
-                              ValueMaterializer *Materializer) {
+                              ValueMaterializer *Materializer,
+                              bool IsDistinct) {
   SmallVector<Metadata *, 4> Elts;
   Elts.reserve(Node->getNumOperands());
   for (unsigned I = 0, E = Node->getNumOperands(); I != E; ++I)
     Elts.push_back(mapMetadataOp(Node->getOperand(I), VM, Flags, TypeMapper,
                                  Materializer));
 
-  return MDTuple::get(Node->getContext(), Elts);
+  return (IsDistinct ? MDTuple::getDistinct : MDTuple::get)(Node->getContext(),
+                                                            Elts);
 }
 
 static Metadata *cloneMDLocation(const MDLocation *Node, ValueToValueMapTy &VM,
                                  RemapFlags Flags,
                                  ValueMapTypeRemapper *TypeMapper,
-                                 ValueMaterializer *Materializer) {
-  return MDLocation::get(
+                                 ValueMaterializer *Materializer,
+                                 bool IsDistinct) {
+  return (IsDistinct ? MDLocation::getDistinct : MDLocation::get)(
       Node->getContext(), Node->getLine(), Node->getColumn(),
       mapMetadataOp(Node->getScope(), VM, Flags, TypeMapper, Materializer),
       mapMetadataOp(Node->getInlinedAt(), VM, Flags, TypeMapper, Materializer));
@@ -205,14 +208,14 @@ static Metadata *cloneMDLocation(const MDLocation *Node, ValueToValueMapTy &VM,
 
 static Metadata *cloneMDNode(const UniquableMDNode *Node, ValueToValueMapTy &VM,
                              RemapFlags Flags, ValueMapTypeRemapper *TypeMapper,
-                             ValueMaterializer *Materializer) {
+                             ValueMaterializer *Materializer, bool IsDistinct) {
   switch (Node->getMetadataID()) {
   default:
     llvm_unreachable("Invalid UniquableMDNode subclass");
 #define HANDLE_UNIQUABLE_LEAF(CLASS)                                           \
   case Metadata::CLASS##Kind:                                                  \
     return clone##CLASS(cast<CLASS>(Node), VM, Flags, TypeMapper,              \
-                        Materializer);                                         \
+                        Materializer, IsDistinct);                             \
     break;
 #include "llvm/IR/Metadata.def"
   }
@@ -279,7 +282,8 @@ static Metadata *mapUniquedNode(const UniquableMDNode *Node,
   }
 
   // At least one operand needs remapping.
-  Metadata *NewMD = cloneMDNode(Node, VM, Flags, TypeMapper, Materializer);
+  Metadata *NewMD = cloneMDNode(Node, VM, Flags, TypeMapper, Materializer,
+                                /* IsDistinct */ false);
   Dummy->replaceAllUsesWith(NewMD);
   MDNode::deleteTemporary(Dummy);
   return mapToMetadata(VM, Node, NewMD);
-- 
2.40.0