[llvm] r312212 - Revert "llvm-mt: Fix release of OutputDoc"

Vitaly Buka via llvm-commits llvm-commits at lists.llvm.org
Wed Aug 30 22:32:36 PDT 2017


Author: vitalybuka
Date: Wed Aug 30 22:32:36 2017
New Revision: 312212

URL: http://llvm.org/viewvc/llvm-project?rev=312212&view=rev
Log:
Revert "llvm-mt: Fix release of OutputDoc"

Multiple bots are broken.

This reverts commit r312207.

Modified:
    llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp

Modified: llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp?rev=312212&r1=312211&r2=312212&view=diff
==============================================================================
--- llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp (original)
+++ llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp Wed Aug 30 22:32:36 2017
@@ -652,13 +652,11 @@ WindowsManifestMerger::WindowsManifestMe
     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;




More information about the llvm-commits mailing list