[Review] Rename (read|write)uniqueExecuteOutput to (read|write)SingleOutputFile

Author: jmmartinez

amd/comgr/src/comgr-cache-command.cpp

@@ -100,8 +100,8 @@ CachedCommandAdaptor::getIdentifier() const {
 }
 
 llvm::Error
-CachedCommandAdaptor::writeUniqueExecuteOutput(StringRef OutputFilename,
-                                               StringRef CachedBuffer) {
+CachedCommandAdaptor::writeSingleOutputFile(StringRef OutputFilename,
+                                            StringRef CachedBuffer) {
   std::error_code EC;
   raw_fd_ostream Out(OutputFilename, EC);
   if (EC) {
@@ -122,7 +122,7 @@ CachedCommandAdaptor::writeUniqueExecuteOutput(StringRef OutputFilename,
 }
 
 Expected<std::unique_ptr<MemoryBuffer>>
-CachedCommandAdaptor::readUniqueExecuteOutput(StringRef OutputFilename) {
+CachedCommandAdaptor::readSingleOutputFile(StringRef OutputFilename) {
   ErrorOr<std::unique_ptr<MemoryBuffer>> MBOrErr =
       MemoryBuffer::getFile(OutputFilename);
   if (!MBOrErr) {

amd/comgr/src/comgr-cache-command.h

@@ -70,10 +70,10 @@ class CachedCommandAdaptor {
   static std::optional<size_t> searchComgrTmpModel(llvm::StringRef S);
 
   // helper since several command types just write to a single output file
-  static llvm::Error writeUniqueExecuteOutput(llvm::StringRef OutputFilename,
-                                              llvm::StringRef CachedBuffer);
+  static llvm::Error writeSingleOutputFile(llvm::StringRef OutputFilename,
+                                           llvm::StringRef CachedBuffer);
   static llvm::Expected<std::unique_ptr<llvm::MemoryBuffer>>
-  readUniqueExecuteOutput(llvm::StringRef OutputFilename);
+  readSingleOutputFile(llvm::StringRef OutputFilename);
 
 protected:
   virtual ActionClass getClass() const = 0;

amd/comgr/src/comgr-clang-command.cpp

@@ -158,12 +158,12 @@ bool ClangCommand::canCache() const {
 
 Error ClangCommand::writeExecuteOutput(StringRef CachedBuffer) {
   StringRef OutputFilename = Command.getOutputFilenames().front();
-  return CachedCommandAdaptor::writeUniqueExecuteOutput(OutputFilename,
-                                                        CachedBuffer);
+  return CachedCommandAdaptor::writeSingleOutputFile(OutputFilename,
+                                                     CachedBuffer);
 }
 
 Expected<StringRef> ClangCommand::readExecuteOutput() {
-  auto MaybeBuffer = CachedCommandAdaptor::readUniqueExecuteOutput(
+  auto MaybeBuffer = CachedCommandAdaptor::readSingleOutputFile(
       Command.getOutputFilenames().front());
   if (!MaybeBuffer)
     return MaybeBuffer.takeError();

amd/comgr/src/comgr-unbundle-command.cpp

@@ -78,7 +78,7 @@ Error UnbundleCommand::writeExecuteOutput(StringRef CachedBuffer) {
     StringRef OutputFileContents = CachedBuffer.substr(0, OutputFileSize);
     CachedBuffer = CachedBuffer.drop_front(OutputFileSize);
 
-    if (Error Err = CachedCommandAdaptor::writeUniqueExecuteOutput(
+    if (Error Err = CachedCommandAdaptor::writeSingleOutputFile(
             OutputFilename, OutputFileContents))
       return Err;
   }
@@ -93,7 +93,7 @@ Expected<StringRef> UnbundleCommand::readExecuteOutput() {
   size_t OutputSize = 0;
   for (StringRef OutputFilename : Config.OutputFileNames) {
     auto MaybeOneOutput =
-        CachedCommandAdaptor::readUniqueExecuteOutput(OutputFilename);
+        CachedCommandAdaptor::readSingleOutputFile(OutputFilename);
     if (!MaybeOneOutput)
       return MaybeOneOutput.takeError();