commit 061f9286dfc86e9b97df32b5a14dd491e38faf6f
author Rui Ueyama <ruiu@google.com> Sat Nov 19 19:23:58 2016 +0000
committer Rui Ueyama <ruiu@google.com> Sat Nov 19 19:23:58 2016 +0000
tree d845d0fdf86f9871016847a8c430d2ac1ce7c6ef
parent ec75220fe93d8ba056d6d7cba46b8edffda11d4e

Use Optional<std::string> instead of "" to represent a failure.

llvm-svn: 287456

lld/ELF/LinkerScript.cpp

diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 887f5ca..03a0349 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -1099,11 +1099,10 @@
   } else if (sys::fs::exists(S)) {
     Driver->addFile(S);
   } else {
-    std::string Path = findFromSearchPaths(S);
-    if (Path.empty())
-      setError("unable to find " + S);
+    if (Optional<std::string> Path = findFromSearchPaths(S))
+      Driver->addFile(Saver.save(*Path));
     else
-      Driver->addFile(Saver.save(Path));
+      setError("unable to find " + S);
   }
 }