]> granicus.if.org Git - llvm/commitdiff
Revert "llvm-mt: Fix release of OutputDoc"
authorVitaly Buka <vitalybuka@google.com>
Thu, 31 Aug 2017 05:32:36 +0000 (05:32 +0000)
committerVitaly Buka <vitalybuka@google.com>
Thu, 31 Aug 2017 05:32:36 +0000 (05:32 +0000)
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

index da968c4ae1ac0b75edd5f70c924e748050710df5..91547c98469bb18599bea656e89a6604eb5e992e 100644 (file)
@@ -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;