I honestly have no idea. I was just more around a computer than Nadav was at the time. Once the bots clear up you're more than welcome to add it back in to see what's failing.<div><br></div><div>-eric<br><div class="gmail_extra">
<br><br><div class="gmail_quote">On Mon, Dec 17, 2012 at 1:29 PM, Rafael Espíndola <span dir="ltr"><<a href="mailto:rafael.espindola@gmail.com" target="_blank">rafael.espindola@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
I am really sorry I missed this the first time. Do you guys have the<br>
log of how this was failing? DW_AT_byte_size.ll doesn't seem to do any<br>
checks with the section or segment name...<br>
<div class="HOEnZb"><div class="h5"><br>
On 13 December 2012 01:36, Eric Christopher <<a href="mailto:echristo@gmail.com">echristo@gmail.com</a>> wrote:<br>
> Author: echristo<br>
> Date: Thu Dec 13 00:36:18 2012<br>
> New Revision: 170105<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=170105&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=170105&view=rev</a><br>
> Log:<br>
> Revert "Add a funciton to get the segment name of a section."<br>
><br>
> This reverts commit r170095 since it appears to be breaking the bots.<br>
><br>
> Modified:<br>
>     llvm/trunk/include/llvm/Object/MachO.h<br>
>     llvm/trunk/lib/Object/MachOObjectFile.cpp<br>
>     llvm/trunk/tools/llvm-objdump/MachODump.cpp<br>
>     llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp<br>
><br>
> Modified: llvm/trunk/include/llvm/Object/MachO.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/MachO.h?rev=170105&r1=170104&r2=170105&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/MachO.h?rev=170105&r1=170104&r2=170105&view=diff</a><br>

> ==============================================================================<br>
> --- llvm/trunk/include/llvm/Object/MachO.h (original)<br>
> +++ llvm/trunk/include/llvm/Object/MachO.h Thu Dec 13 00:36:18 2012<br>
> @@ -44,11 +44,6 @@<br>
>    virtual unsigned getArch() const;<br>
>    virtual StringRef getLoadName() const;<br>
><br>
> -  // In a MachO file, sections have a segment name. This is used in the .o<br>
> -  // files. They have a single segment, but this field specifies which segment<br>
> -  // a section should be put in in the final object.<br>
> -  error_code getSectionFinalSegmentName(DataRefImpl Sec, StringRef &Res) const;<br>
> -<br>
>    MachOObject *getObject() { return MachOObj.get(); }<br>
><br>
>    static inline bool classof(const Binary *v) {<br>
><br>
> Modified: llvm/trunk/lib/Object/MachOObjectFile.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=170105&r1=170104&r2=170105&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=170105&r1=170104&r2=170105&view=diff</a><br>

> ==============================================================================<br>
> --- llvm/trunk/lib/Object/MachOObjectFile.cpp (original)<br>
> +++ llvm/trunk/lib/Object/MachOObjectFile.cpp Thu Dec 13 00:36:18 2012<br>
> @@ -473,43 +473,28 @@<br>
>    return false;<br>
>  }<br>
><br>
> -static StringRef parseSegmentOrSectionName(const char *P) {<br>
> -  if (P[15] == 0)<br>
> -    // Null terminated.<br>
> -    return P;<br>
> -  // Not null terminated, so this is a 16 char string.<br>
> -  return StringRef(P, 16);<br>
> -}<br>
> -<br>
>  error_code MachOObjectFile::getSectionName(DataRefImpl DRI,<br>
>                                             StringRef &Result) const {<br>
> +  // FIXME: thread safety.<br>
> +  static char result[34];<br>
>    if (is64BitLoadCommand(MachOObj.get(), DRI)) {<br>
>      LoadCommandInfo LCI = MachOObj->getLoadCommandInfo(DRI.d.a);<br>
>      InMemoryStruct<macho::Section64> Sect;<br>
>      MachOObj->ReadSection64(LCI, DRI.d.b, Sect);<br>
> -    Result = parseSegmentOrSectionName(Sect->Name);<br>
> +<br>
> +    strcpy(result, Sect->SegmentName);<br>
> +    strcat(result, ",");<br>
> +    strcat(result, Sect->Name);<br>
>    } else {<br>
>      LoadCommandInfo LCI = MachOObj->getLoadCommandInfo(DRI.d.a);<br>
>      InMemoryStruct<macho::Section> Sect;<br>
>      MachOObj->ReadSection(LCI, DRI.d.b, Sect);<br>
> -    Result = parseSegmentOrSectionName(Sect->Name);<br>
> -  }<br>
> -  return object_error::success;<br>
> -}<br>
><br>
> -error_code MachOObjectFile::getSectionFinalSegmentName(DataRefImpl Sec,<br>
> -                                                       StringRef &Res) const {<br>
> -  if (is64BitLoadCommand(MachOObj.get(), Sec)) {<br>
> -    LoadCommandInfo LCI = MachOObj->getLoadCommandInfo(Sec.d.a);<br>
> -    InMemoryStruct<macho::Section64> Sect;<br>
> -    MachOObj->ReadSection64(LCI, Sec.d.b, Sect);<br>
> -    Res = parseSegmentOrSectionName(Sect->SegmentName);<br>
> -  } else {<br>
> -    LoadCommandInfo LCI = MachOObj->getLoadCommandInfo(Sec.d.a);<br>
> -    InMemoryStruct<macho::Section> Sect;<br>
> -    MachOObj->ReadSection(LCI, Sec.d.b, Sect);<br>
> -    Res = parseSegmentOrSectionName(Sect->SegmentName);<br>
> +    strcpy(result, Sect->SegmentName);<br>
> +    strcat(result, ",");<br>
> +    strcat(result, Sect->Name);<br>
>    }<br>
> +  Result = StringRef(result);<br>
>    return object_error::success;<br>
>  }<br>
><br>
><br>
> Modified: llvm/trunk/tools/llvm-objdump/MachODump.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/MachODump.cpp?rev=170105&r1=170104&r2=170105&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/MachODump.cpp?rev=170105&r1=170104&r2=170105&view=diff</a><br>

> ==============================================================================<br>
> --- llvm/trunk/tools/llvm-objdump/MachODump.cpp (original)<br>
> +++ llvm/trunk/tools/llvm-objdump/MachODump.cpp Thu Dec 13 00:36:18 2012<br>
> @@ -334,15 +334,9 @@<br>
>    for (unsigned SectIdx = 0; SectIdx != Sections.size(); SectIdx++) {<br>
>      StringRef SectName;<br>
>      if (Sections[SectIdx].getName(SectName) ||<br>
> -        SectName != "__text")<br>
> +        SectName.compare("__TEXT,__text"))<br>
>        continue; // Skip non-text sections<br>
><br>
> -    StringRef SegmentName;<br>
> -    DataRefImpl DR = Sections[SectIdx].getRawDataRefImpl();<br>
> -    if (MachOOF->getSectionFinalSegmentName(DR, SegmentName) ||<br>
> -        SegmentName != "__TEXT")<br>
> -      continue;<br>
> -<br>
>      // Insert the functions from the function starts segment into our map.<br>
>      uint64_t VMAddr;<br>
>      Sections[SectIdx].getAddress(VMAddr);<br>
><br>
> Modified: llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp?rev=170105&r1=170104&r2=170105&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp?rev=170105&r1=170104&r2=170105&view=diff</a><br>

> ==============================================================================<br>
> --- llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp (original)<br>
> +++ llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp Thu Dec 13 00:36:18 2012<br>
> @@ -28,7 +28,6 @@<br>
>  #include "llvm/MC/MCSubtargetInfo.h"<br>
>  #include "llvm/Object/Archive.h"<br>
>  #include "llvm/Object/COFF.h"<br>
> -#include "llvm/Object/MachO.h"<br>
>  #include "llvm/Object/ObjectFile.h"<br>
>  #include "llvm/Support/Casting.h"<br>
>  #include "llvm/Support/CommandLine.h"<br>
> @@ -73,9 +72,9 @@<br>
>  SymbolTable("t", cl::desc("Display the symbol table"));<br>
><br>
>  static cl::opt<bool><br>
> -MachOOpt("macho", cl::desc("Use MachO specific object file parser"));<br>
> +MachO("macho", cl::desc("Use MachO specific object file parser"));<br>
>  static cl::alias<br>
> -MachOm("m", cl::desc("Alias for --macho"), cl::aliasopt(MachOOpt));<br>
> +MachOm("m", cl::desc("Alias for --macho"), cl::aliasopt(MachO));<br>
><br>
>  cl::opt<std::string><br>
>  llvm::TripleName("triple", cl::desc("Target triple to disassemble for, "<br>
> @@ -568,13 +567,6 @@<br>
>        else if (Section == o->end_sections())<br>
>          outs() << "*UND*";<br>
>        else {<br>
> -        if (const MachOObjectFile *MachO = dyn_cast<const MachOObjectFile>(o)) {<br>
> -          StringRef SegmentName;<br>
> -          DataRefImpl DR = Section->getRawDataRefImpl();<br>
> -          if (error(MachO->getSectionFinalSegmentName(DR, SegmentName)))<br>
> -            SegmentName = "";<br>
> -          outs() << SegmentName << ",";<br>
> -        }<br>
>          StringRef SectionName;<br>
>          if (error(Section->getName(SectionName)))<br>
>            SectionName = "";<br>
> @@ -648,7 +640,7 @@<br>
>      return;<br>
>    }<br>
><br>
> -  if (MachOOpt && Disassemble) {<br>
> +  if (MachO && Disassemble) {<br>
>      DisassembleInputMachO(file);<br>
>      return;<br>
>    }<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>
</div></div></blockquote></div><br></div></div>