[PATCH] D13990: These are the matching changes needed to the lld project for the changes to llvm that changed the Archive and Child interfaces in libObject.

[Rui Ueyama via llvm-commits]

ruiu accepted this revision.
ruiu added a comment.
This revision is now accepted and ready to land.

LGTM with a few nits.


================
Comment at: COFF/DriverUtils.cpp:525
@@ +524,3 @@
+  for (auto &ChildOrErr : Archive.children()) {
+    error(ChildOrErr.getError(), "Archive::Child::getName failed");
+    const object::Archive::Child C(*ChildOrErr);
----------------
error's first parameter can be ErrorOr<T>, so it can be

  error(ChildOrErr, "Archive::Child::getName failed");

I'm sorry that I didn't mention this in the previous review.


================
Comment at: COFF/InputFiles.cpp:71
@@ +70,3 @@
+  for (auto &ChildOrErr : File->children()) {
+    error(ChildOrErr.getError(), "Failed to parse static library");
+    const Archive::Child &Child = *ChildOrErr;
----------------
Ditto

================
Comment at: ELF/InputFiles.cpp:275
@@ +274,3 @@
+            File->getFileName());
+      break;
+    }
----------------
Remove `break`.


http://reviews.llvm.org/D13990