2 files changed, 11 insertions, 9 deletions

diff --git a/llvm/utils/TableGen/CodeGenDAGPatterns.cpp b/llvm/utils/TableGen/CodeGenDAGPatterns.cpp
index 998cf3300bf..f1cde80952b 100644
--- a/llvm/utils/TableGen/CodeGenDAGPatterns.cpp
+++ b/llvm/utils/TableGen/CodeGenDAGPatterns.cpp
@@ -4010,7 +4010,7 @@ void CodeGenDAGPatterns::ParsePatterns() {
                                   InstResults, InstImpResults);
 
     // Promote the xform function to be an explicit node if set.
-    TreePatternNodePtr DstPattern = Result.getOnlyTree();
+    const TreePatternNodePtr &DstPattern = Result.getOnlyTree();
     std::vector<TreePatternNodePtr> ResultNodeOperands;
     for (unsigned ii = 0, ee = DstPattern->getNumChildren(); ii != ee; ++ii) {
       TreePatternNodePtr OpNode = DstPattern->getChildShared(ii);
@@ -4023,16 +4023,18 @@ void CodeGenDAGPatterns::ParsePatterns() {
       }
       ResultNodeOperands.push_back(OpNode);
     }
-    DstPattern = Result.getOnlyTree();
-    if (!DstPattern->isLeaf())
-      DstPattern = std::make_shared<TreePatternNode>(DstPattern->getOperator(),
-                                                     ResultNodeOperands,
-                                                     DstPattern->getNumTypes());
+
+    TreePatternNodePtr DstShared =
+        DstPattern->isLeaf()
+            ? DstPattern
+            : std::make_shared<TreePatternNode>(DstPattern->getOperator(),
+                                                ResultNodeOperands,
+                                                DstPattern->getNumTypes());
 
     for (unsigned i = 0, e = Result.getOnlyTree()->getNumTypes(); i != e; ++i)
-      DstPattern->setType(i, Result.getOnlyTree()->getExtType(i));
+      DstShared->setType(i, Result.getOnlyTree()->getExtType(i));
 
-    TreePattern Temp(Result.getRecord(), DstPattern, false, *this);
+    TreePattern Temp(Result.getRecord(), DstShared, false, *this);
     Temp.InferAllTypes();
 
     // A pattern may end up with an "impossible" type, i.e. a situation
diff --git a/llvm/utils/TableGen/CodeGenDAGPatterns.h b/llvm/utils/TableGen/CodeGenDAGPatterns.h
index c4636eef84a..405bb245ef8 100644
--- a/llvm/utils/TableGen/CodeGenDAGPatterns.h
+++ b/llvm/utils/TableGen/CodeGenDAGPatterns.h
@@ -814,7 +814,7 @@ public:
   unsigned getNumTrees() const { return Trees.size(); }
   const TreePatternNodePtr &getTree(unsigned i) const { return Trees[i]; }
   void setTree(unsigned i, TreePatternNodePtr Tree) { Trees[i] = Tree; }
-  TreePatternNodePtr getOnlyTree() const {
+  const TreePatternNodePtr &getOnlyTree() const {
     assert(Trees.size() == 1 && "Doesn't have exactly one pattern!");
     return Trees[0];
   }