[PATCH] D80568: [llvm-objcopy][ELF] Fix removing a group member section.
Igor Kudrin via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Fri May 29 06:29:49 PDT 2020
This revision was automatically updated to reflect the committed changes.
Closed by commit rG5b875bf59b06: [llvm-objcopy][ELF] Fix removing a group member. (authored by ikudrin).
Changed prior to commit:
https://reviews.llvm.org/D80568?vs=266229&id=267219#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D80568/new/
https://reviews.llvm.org/D80568
Files:
llvm/test/tools/llvm-objcopy/ELF/remove-section-in-group.test
llvm/tools/llvm-objcopy/ELF/Object.cpp
llvm/tools/llvm-objcopy/ELF/Object.h
Index: llvm/tools/llvm-objcopy/ELF/Object.h
===================================================================
--- llvm/tools/llvm-objcopy/ELF/Object.h
+++ llvm/tools/llvm-objcopy/ELF/Object.h
@@ -801,6 +801,9 @@
void accept(SectionVisitor &) const override;
void accept(MutableSectionVisitor &Visitor) override;
void finalize() override;
+ Error removeSectionReferences(
+ bool AllowBrokenLinks,
+ function_ref<bool(const SectionBase *)> ToRemove) override;
Error removeSymbols(function_ref<bool(const Symbol &)> ToRemove) override;
void markSymbols() override;
void replaceSectionReferences(
Index: llvm/tools/llvm-objcopy/ELF/Object.cpp
===================================================================
--- llvm/tools/llvm-objcopy/ELF/Object.cpp
+++ llvm/tools/llvm-objcopy/ELF/Object.cpp
@@ -112,7 +112,9 @@
template <class ELFT>
void ELFSectionSizer<ELFT>::visit(GnuDebugLinkSection &Sec) {}
-template <class ELFT> void ELFSectionSizer<ELFT>::visit(GroupSection &Sec) {}
+template <class ELFT> void ELFSectionSizer<ELFT>::visit(GroupSection &Sec) {
+ Sec.Size = sizeof(Elf_Word) + Sec.GroupMembers.size() * sizeof(Elf_Word);
+}
template <class ELFT>
void ELFSectionSizer<ELFT>::visit(SectionIndexSection &Sec) {}
@@ -968,6 +970,12 @@
this->Link = SymTab->Index;
}
+Error GroupSection::removeSectionReferences(
+ bool AllowBrokenLinks, function_ref<bool(const SectionBase *)> ToRemove) {
+ llvm::erase_if(GroupMembers, ToRemove);
+ return Error::success();
+}
+
Error GroupSection::removeSymbols(function_ref<bool(const Symbol &)> ToRemove) {
if (ToRemove(*Sym))
return createStringError(llvm::errc::invalid_argument,
Index: llvm/test/tools/llvm-objcopy/ELF/remove-section-in-group.test
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-objcopy/ELF/remove-section-in-group.test
@@ -0,0 +1,36 @@
+## This checks that the group section is shrunk when its member is removed.
+
+# RUN: yaml2obj %s -o - \
+# RUN: | llvm-objcopy -R .foo - - \
+# RUN: | obj2yaml - \
+# RUN: | FileCheck %s
+
+# CHECK: - Name: .group
+# CHECK: Members:
+# CHECK-NEXT: - SectionOrType: GRP_COMDAT
+# CHECK-NEXT: - SectionOrType: .bar
+# CHECK-NOT: - SectionOrType:
+
+--- !ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_X86_64
+Sections:
+ - Name: .group
+ Type: SHT_GROUP
+ Info: foo_bar_grp
+ Members:
+ - SectionOrType: GRP_COMDAT
+ - SectionOrType: .foo
+ - SectionOrType: .bar
+ - Name: .foo
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC, SHF_GROUP ]
+ - Name: .bar
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC, SHF_GROUP ]
+Symbols:
+ - Name: foo_bar_grp
+ Section: .group
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D80568.267219.patch
Type: text/x-patch
Size: 2851 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200529/42feb3a5/attachment.bin>
More information about the llvm-commits
mailing list