[llvm] 6229369 - Revert "[llvm-objcopy][MachO] Minor code cleanup"
Alexander Shaposhnikov via llvm-commits
llvm-commits at lists.llvm.org
Tue Jun 29 01:20:20 PDT 2021
Author: Alexander Shaposhnikov
Date: 2021-06-29T01:18:48-07:00
New Revision: 6229369e5089b295203424a077c60a7449aab803
URL: https://github.com/llvm/llvm-project/commit/6229369e5089b295203424a077c60a7449aab803
DIFF: https://github.com/llvm/llvm-project/commit/6229369e5089b295203424a077c60a7449aab803.diff
LOG: Revert "[llvm-objcopy][MachO] Minor code cleanup"
This reverts commit c94cf97b53566a26245c54ea0c41b0dc83daf8a0
since it appears to have broken linaro-clang-armv7-quick build bot
and needs further investigation.
Added:
Modified:
llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
Removed:
################################################################################
diff --git a/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp b/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
index 4b0aeb9702679..050dd976f3f35 100644
--- a/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
+++ b/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
@@ -28,7 +28,7 @@ void MachOReader::readHeader(Object &O) const {
}
template <typename SectionType>
-static Section constructSectionCommon(const SectionType &Sec, uint32_t Index) {
+static Section constructSectionCommon(SectionType Sec, uint32_t Index) {
StringRef SegName(Sec.segname, strnlen(Sec.segname, sizeof(Sec.segname)));
StringRef SectName(Sec.sectname, strnlen(Sec.sectname, sizeof(Sec.sectname)));
Section S(SegName, SectName);
@@ -46,11 +46,14 @@ static Section constructSectionCommon(const SectionType &Sec, uint32_t Index) {
return S;
}
-static Section constructSection(const MachO::section &Sec, uint32_t Index) {
+template <typename SectionType>
+Section constructSection(SectionType Sec, uint32_t Index);
+
+template <> Section constructSection(MachO::section Sec, uint32_t Index) {
return constructSectionCommon(Sec, Index);
}
-static Section constructSection(const MachO::section_64 &Sec, uint32_t Index) {
+template <> Section constructSection(MachO::section_64 Sec, uint32_t Index) {
Section S = constructSectionCommon(Sec, Index);
S.Reserved3 = Sec.reserved3;
return S;
More information about the llvm-commits
mailing list