2 files changed, 6 insertions, 6 deletions
diff --git a/lld/lib/Driver/GnuLdInputGraph.cpp b/lld/lib/Driver/GnuLdInputGraph.cpp
index 9a5bab4331c..9becadb5ed9 100644
--- a/lld/lib/Driver/GnuLdInputGraph.cpp
+++ b/lld/lib/Driver/GnuLdInputGraph.cpp
@@ -16,8 +16,8 @@ using namespace lld;
 error_code ELFFileNode::parse(const LinkingContext &ctx,
                               raw_ostream &diagnostics) {
   ErrorOr<StringRef> filePath = getPath(ctx);
-  if (!filePath)
-    return error_code(filePath);
+  if (error_code ec = filePath.getError())
+    return ec;
 
   if (error_code ec = getBuffer(*filePath))
     return ec;
@@ -51,8 +51,8 @@ error_code ELFFileNode::parse(const LinkingContext &ctx,
 error_code GNULdScript::parse(const LinkingContext &ctx,
                               raw_ostream &diagnostics) {
   ErrorOr<StringRef> filePath = getPath(ctx);
-  if (!filePath)
-    return error_code(filePath);
+  if (error_code ec = filePath.getError())
+    return ec;
 
   if (error_code ec = getBuffer(*filePath))
     return ec;
diff --git a/lld/lib/Driver/WinLinkInputGraph.cpp b/lld/lib/Driver/WinLinkInputGraph.cpp
index 7db58628d05..60bfa47c1e6 100644
--- a/lld/lib/Driver/WinLinkInputGraph.cpp
+++ b/lld/lib/Driver/WinLinkInputGraph.cpp
@@ -15,9 +15,9 @@ namespace lld {
 error_code PECOFFFileNode::parse(const LinkingContext &ctx,
                                  raw_ostream &diagnostics) {
   ErrorOr<StringRef> filePath = getPath(ctx);
-  if (!filePath) {
+  if (error_code ec = filePath.getError()) {
     diagnostics << "File not found: " << _path << "\n";
-    return error_code(filePath);
+    return ec;
   }
 
   if (error_code ec = getBuffer(*filePath)) {