[lld] 2554b95 - Revert "[lld-macho] Implement -dependency_info (partially - more opcodes needed)"
Nico Weber via llvm-commits
llvm-commits at lists.llvm.org
Sun Mar 21 13:36:53 PDT 2021
Author: Nico Weber
Date: 2021-03-21T16:35:38-04:00
New Revision: 2554b95db57cfcc13864d9bbb9f4e75892067c14
URL: https://github.com/llvm/llvm-project/commit/2554b95db57cfcc13864d9bbb9f4e75892067c14
DIFF: https://github.com/llvm/llvm-project/commit/2554b95db57cfcc13864d9bbb9f4e75892067c14.diff
LOG: Revert "[lld-macho] Implement -dependency_info (partially - more opcodes needed)"
This reverts commit c53a1322f329e29446c7625da423f58f09ec1a55.
Test only passes depending on build dir having a lexicographically later name
than the source dir, and doesn't link on mac/win. See
https://reviews.llvm.org/D98559#2640265 onward.
Added:
Modified:
lld/MachO/Driver.cpp
lld/MachO/Driver.h
lld/MachO/DriverUtils.cpp
lld/MachO/Options.td
Removed:
lld/test/MachO/Inputs/DependencyDump.py
lld/test/MachO/dependency-info.s
################################################################################
diff --git a/lld/MachO/Driver.cpp b/lld/MachO/Driver.cpp
index 93592f4f3a84..341ddaf870a6 100644
--- a/lld/MachO/Driver.cpp
+++ b/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) {
diff --git a/lld/MachO/Driver.h b/lld/MachO/Driver.h
index 95bc583c5489..8176e9828035 100644
--- a/lld/MachO/Driver.h
+++ b/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,45 +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.
- void logFileNotFound(std::string);
- void logFileNotFound(const llvm::Twine &path);
-
- // 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
diff --git a/lld/MachO/DriverUtils.cpp b/lld/MachO/DriverUtils.cpp
index cc5bcdfe0bbd..faa9b760d904 100644
--- a/lld/MachO/DriverUtils.cpp
+++ b/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,59 +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;
- }
-}
-
-inline void macho::DependencyTracker::logFileNotFound(std::string path) {
- if (active)
- notFounds.insert(std::move(path));
-}
-
-inline void macho::DependencyTracker::logFileNotFound(const Twine &path) {
- if (active)
- notFounds.insert(path.str());
-}
-
-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);
-}
diff --git a/lld/MachO/Options.td b/lld/MachO/Options.td
index 073cb5b11621..0e9f7b8f7390 100644
--- a/lld/MachO/Options.td
+++ b/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">,
diff --git a/lld/test/MachO/Inputs/DependencyDump.py b/lld/test/MachO/Inputs/DependencyDump.py
deleted file mode 100644
index b1c1151d33fa..000000000000
--- a/lld/test/MachO/Inputs/DependencyDump.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Dump the dependency file (produced with -dependency_info) to text
-# format for testing purposes.
-#
-
-import sys
-
-f = open(sys.argv[1], "rb")
-byte = f.read(1)
-while byte != b'':
- if byte == b'\x00':
- sys.stdout.write("lld-version: ")
- elif byte == b'\x10':
- sys.stdout.write("input-file: ")
- elif byte == b'\x11':
- sys.stdout.write("not-found: ")
- elif byte == b'\x40':
- sys.stdout.write("output-file: ")
- byte = f.read(1)
- while byte != b'\x00':
- sys.stdout.write(byte.decode("ascii"))
- byte = f.read(1)
- sys.stdout.write("\n")
- byte = f.read(1)
-
-f.close()
diff --git a/lld/test/MachO/dependency-info.s b/lld/test/MachO/dependency-info.s
deleted file mode 100644
index a1649d81d667..000000000000
--- a/lld/test/MachO/dependency-info.s
+++ /dev/null
@@ -1,51 +0,0 @@
-# REQUIRES: x86
-## FIXME: Paths on windows have both `\` and '/', as a result, they are in a
diff erent
-## order when sorted. Maybe create a separate test for that?
-# UNSUPPORTED: system-windows
-#
-# RUN: rm -rf %t
-# RUN: split-file %s %t
-
-# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/foo.o %t/foo.s
-# RUN: %lld -dylib -o %t/libfoo.dylib %t/foo.o
-
-# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/bar.o %t/bar.s
-# RUN: llvm-ar csr %t/bar.a %t/bar.o
-
-# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/main.o %t/main.s
-
-# RUN: %lld %t/main.o %t/bar.a %t/libfoo.dylib -lSystem -dependency_info %t/deps_info.out
-
-# RUN: %python %S/Inputs/DependencyDump.py %t/deps_info.out | FileCheck %s
-
-# CHECK: lld-version: LLD {{.*}}
-
-# CHECK-NEXT: input-file: {{.*}}/bar.a
-# CHECK-NEXT: input-file: {{.*}}/libfoo.dylib
-# CHECK-NEXT: input-file: {{.*}}/main.o
-# CHECK-NEXT: input-file: {{.*}}/libSystem.tbd
-# CHECK-NEXT: bar.o
-
-# CHECK-NEXT: not-found: {{.*}}/libdyld.dylib
-## There could be more not-found here but we are not checking those because it's brittle.
-
-# CHECK: output-file: a.out
-
-
-#--- foo.s
-.globl __Z3foo
-__Z3foo:
- ret
-
-#--- bar.s
-.globl _bar
-_bar:
- callq __Z3foo
- ret
-
-#--- main.s
-.globl _main
-_main:
- callq _bar
- callq __Z3foo
- ret
More information about the llvm-commits
mailing list