
Summary: Error handling in liblldCore and the Darwin toolchain prints to an output stream. A TODO in the project explained that a diagnostics interface resembling Clang's should be added. For now, the simple diagnostics interface defined in liblldCommon seems like an improvement. It prints colors when they're available, uses locks for thread-safety, and abstracts away the `"error: "` and newline literal strings that litter the Darwin toolchain code. To use the liblldCommon error handler, a link dependency is added to the liblldDriver library. Test Plan: 1. check-lld 2. Invoke `ld64.lld -r` in a terminal that supports color output. Confirm that "ld64.lld: error: -arch not specified and could not be inferred" is output, and that the "error:" is colored red! Reviewers: ruiu, smeenai Reviewed By: ruiu Subscribers: mgorny, llvm-commits Differential Revision: https://reviews.llvm.org/D47998 llvm-svn: 334466
71 lines
2.3 KiB
C++
71 lines
2.3 KiB
C++
//===- lib/Core/LinkingContext.cpp - Linker Context Object Interface ------===//
|
|
//
|
|
// The LLVM Linker
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "lld/Core/LinkingContext.h"
|
|
#include "lld/Core/File.h"
|
|
#include "lld/Core/Node.h"
|
|
#include "lld/Core/Simple.h"
|
|
#include "lld/Core/Writer.h"
|
|
#include <algorithm>
|
|
|
|
namespace lld {
|
|
|
|
LinkingContext::LinkingContext() = default;
|
|
|
|
LinkingContext::~LinkingContext() = default;
|
|
|
|
bool LinkingContext::validate() {
|
|
return validateImpl();
|
|
}
|
|
|
|
llvm::Error LinkingContext::writeFile(const File &linkedFile) const {
|
|
return this->writer().writeFile(linkedFile, _outputPath);
|
|
}
|
|
|
|
std::unique_ptr<File> LinkingContext::createEntrySymbolFile() const {
|
|
return createEntrySymbolFile("<command line option -e>");
|
|
}
|
|
|
|
std::unique_ptr<File>
|
|
LinkingContext::createEntrySymbolFile(StringRef filename) const {
|
|
if (entrySymbolName().empty())
|
|
return nullptr;
|
|
std::unique_ptr<SimpleFile> entryFile(new SimpleFile(filename,
|
|
File::kindEntryObject));
|
|
entryFile->addAtom(
|
|
*(new (_allocator) SimpleUndefinedAtom(*entryFile, entrySymbolName())));
|
|
return std::move(entryFile);
|
|
}
|
|
|
|
std::unique_ptr<File> LinkingContext::createUndefinedSymbolFile() const {
|
|
return createUndefinedSymbolFile("<command line option -u or --defsym>");
|
|
}
|
|
|
|
std::unique_ptr<File>
|
|
LinkingContext::createUndefinedSymbolFile(StringRef filename) const {
|
|
if (_initialUndefinedSymbols.empty())
|
|
return nullptr;
|
|
std::unique_ptr<SimpleFile> undefinedSymFile(
|
|
new SimpleFile(filename, File::kindUndefinedSymsObject));
|
|
for (StringRef undefSym : _initialUndefinedSymbols)
|
|
undefinedSymFile->addAtom(*(new (_allocator) SimpleUndefinedAtom(
|
|
*undefinedSymFile, undefSym)));
|
|
return std::move(undefinedSymFile);
|
|
}
|
|
|
|
void LinkingContext::createInternalFiles(
|
|
std::vector<std::unique_ptr<File>> &result) const {
|
|
if (std::unique_ptr<File> file = createEntrySymbolFile())
|
|
result.push_back(std::move(file));
|
|
if (std::unique_ptr<File> file = createUndefinedSymbolFile())
|
|
result.push_back(std::move(file));
|
|
}
|
|
|
|
} // end namespace lld
|