[llvm-objcopy][MachO] Fix build

Alexander Shaposhnikov · Alexander Shaposhnikov · commit 29c6f5c7fdd9 · 2020-04-27T18:20:01.000-07:00
Some compilers are confused when the same name is used in different contexts. Rename the field Section to unbreak the build. (Caught by the buildbot http://lab.llvm.org:8011/builders/clang-with-thin-lto-ubuntu/builds/22374)
diff --git a/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp b/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
@@ -222,7 +222,7 @@ void MachOReader::setSymbolInRelocationInfo(Object &O) const {
             // if we encounter an invalid relocation.
             assert(SymbolNum >= 1 && SymbolNum <= Sections.size() &&
                    "Invalid section index.");
-            Reloc.Section = Sections[SymbolNum - 1];
+            Reloc.Sec = Sections[SymbolNum - 1];
           }
         }
 }
diff --git a/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp b/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp
@@ -243,7 +243,7 @@ void MachOWriter::writeSections() {
         if (!RelocInfo.Scattered) {
           const uint32_t SymbolNum = RelocInfo.Extern
                                          ? (*RelocInfo.Symbol)->Index
-                                         : (*RelocInfo.Section)->Index;
+                                         : (*RelocInfo.Sec)->Index;
           RelocInfo.setPlainRelocationSymbolNum(SymbolNum, IsLittleEndian);
         }
         if (IsLittleEndian != sys::IsLittleEndianHost)
diff --git a/llvm/tools/llvm-objcopy/MachO/Object.h b/llvm/tools/llvm-objcopy/MachO/Object.h
@@ -165,7 +165,7 @@ struct RelocationInfo {
   // The referenced symbol entry. Set if !Scattered && Extern.
   Optional<const SymbolEntry *> Symbol;
   // The referenced section. Set if !Scattered && !Extern.
-  Optional<const Section *> Section;
+  Optional<const Section *> Sec;
   // True if Info is a scattered_relocation_info.
   bool Scattered;
   // True if the r_symbolnum points to a section number (i.e. r_extern=0).

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ void MachOReader::setSymbolInRelocationInfo(Object &O) const {`
`222`	`222`	`// if we encounter an invalid relocation.`
`223`	`223`	`assert(SymbolNum >= 1 && SymbolNum <= Sections.size() &&`
`224`	`224`	`"Invalid section index.");`
`225`		`- Reloc.Section = Sections[SymbolNum - 1];`
	`225`	`+ Reloc.Sec = Sections[SymbolNum - 1];`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ void MachOWriter::writeSections() {`
`243`	`243`	`if (!RelocInfo.Scattered) {`
`244`	`244`	`const uint32_t SymbolNum = RelocInfo.Extern`
`245`	`245`	`? (*RelocInfo.Symbol)->Index`
`246`		`- : (*RelocInfo.Section)->Index;`
	`246`	`+ : (*RelocInfo.Sec)->Index;`
`247`	`247`	`RelocInfo.setPlainRelocationSymbolNum(SymbolNum, IsLittleEndian);`
`248`	`248`	`}`
`249`	`249`	`if (IsLittleEndian != sys::IsLittleEndianHost)`