From 639888fca52f97f41ed9d876f68a443dfea6581c Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka@google.com>
Date: Thu, 31 Aug 2017 05:32:36 +0000
Subject: [PATCH] Revert "llvm-mt: Fix release of OutputDoc"

Multiple bots are broken.

This reverts commit r312207.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@312212 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/WindowsManifest/WindowsManifestMerger.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/WindowsManifest/WindowsManifestMerger.cpp b/lib/WindowsManifest/WindowsManifestMerger.cpp
index da968c4ae1a..91547c98469 100644
--- a/lib/WindowsManifest/WindowsManifestMerger.cpp
+++ b/lib/WindowsManifest/WindowsManifestMerger.cpp
@@ -652,13 +652,11 @@ WindowsManifestMerger::WindowsManifestMergerImpl::getMergedManifest() {
     xmlNodePtr CombinedRoot = xmlDocGetRootElement(CombinedDoc);
     std::vector<xmlNsPtr> RequiredPrefixes;
     checkAndStripPrefixes(CombinedRoot, RequiredPrefixes);
-    std::unique_ptr<xmlDoc, decltype(&xmlFreeDoc)> OutputDoc(
-        xmlNewDoc((const unsigned char *)"1.0"), &xmlFreeDoc);
+    std::unique_ptr<xmlDoc> OutputDoc(xmlNewDoc((const unsigned char *)"1.0"));
     xmlDocSetRootElement(OutputDoc.get(), CombinedRoot);
     xmlKeepBlanksDefault(0);
     xmlDocDumpFormatMemoryEnc(OutputDoc.get(), &XmlBuff, &BufferSize, "UTF-8",
                               1);
-    xmlDocSetRootElement(OutputDoc.get(), nullptr);
   }
   if (BufferSize == 0)
     return nullptr;
-- 
2.40.0