[lld] r264188 - Add the needed lld change for r264187 in llvm.

[Kevin Enderby via llvm-commits]

Author: enderby
Date: Wed Mar 23 15:37:23 2016
New Revision: 264188

URL: http://llvm.org/viewvc/llvm-project?rev=264188&view=rev
Log:
Add the needed lld change for r264187 in llvm.

Sorry had this fixed in my check out but failed mention it in my
commit message for r264187.

Modified:
    lld/trunk/lib/ReaderWriter/FileArchive.cpp

Modified: lld/trunk/lib/ReaderWriter/FileArchive.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/FileArchive.cpp?rev=264188&r1=264187&r2=264188&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/FileArchive.cpp (original)
+++ lld/trunk/lib/ReaderWriter/FileArchive.cpp Wed Mar 23 15:37:23 2016
@@ -187,7 +187,10 @@ private:
         continue;
 
       // Returns true if it's a data symbol.
-      SymbolRef::Type type = sym.getType();
+      ErrorOr<SymbolRef::Type> typeOrErr = sym.getType();
+      if (typeOrErr.getError())
+        return false;
+      SymbolRef::Type type = *typeOrErr;
       if (type == SymbolRef::ST_Data)
         return true;
     }