Revert "Revert "Revert "[lld-macho] Implement -dependency_info (partially - more opcodes needed)"""

This reverts commit 5ad2c22.

bots still  unhappy - revertting again

Author: oontvoo

lld/MachO/Driver.cpp

@@ -54,8 +54,7 @@ using namespace llvm::sys;
 using namespace lld;
 using namespace lld::macho;
 
-Configuration *macho::config;
-DependencyTracker *macho::depTracker;
+Configuration *lld::macho::config;
 
 static HeaderFileType getOutputType(const InputArgList &args) {
   // TODO: -r, -dylinker, -preload...
@@ -85,8 +84,6 @@ findAlongPathsWithExtensions(StringRef name, ArrayRef<StringRef> extensions) {
       Twine location = base + ext;
       if (fs::exists(location))
         return location.str();
-      else
-        depTracker->logFileNotFound(location);
     }
   }
   return {};
@@ -818,9 +815,6 @@ bool macho::link(ArrayRef<const char *> argsArr, bool canExitEarly,
   symtab = make<SymbolTable>();
   target = createTargetInfo(args);
 
-  depTracker =
-      make<DependencyTracker>(args.getLastArgValue(OPT_dependency_info, ""));
-
   config->entry = symtab->addUndefined(args.getLastArgValue(OPT_e, "_main"),
                                        /*file=*/nullptr,
                                        /*isWeakRef=*/false);
@@ -1072,8 +1066,6 @@ bool macho::link(ArrayRef<const char *> argsArr, bool canExitEarly,
 
     // Write to an output file.
     writeResult();
-
-    depTracker->write(getLLDVersion(), inputFiles, config->outputFile);
   }
 
   if (config->timeTraceEnabled) {

lld/MachO/Driver.h

@@ -11,14 +11,10 @@
 
 #include "lld/Common/LLVM.h"
 #include "llvm/ADT/Optional.h"
-#include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Option/OptTable.h"
 #include "llvm/Support/MemoryBuffer.h"
 
-#include <set>
-#include <type_traits>
-
 namespace llvm {
 namespace MachO {
 class InterfaceFile;
@@ -65,52 +61,6 @@ uint32_t getModTime(llvm::StringRef path);
 
 void printArchiveMemberLoad(StringRef reason, const InputFile *);
 
-// Helper class to export dependency info.
-class DependencyTracker {
-public:
-  explicit DependencyTracker(llvm::StringRef path);
-
-  // Adds the given path to the set of not-found files.
-  inline void logFileNotFound(std::string path) {
-    if (active)
-      notFounds.insert(std::move(path));
-  }
-
-  inline void logFileNotFound(const Twine &path) {
-    if (active)
-      notFounds.insert(path.str());
-  }
-
-  // Writes the dependencies to specified path.
-  // The content is sorted by its Op Code, then within each section,
-  // alphabetical order.
-  void write(llvm::StringRef version,
-             const llvm::SetVector<InputFile *> &inputs,
-             llvm::StringRef output);
-
-private:
-  enum DepOpCode : char {
-    // Denotes the linker version.
-    Version = 0x00,
-    // Denotes the input files.
-    Input = 0x10,
-    // Denotes the files that do not exist(?)
-    NotFound = 0x11,
-    // Denotes the output files.
-    Output = 0x40,
-  };
-
-  const llvm::StringRef path;
-  bool active;
-
-  // The paths need to be alphabetically ordered.
-  // We need to own the paths because some of them are temporarily
-  // constructed.
-  std::set<std::string> notFounds;
-};
-
-extern DependencyTracker *depTracker;
-
 } // namespace macho
 } // namespace lld
 

lld/MachO/DriverUtils.cpp

@@ -23,7 +23,6 @@
 #include "llvm/Option/ArgList.h"
 #include "llvm/Option/Option.h"
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 #include "llvm/TextAPI/MachO/InterfaceFile.h"
 #include "llvm/TextAPI/MachO/TextAPIReader.h"
@@ -165,15 +164,12 @@ Optional<std::string> macho::resolveDylibPath(StringRef path) {
   // they are consistent.
   if (fs::exists(path))
     return std::string(path);
-  else
-    depTracker->logFileNotFound(path);
 
   SmallString<261> location = path;
   path::replace_extension(location, ".tbd");
   if (fs::exists(location))
     return std::string(location);
-  else
-    depTracker->logFileNotFound(location);
+
   return {};
 }
 
@@ -244,49 +240,3 @@ void macho::printArchiveMemberLoad(StringRef reason, const InputFile *f) {
   if (config->printWhyLoad)
     message(reason + " forced load of " + toString(f));
 }
-
-macho::DependencyTracker::DependencyTracker(StringRef path)
-    : path(path), active(!path.empty()) {
-  if (active && fs::exists(path) && !fs::can_write(path)) {
-    warn("Ignoring dependency_info option since specified path is not "
-         "writeable.");
-    active = false;
-  }
-}
-
-void macho::DependencyTracker::write(llvm::StringRef version,
-                                     const llvm::SetVector<InputFile *> &inputs,
-                                     llvm::StringRef output) {
-  if (!active)
-    return;
-
-  std::error_code ec;
-  llvm::raw_fd_ostream os(path, ec, llvm::sys::fs::OF_None);
-  if (ec) {
-    warn("Error writing dependency info to file");
-    return;
-  }
-
-  auto addDep = [&os](DepOpCode opcode, const StringRef &path) {
-    os << opcode;
-    os << path;
-    os << '\0';
-  };
-
-  addDep(DepOpCode::Version, version);
-
-  // Sort the input by its names.
-  std::vector<StringRef> inputNames;
-  inputNames.reserve(inputs.size());
-  for (InputFile *f : inputs)
-    inputNames.push_back(f->getName());
-  llvm::sort(inputNames,
-             [](const StringRef &a, const StringRef &b) { return a < b; });
-  for (const StringRef &in : inputNames)
-    addDep(DepOpCode::Input, in);
-
-  for (const std::string &f : notFounds)
-    addDep(DepOpCode::NotFound, f);
-
-  addDep(DepOpCode::Output, output);
-}

lld/MachO/Options.td

@@ -504,6 +504,7 @@ def map : Separate<["-"], "map">,
 def dependency_info : Separate<["-"], "dependency_info">,
     MetaVarName<"<path>">,
     HelpText<"Dump dependency info">,
+    Flags<[HelpHidden]>,
     Group<grp_introspect>;
 def save_temps : Flag<["-"], "save-temps">,
     HelpText<"Save intermediate LTO compilation results">,