[VFS] Rename `RedirectingFileSystem::dump` to `print`

[bnbarham]

Summary

The rest of LLVM uses print for the method taking the raw_ostream
and dump only for the method with no parameters. Use the same for
RedirectingFileSystem.

[bnbarham]

@dexonsmith it'll be faster to run the tests here than locally, so I figured I'd put the review up anyway.

[dexonsmith]

I think you didn't upload the full patch, so I think the bots will fail, but once the bots are happy this LGTM (besides one nit inline).

llvm/include/llvm/Support/VirtualFileSystem.h

914

Since you didn't update callers I think you missed git add .../VFS.cpp.

916–918

Please leave this print(dbgs()) in the source file to avoid needing to include a header that provides dbgs(). Even if it's currently available there's no reason to depend on that being the case.

Maybe you forgot to git add .../VFS.cpp, since as-is this would give a duplicate definition due to conflicts with the .cpp implementation.

[bnbarham]

Added VFS.cpp, removed implementation from header

[bnbarham]

Removed LLVM_DUMP_METHOD from .cpp

lldb/source/Commands/CommandObjectReproducer.cpp

case eReproducerProviderFiles: {
 
       // Initialize a VFS from the given mapping.
       IntrusiveRefCntPtr<vfs::FileSystem> vfs = vfs::getVFSFromYAML(
           std::move(buffer.get()), nullptr, vfs_mapping.GetPath());
 
       // Dump the VFS to a buffer.
       std::string str;
       raw_string_ostream os(str);
-      static_cast<vfs::RedirectingFileSystem &>(*vfs).dump(os);
+      static_cast<vfs::RedirectingFileSystem &>(*vfs).print(os);
       os.flush();
 
       // Return the string.
       result.AppendMessage(str);
       result.SetStatus(eReturnStatusSuccessFinishResult);
       return true;
     }
     case eReproducerProviderSymbolFiles: {

llvm/include/llvm/Support/VirtualFileSystem.h

public:
   /// Sets the redirection kind to \c Fallthrough if true or \c RedirectOnly
   /// otherwise. Will removed in the future, use \c setRedirection instead.
   void setFallthrough(bool Fallthrough);
 
   void setRedirection(RedirectingFileSystem::RedirectKind Kind);
 
   std::vector<llvm::StringRef> getRoots() const;
 
-  void dump(raw_ostream &OS) const;
-  void dumpEntry(raw_ostream &OS, Entry *E, int NumSpaces = 0) const;
+  void print(raw_ostream &OS) const;
+  void printEntry(raw_ostream &OS, Entry *E, int NumSpaces = 0) const;
+
 #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
   LLVM_DUMP_METHOD void dump() const;
 #endif
 };
 
 /// Collect all pairs of <virtual path, real path> entries from the
 /// \p YAMLFilePath. This is used by the module dependency collector to forward
 /// the entries into the reproducer output VFS YAML file.
 void collectVFSFromYAML(
     std::unique_ptr<llvm::MemoryBuffer> Buffer,
     llvm::SourceMgr::DiagHandlerTy DiagHandler, StringRef YAMLFilePath,

llvm/lib/Support/VirtualFileSystem.cpp

 
 std::vector<StringRef> RedirectingFileSystem::getRoots() const {
   std::vector<StringRef> R;
   for (const auto &Root : Roots)
     R.push_back(Root->getName());
   return R;
 }
 
-void RedirectingFileSystem::dump(raw_ostream &OS) const {
+void RedirectingFileSystem::print(raw_ostream &OS) const {
   for (const auto &Root : Roots)
-    dumpEntry(OS, Root.get());
+    printEntry(OS, Root.get());
 }
 
-void RedirectingFileSystem::dumpEntry(raw_ostream &OS,
+void RedirectingFileSystem::printEntry(raw_ostream &OS,
                                        RedirectingFileSystem::Entry *E,
                                        int NumSpaces) const {
   StringRef Name = E->getName();
   for (int i = 0, e = NumSpaces; i < e; ++i)
     OS << " ";
   OS << "'" << Name.str().c_str() << "'"
      << "\n";
 
   if (E->getKind() == RedirectingFileSystem::EK_Directory) {
     auto *DE = dyn_cast<RedirectingFileSystem::DirectoryEntry>(E);
     assert(DE && "Should be a directory");
 
     for (std::unique_ptr<Entry> &SubEntry :
          llvm::make_range(DE->contents_begin(), DE->contents_end()))
-      dumpEntry(OS, SubEntry.get(), NumSpaces + 2);
+      printEntry(OS, SubEntry.get(), NumSpaces + 2);
   }
 }
 
 #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
-LLVM_DUMP_METHOD void RedirectingFileSystem::dump() const { dump(dbgs()); }
+void RedirectingFileSystem::dump() const { print(dbgs()); }
 #endif
 
 /// A helper class to hold the common YAML parsing state.
 class llvm::vfs::RedirectingFileSystemParser {
   yaml::Stream &Stream;
 
   void error(yaml::Node *N, const Twine &Msg) { Stream.printError(N, Msg); }