merge main into amd-staging

Author: ronlieb

bolt/include/bolt/Passes/ReorderUtils.h

@@ -1076,16 +1076,15 @@ llvm::Error ClangDocBitcodeReader::readBlockInfoBlock() {
 }
 
 template <typename T>
-llvm::Expected<std::unique_ptr<Info>>
-ClangDocBitcodeReader::createInfo(unsigned ID) {
+llvm::Expected<OwnedPtr<Info>> ClangDocBitcodeReader::createInfo(unsigned ID) {
   llvm::TimeTraceScope("Reducing infos", "createInfo");
-  std::unique_ptr<Info> I = std::make_unique<T>();
+  OwnedPtr<Info> I = std::make_unique<T>();
   if (auto Err = readBlock(ID, static_cast<T *>(I.get())))
     return std::move(Err);
-  return std::unique_ptr<Info>{std::move(I)};
+  return OwnedPtr<Info>{std::move(I)};
 }
 
-llvm::Expected<std::unique_ptr<Info>>
+llvm::Expected<OwnedPtr<Info>>
 ClangDocBitcodeReader::readBlockToInfo(unsigned ID) {
   llvm::TimeTraceScope("Reducing infos", "readBlockToInfo");
   switch (ID) {
@@ -1112,9 +1111,9 @@ ClangDocBitcodeReader::readBlockToInfo(unsigned ID) {
 }
 
 // Entry point
-llvm::Expected<std::vector<std::unique_ptr<Info>>>
+llvm::Expected<std::vector<OwnedPtr<Info>>>
 ClangDocBitcodeReader::readBitcode() {
-  std::vector<std::unique_ptr<Info>> Infos;
+  std::vector<OwnedPtr<Info>> Infos;
   if (auto Err = validateStream())
     return std::move(Err);
 

clang-tools-extra/clang-doc/BitcodeReader.cpp

@@ -31,7 +31,7 @@ class ClangDocBitcodeReader {
       : Stream(Stream), Diags(Diags) {}
 
   // Main entry point, calls readBlock to read each block in the given stream.
-  llvm::Expected<std::vector<std::unique_ptr<Info>>> readBitcode();
+  llvm::Expected<std::vector<OwnedPtr<Info>>> readBitcode();
 
 private:
   enum class Cursor { BadBlock = 1, Record, BlockEnd, BlockBegin };
@@ -53,15 +53,14 @@ class ClangDocBitcodeReader {
   template <typename T> llvm::Error readRecord(unsigned ID, T I);
 
   // Allocate the relevant type of info and add read data to the object.
-  template <typename T>
-  llvm::Expected<std::unique_ptr<Info>> createInfo(unsigned ID);
+  template <typename T> llvm::Expected<OwnedPtr<Info>> createInfo(unsigned ID);
 
   // Helper function to step through blocks to find and dispatch the next record
   // or block to be read.
   llvm::Expected<Cursor> skipUntilRecordOrBlock(unsigned &BlockOrRecordID);
 
   // Helper function to set up the appropriate type of Info.
-  llvm::Expected<std::unique_ptr<Info>> readBlockToInfo(unsigned ID);
+  llvm::Expected<OwnedPtr<Info>> readBlockToInfo(unsigned ID);
 
   template <typename InfoType, typename T, typename CallbackFunction>
   llvm::Error handleSubBlock(unsigned ID, T Parent, CallbackFunction Function);

clang-tools-extra/clang-doc/BitcodeReader.h

@@ -25,18 +25,18 @@ namespace doc {
 class MapperActionFactory : public tooling::FrontendActionFactory {
 public:
   MapperActionFactory(ClangDocContext CDCtx) : CDCtx(CDCtx) {}
-  std::unique_ptr<FrontendAction> create() override;
+  OwnedPtr<FrontendAction> create() override;
 
 private:
   ClangDocContext CDCtx;
 };
 
-std::unique_ptr<FrontendAction> MapperActionFactory::create() {
+OwnedPtr<FrontendAction> MapperActionFactory::create() {
   class ClangDocAction : public clang::ASTFrontendAction {
   public:
     ClangDocAction(ClangDocContext CDCtx) : CDCtx(CDCtx) {}
 
-    std::unique_ptr<clang::ASTConsumer>
+    OwnedPtr<clang::ASTConsumer>
     CreateASTConsumer(clang::CompilerInstance &Compiler,
                       llvm::StringRef InFile) override {
       return std::make_unique<MapASTVisitor>(&Compiler.getASTContext(), CDCtx);
@@ -48,7 +48,7 @@ std::unique_ptr<FrontendAction> MapperActionFactory::create() {
   return std::make_unique<ClangDocAction>(CDCtx);
 }
 
-std::unique_ptr<tooling::FrontendActionFactory>
+OwnedPtr<tooling::FrontendActionFactory>
 newMapperActionFactory(ClangDocContext CDCtx) {
   return std::make_unique<MapperActionFactory>(CDCtx);
 }

clang-tools-extra/clang-doc/ClangDoc.cpp

@@ -22,7 +22,7 @@
 namespace clang {
 namespace doc {
 
-std::unique_ptr<tooling::FrontendActionFactory>
+OwnedPtr<tooling::FrontendActionFactory>
 newMapperActionFactory(ClangDocContext CDCtx);
 
 } // namespace doc

clang-tools-extra/clang-doc/ClangDoc.h

@@ -53,7 +53,7 @@ Error createFileOpenError(StringRef FileName, std::error_code EC) {
 }
 
 Error MustacheGenerator::setupTemplate(
-    std::unique_ptr<MustacheTemplateFile> &Template, StringRef TemplatePath,
+    OwnedPtr<MustacheTemplateFile> &Template, StringRef TemplatePath,
     std::vector<std::pair<StringRef, StringRef>> Partials) {
   auto T = MustacheTemplateFile::createMustacheFile(TemplatePath);
   if (Error Err = T.takeError())
@@ -66,7 +66,7 @@ Error MustacheGenerator::setupTemplate(
 }
 
 Error MustacheGenerator::generateDocumentation(
-    StringRef RootDir, StringMap<std::unique_ptr<doc::Info>> Infos,
+    StringRef RootDir, StringMap<doc::OwnedPtr<doc::Info>> Infos,
     const clang::doc::ClangDocContext &CDCtx, std::string DirName) {
   {
     llvm::TimeTraceScope TS("Setup Templates");

clang-tools-extra/clang-doc/Generators.cpp

@@ -30,7 +30,7 @@ class Generator {
   // Write out the decl info for the objects in the given map in the specified
   // format.
   virtual llvm::Error generateDocumentation(
-      StringRef RootDir, llvm::StringMap<std::unique_ptr<doc::Info>> Infos,
+      StringRef RootDir, llvm::StringMap<doc::OwnedPtr<doc::Info>> Infos,
       const ClangDocContext &CDCtx, std::string DirName = "") = 0;
 
   // This function writes a file with the index previously constructed.
@@ -60,12 +60,12 @@ class MustacheTemplateFile {
   llvm::StringSaver Saver;
   llvm::mustache::MustacheContext Ctx;
   llvm::mustache::Template T;
-  std::unique_ptr<llvm::MemoryBuffer> Buffer;
+  OwnedPtr<llvm::MemoryBuffer> Buffer;
 
 public:
-  static Expected<std::unique_ptr<MustacheTemplateFile>>
+  static Expected<OwnedPtr<MustacheTemplateFile>>
   createMustacheFile(StringRef FileName) {
-    llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> BufferOrError =
+    llvm::ErrorOr<OwnedPtr<llvm::MemoryBuffer>> BufferOrError =
         llvm::MemoryBuffer::getFile(FileName);
     if (auto EC = BufferOrError.getError())
       return createFileOpenError(FileName, EC);
@@ -74,12 +74,12 @@ class MustacheTemplateFile {
   }
 
   llvm::Error registerPartialFile(StringRef Name, StringRef FileName) {
-    llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> BufferOrError =
+    llvm::ErrorOr<OwnedPtr<llvm::MemoryBuffer>> BufferOrError =
         llvm::MemoryBuffer::getFile(FileName);
     if (auto EC = BufferOrError.getError())
       return createFileOpenError(FileName, EC);
 
-    std::unique_ptr<llvm::MemoryBuffer> Buffer = std::move(BufferOrError.get());
+    OwnedPtr<llvm::MemoryBuffer> Buffer = std::move(BufferOrError.get());
     StringRef FileContent = Buffer->getBuffer();
     T.registerPartial(Name.str(), FileContent.str());
     return llvm::Error::success();
@@ -91,7 +91,7 @@ class MustacheTemplateFile {
     T.overrideEscapeCharacters(Characters);
   }
 
-  MustacheTemplateFile(std::unique_ptr<llvm::MemoryBuffer> &&B)
+  MustacheTemplateFile(OwnedPtr<llvm::MemoryBuffer> &&B)
       : Saver(Allocator), Ctx(Allocator, Saver), T(B->getBuffer(), Ctx),
         Buffer(std::move(B)) {}
 };
@@ -120,7 +120,7 @@ struct MustacheGenerator : public Generator {
 
   /// Registers partials to templates.
   llvm::Error
-  setupTemplate(std::unique_ptr<MustacheTemplateFile> &Template,
+  setupTemplate(OwnedPtr<MustacheTemplateFile> &Template,
                 StringRef TemplatePath,
                 std::vector<std::pair<StringRef, StringRef>> Partials);
 
@@ -132,7 +132,7 @@ struct MustacheGenerator : public Generator {
   /// JSON, and calls generateDocForJSON for each file.
   /// 4. A file of the desired format is created.
   llvm::Error generateDocumentation(
-      StringRef RootDir, llvm::StringMap<std::unique_ptr<doc::Info>> Infos,
+      StringRef RootDir, llvm::StringMap<doc::OwnedPtr<doc::Info>> Infos,
       const clang::doc::ClangDocContext &CDCtx, std::string DirName) override;
 };
 

clang-tools-extra/clang-doc/Generators.h

@@ -25,11 +25,11 @@ using namespace llvm::mustache;
 namespace clang {
 namespace doc {
 
-static std::unique_ptr<MustacheTemplateFile> NamespaceTemplate = nullptr;
+static OwnedPtr<MustacheTemplateFile> NamespaceTemplate = nullptr;
 
-static std::unique_ptr<MustacheTemplateFile> RecordTemplate = nullptr;
+static OwnedPtr<MustacheTemplateFile> RecordTemplate = nullptr;
 
-static std::unique_ptr<MustacheTemplateFile> IndexTemplate = nullptr;
+static OwnedPtr<MustacheTemplateFile> IndexTemplate = nullptr;
 
 class HTMLGenerator : public MustacheGenerator {
 public:
@@ -45,7 +45,7 @@ class HTMLGenerator : public MustacheGenerator {
   Error setupTemplateResources(const ClangDocContext &CDCtx, json::Value &V,
                                SmallString<128> RelativeRootPath);
   llvm::Error generateDocumentation(
-      StringRef RootDir, llvm::StringMap<std::unique_ptr<doc::Info>> Infos,
+      StringRef RootDir, llvm::StringMap<doc::OwnedPtr<doc::Info>> Infos,
       const ClangDocContext &CDCtx, std::string DirName) override;
 };
 
@@ -183,7 +183,7 @@ Error HTMLGenerator::createResources(ClangDocContext &CDCtx) {
 }
 
 Error HTMLGenerator::generateDocumentation(
-    StringRef RootDir, llvm::StringMap<std::unique_ptr<doc::Info>> Infos,
+    StringRef RootDir, llvm::StringMap<doc::OwnedPtr<doc::Info>> Infos,
     const ClangDocContext &CDCtx, std::string DirName) {
   return MustacheGenerator::generateDocumentation(RootDir, std::move(Infos),
                                                   CDCtx, "html");

clang-tools-extra/clang-doc/HTMLGenerator.cpp

@@ -66,7 +66,7 @@ class JSONGenerator : public Generator {
   bool Markdown;
 
   Error generateDocumentation(StringRef RootDir,
-                              llvm::StringMap<std::unique_ptr<doc::Info>> Infos,
+                              llvm::StringMap<OwnedPtr<doc::Info>> Infos,
                               const ClangDocContext &CDCtx,
                               std::string DirName) override;
   Error createResources(ClangDocContext &CDCtx) override;
@@ -898,8 +898,7 @@ Error JSONGenerator::serializeIndex(StringRef RootDir) {
   return Error::success();
 }
 
-static void serializeContexts(Info *I,
-                              StringMap<std::unique_ptr<Info>> &Infos) {
+static void serializeContexts(Info *I, StringMap<OwnedPtr<Info>> &Infos) {
   if (I->USR == GlobalNamespaceID)
     return;
   auto ParentUSR = I->ParentUSR;
@@ -922,7 +921,7 @@ static void serializeContexts(Info *I,
 }
 
 Error JSONGenerator::generateDocumentation(
-    StringRef RootDir, llvm::StringMap<std::unique_ptr<doc::Info>> Infos,
+    StringRef RootDir, llvm::StringMap<doc::OwnedPtr<doc::Info>> Infos,
     const ClangDocContext &CDCtx, std::string DirName) {
   this->CDCtx = &CDCtx;
   StringSet<> CreatedDirs;