<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Thanks Lang! And for the other fix in lib/MC/MCDisassembler/MCRelocationInfo.cpp with this:<div class=""><span style="font-family: 'Helvetica Neue';" class=""><br class=""></span></div><div class=""><span style="font-family: 'Helvetica Neue';" class=""><span class="Apple-tab-span" style="white-space:pre"> </span>[llvm] r269844 - Remove unnecessary header include.</span><div class=""><div class=""><br class=""></div><div class="">This should get the fixes Sanjoy Das needs to get ToT working for him.</div><div class=""><br class=""></div><div class="">Kev</div><div class=""><br class=""></div><div class="">P.S. Great to have you down the hall way :)</div><div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On May 17, 2016, at 2:38 PM, Lang Hames via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class="">Author: lhames<br class="">Date: Tue May 17 16:38:53 2016<br class="">New Revision: 269848<br class=""><br class="">URL: <a href="http://llvm.org/viewvc/llvm-project?rev=269848&view=rev" class="">http://llvm.org/viewvc/llvm-project?rev=269848&view=rev</a><br class="">Log:<br class="">[Object] Move isNotObjectErrorInvalidFileType out of header.<br class=""><br class="">Modified:<br class=""> llvm/trunk/include/llvm/Object/Error.h<br class=""> llvm/trunk/lib/Object/Error.cpp<br class=""><br class="">Modified: llvm/trunk/include/llvm/Object/Error.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/Error.h?rev=269848&r1=269847&r2=269848&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/Error.h?rev=269848&r1=269847&r2=269848&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/include/llvm/Object/Error.h (original)<br class="">+++ llvm/trunk/include/llvm/Object/Error.h Tue May 17 16:38:53 2016<br class="">@@ -72,6 +72,13 @@ private:<br class=""> std::string Msg;<br class=""> };<br class=""><br class="">+/// isNotObjectErrorInvalidFileType() is used when looping through the children<br class="">+/// of an archive after calling getAsBinary() on the child and it returns an<br class="">+/// llvm::Error. In the cases we want to loop through the children and ignore the<br class="">+/// non-objects in the archive this is used to test the error to see if an<br class="">+/// error() function needs to called on the llvm::Error.<br class="">+Error isNotObjectErrorInvalidFileType(llvm::Error Err);<br class="">+<br class=""> } // end namespace object.<br class=""><br class=""> } // end namespace llvm.<br class="">@@ -81,34 +88,4 @@ template <><br class=""> struct is_error_code_enum<llvm::object::object_error> : std::true_type {};<br class=""> }<br class=""><br class="">-namespace llvm {<br class="">-namespace object {<br class="">-<br class="">-// isNotObjectErrorInvalidFileType() is used when looping through the children<br class="">-// of an archive after calling getAsBinary() on the child and it returns an<br class="">-// llvm::Error. In the cases we want to loop through the children and ignore the<br class="">-// non-objects in the archive this is used to test the error to see if an<br class="">-// error() function needs to called on the llvm::Error.<br class="">-static inline llvm::Error isNotObjectErrorInvalidFileType(llvm::Error Err) {<br class="">- if (auto Err2 =<br class="">- handleErrors(std::move(Err),<br class="">- [](std::unique_ptr<ECError> M) {<br class="">- // Try to handle 'M'. If successful, return a success value from<br class="">- // the handler.<br class="">- if (M->convertToErrorCode() == object_error::invalid_file_type)<br class="">- return Error::success();<br class="">-<br class="">- // We failed to handle 'M' - return it from the handler.<br class="">- // This value will be passed back from catchErrors and<br class="">- // wind up in Err2, where it will be returned from this function.<br class="">- return Error(std::move(M));<br class="">- }))<br class="">- return Err2;<br class="">- return Err;<br class="">-}<br class="">-<br class="">-} // end namespace object.<br class="">-<br class="">-} // end namespace llvm.<br class="">-<br class=""> #endif<br class=""><br class="">Modified: llvm/trunk/lib/Object/Error.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/Error.cpp?rev=269848&r1=269847&r2=269848&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/Error.cpp?rev=269848&r1=269847&r2=269848&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/lib/Object/Error.cpp (original)<br class="">+++ llvm/trunk/lib/Object/Error.cpp Tue May 17 16:38:53 2016<br class="">@@ -71,3 +71,21 @@ static ManagedStatic<_object_error_categ<br class=""> const std::error_category &object::object_category() {<br class=""> return *error_category;<br class=""> }<br class="">+<br class="">+llvm::Error llvm::object::isNotObjectErrorInvalidFileType(llvm::Error Err) {<br class="">+ if (auto Err2 =<br class="">+ handleErrors(std::move(Err),<br class="">+ [](std::unique_ptr<ECError> M) {<br class="">+ // Try to handle 'M'. If successful, return a success value from<br class="">+ // the handler.<br class="">+ if (M->convertToErrorCode() == object_error::invalid_file_type)<br class="">+ return Error::success();<br class="">+<br class="">+ // We failed to handle 'M' - return it from the handler.<br class="">+ // This value will be passed back from catchErrors and<br class="">+ // wind up in Err2, where it will be returned from this function.<br class="">+ return Error(std::move(M));<br class="">+ }))<br class="">+ return Err2;<br class="">+ return Err;<br class="">+}<br class=""><br class=""><br class="">_______________________________________________<br class="">llvm-commits mailing list<br class=""><a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a><br class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits<br class=""></div></blockquote></div><br class=""></div></div></div></body></html>