summaryrefslogtreecommitdiffstats
path: root/lld/utils/linker-script-test/linker-script-test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lld/utils/linker-script-test/linker-script-test.cpp')
-rw-r--r--lld/utils/linker-script-test/linker-script-test.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/lld/utils/linker-script-test/linker-script-test.cpp b/lld/utils/linker-script-test/linker-script-test.cpp
index e481470a462..974989833e8 100644
--- a/lld/utils/linker-script-test/linker-script-test.cpp
+++ b/lld/utils/linker-script-test/linker-script-test.cpp
@@ -26,12 +26,13 @@ int main(int argc, const char **argv) {
llvm::PrettyStackTraceProgram X(argc, argv);
{
- std::unique_ptr<MemoryBuffer> mb;
- if (std::error_code ec = MemoryBuffer::getFileOrSTDIN(argv[1], mb)) {
+ ErrorOr<std::unique_ptr<MemoryBuffer>> mb =
+ MemoryBuffer::getFileOrSTDIN(argv[1]);
+ if (std::error_code ec = mb.getError()) {
llvm::errs() << ec.message() << "\n";
return 1;
}
- Lexer l(std::move(mb));
+ Lexer l(std::move(mb.get()));
Token tok;
while (true) {
l.lex(tok);
@@ -41,12 +42,13 @@ int main(int argc, const char **argv) {
}
}
{
- std::unique_ptr<MemoryBuffer> mb;
- if (std::error_code ec = MemoryBuffer::getFileOrSTDIN(argv[1], mb)) {
+ ErrorOr<std::unique_ptr<MemoryBuffer>> mb =
+ MemoryBuffer::getFileOrSTDIN(argv[1]);
+ if (std::error_code ec = mb.getError()) {
llvm::errs() << ec.message() << "\n";
return 1;
}
- Lexer l(std::move(mb));
+ Lexer l(std::move(mb.get()));
Parser p(l);
LinkerScript *ls = p.parse();
if (ls)
OpenPOWER on IntegriCloud