<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Sep 10, 2014 at 6:01 AM, David Majnemer <span dir="ltr"><<a href="mailto:david.majnemer@gmail.com" target="_blank">david.majnemer@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Wed Sep 10 08:01:03 2014<br>
New Revision: 217499<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=217499&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=217499&view=rev</a><br>
Log:<br>
Attempt to pacify buildbots.<br>
<br>
Modified:<br>
    llvm/trunk/include/llvm/Object/COFF.h<br>
    llvm/trunk/lib/Object/COFFObjectFile.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/Object/COFF.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/COFF.h?rev=217499&r1=217498&r2=217499&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/COFF.h?rev=217499&r1=217498&r2=217499&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Object/COFF.h (original)<br>
+++ llvm/trunk/include/llvm/Object/COFF.h Wed Sep 10 08:01:03 2014<br>
@@ -567,7 +567,14 @@ public:<br>
                                    const data_directory *&Res) const;<br>
   std::error_code getSection(int32_t index, const coff_section *&Res) const;<br>
   template <typename coff_symbol_type><br>
-  std::error_code getSymbol(uint32_t index, const coff_symbol_type *&Res) const;<br>
+  std::error_code getSymbol(uint32_t Index,<br>
+                            const coff_symbol_type *&Res) const {<br>
+    if (Index < getNumberOfSymbols())<br>
+      Res = reinterpret_cast<coff_symbol_type *>(getSymbolTable()) + Index;<br>
+    else<br>
+      return object_error::parse_failed;<br>
+    return object_error::success;<br></blockquote><div><br>Might this be better phrased as either:<br><br>  if (...) {<br>    Res = ...<br>    return success;<br>  }<br>  return parse_failed<br><br>or possibly:<br><br>  if (Index >= getNumberOfSymbols())<br>    return parse_failed;<br>  Res = ...<br>  return success;<br><br>? <br><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+  }<br>
   ErrorOr<COFFSymbolRef> getSymbol(uint32_t index) const {<br>
     if (SymbolTable16) {<br>
       const coff_symbol16 *Symb = nullptr;<br>
<br>
Modified: llvm/trunk/lib/Object/COFFObjectFile.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/COFFObjectFile.cpp?rev=217499&r1=217498&r2=217499&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/COFFObjectFile.cpp?rev=217499&r1=217498&r2=217499&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Object/COFFObjectFile.cpp (original)<br>
+++ llvm/trunk/lib/Object/COFFObjectFile.cpp Wed Sep 10 08:01:03 2014<br>
@@ -768,17 +768,6 @@ std::error_code COFFObjectFile::getStrin<br>
   return object_error::success;<br>
 }<br>
<br>
-template <typename coff_symbol_type><br>
-std::error_code<br>
-COFFObjectFile::getSymbol(uint32_t Index,<br>
-                          const coff_symbol_type *&Result) const {<br>
-  if (Index < getNumberOfSymbols())<br>
-    Result = reinterpret_cast<coff_symbol_type *>(getSymbolTable()) + Index;<br>
-  else<br>
-    return object_error::parse_failed;<br>
-  return object_error::success;<br>
-}<br>
-<br>
 std::error_code COFFObjectFile::getSymbolName(COFFSymbolRef Symbol,<br>
                                               StringRef &Res) const {<br>
   // Check for string table entry. First 4 bytes are 0.<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>