s/CustomRawContentSection/CustomSection/
diff --git a/llvm/include/llvm/ObjectYAML/ELFYAML.h b/llvm/include/llvm/ObjectYAML/ELFYAML.h
index 59af9ac..38497c8 100644
--- a/llvm/include/llvm/ObjectYAML/ELFYAML.h
+++ b/llvm/include/llvm/ObjectYAML/ELFYAML.h
@@ -211,7 +211,7 @@
Dynamic,
Group,
RawContent,
- CustomRawContent,
+ CustomContent,
Relocation,
Relr,
NoBits,
@@ -400,10 +400,10 @@
};
/// Abstract base class for non-blob contents.
-struct CustomRawContentSection : Section {
+struct CustomSection : Section {
std::optional<llvm::yaml::Hex64> Info;
- CustomRawContentSection() : Section(ChunkKind::CustomRawContent) {}
+ CustomSection() : Section(ChunkKind::CustomContent) {}
/// Apply mappings.
virtual void sectionMapping(yaml::IO &IO) = 0;
@@ -415,7 +415,7 @@
virtual std::string encode() const = 0;
static bool classof(const Chunk *S) {
- return S->Kind == ChunkKind::CustomRawContent;
+ return S->Kind == ChunkKind::CustomContent;
}
};
@@ -796,14 +796,14 @@
}
~Opt();
- /// Create an empty new object of CustomRawContentSection.
+ /// Create an empty new object of CustomSection.
/// Its contents will be filled later.
/// This is called:
/// - Before preMapping for elf2yaml.
/// - After preMapping for yaml2elf.
/// Returns nullptr to delegate default actions.
- virtual std::unique_ptr<CustomRawContentSection>
- makeCustomRawContentSection(StringRef Name) const;
+ virtual std::unique_ptr<CustomSection>
+ makeCustomSection(StringRef Name) const;
/// Called before mapping sections for prettyprinting yaml.
virtual void preMapping(const ELFYAML::Object &Object, bool IsOutputting);
diff --git a/llvm/lib/ObjectYAML/ELFEmitter.cpp b/llvm/lib/ObjectYAML/ELFEmitter.cpp
index 1c7297b..f70f9e5 100644
--- a/llvm/lib/ObjectYAML/ELFEmitter.cpp
+++ b/llvm/lib/ObjectYAML/ELFEmitter.cpp
@@ -252,7 +252,7 @@
const ELFYAML::NoBitsSection &Section,
ContiguousBlobAccumulator &CBA);
void writeSectionContent(Elf_Shdr &SHeader,
- const ELFYAML::CustomRawContentSection &Section,
+ const ELFYAML::CustomSection &Section,
ContiguousBlobAccumulator &CBA);
void writeSectionContent(Elf_Shdr &SHeader,
const ELFYAML::RawContentSection &Section,
@@ -862,7 +862,7 @@
if (!isa<ELFYAML::NoBitsSection>(Sec) && (Sec->Content || Sec->Size))
SHeader.sh_size = writeContent(CBA, Sec->Content, Sec->Size);
- if (auto S = dyn_cast<ELFYAML::CustomRawContentSection>(Sec)) {
+ if (auto S = dyn_cast<ELFYAML::CustomSection>(Sec)) {
writeSectionContent(SHeader, *S, CBA);
} else if (auto S = dyn_cast<ELFYAML::RawContentSection>(Sec)) {
writeSectionContent(SHeader, *S, CBA);
@@ -1270,9 +1270,9 @@
}
template <class ELFT>
-void ELFState<ELFT>::writeSectionContent(
- Elf_Shdr &SHeader, const ELFYAML::CustomRawContentSection &Section,
- ContiguousBlobAccumulator &CBA) {
+void ELFState<ELFT>::writeSectionContent(Elf_Shdr &SHeader,
+ const ELFYAML::CustomSection &Section,
+ ContiguousBlobAccumulator &CBA) {
if (Section.Info)
SHeader.sh_info = *Section.Info;
diff --git a/llvm/lib/ObjectYAML/ELFYAML.cpp b/llvm/lib/ObjectYAML/ELFYAML.cpp
index 83ee88e..3f73637 100644
--- a/llvm/lib/ObjectYAML/ELFYAML.cpp
+++ b/llvm/lib/ObjectYAML/ELFYAML.cpp
@@ -32,8 +32,8 @@
ELFYAML::Opt::~Opt() = default;
const char ELFYAML::Opt::ID = 'E';
-std::unique_ptr<ELFYAML::CustomRawContentSection>
-ELFYAML::Opt::makeCustomRawContentSection(StringRef Name) const {
+std::unique_ptr<ELFYAML::CustomSection>
+ELFYAML::Opt::makeCustomSection(StringRef Name) const {
return nullptr;
}
@@ -1599,11 +1599,11 @@
void MappingTraits<std::unique_ptr<ELFYAML::Chunk>>::mapping(
IO &IO, std::unique_ptr<ELFYAML::Chunk> &Section) {
if (!IO.outputting()) {
- /// Prepare CustomRawContentSection by Name for ELFEmitter.
+ /// Prepare CustomSection by Name for ELFEmitter.
if (auto *Opt = dyn_cast<ELFYAML::Opt>(IO.Opt)) {
StringRef Name;
IO.mapOptional("Name", Name);
- if (auto S = Opt->makeCustomRawContentSection(Name)) {
+ if (auto S = Opt->makeCustomSection(Name)) {
commonSectionMapping(IO, *S);
S->sectionMapping(IO);
Section = std::move(S);
@@ -1761,7 +1761,7 @@
Section = std::make_unique<ELFYAML::RawContentSection>();
}
- if (auto S = dyn_cast<ELFYAML::CustomRawContentSection>(Section.get())) {
+ if (auto S = dyn_cast<ELFYAML::CustomSection>(Section.get())) {
commonSectionMapping(IO, *S);
S->sectionMapping(IO);
} else if (auto S = dyn_cast<ELFYAML::RawContentSection>(Section.get()))
diff --git a/llvm/tools/obj2yaml/elf2yaml.cpp b/llvm/tools/obj2yaml/elf2yaml.cpp
index d3fbe9c..8567de4 100644
--- a/llvm/tools/obj2yaml/elf2yaml.cpp
+++ b/llvm/tools/obj2yaml/elf2yaml.cpp
@@ -81,8 +81,7 @@
Expected<ELFYAML::RelrSection *> dumpRelrSection(const Elf_Shdr *Shdr);
Expected<ELFYAML::RawContentSection *>
dumpContentSection(const Elf_Shdr *Shdr);
- Expected<ELFYAML::CustomRawContentSection *>
- dumpCustomRawContentSection(const Elf_Shdr *Shdr);
+ Expected<ELFYAML::CustomSection *> dumpCustomSection(const Elf_Shdr *Shdr);
Expected<ELFYAML::SymtabShndxSection *>
dumpSymtabShndxSection(const Elf_Shdr *Shdr);
Expected<ELFYAML::NoBitsSection *> dumpNoBitsSection(const Elf_Shdr *Shdr);
@@ -662,7 +661,7 @@
if (!NameOrErr)
return NameOrErr.takeError();
- if (auto ResultOrErr = dumpCustomRawContentSection(&Sec)) {
+ if (auto ResultOrErr = dumpCustomSection(&Sec)) {
auto *Ptr = *ResultOrErr;
if (Ptr) {
if (Error E = Add(Ptr))
@@ -1672,14 +1671,14 @@
}
template <class ELFT>
-Expected<ELFYAML::CustomRawContentSection *>
-ELFDumper<ELFT>::dumpCustomRawContentSection(const Elf_Shdr *Shdr) {
+Expected<ELFYAML::CustomSection *>
+ELFDumper<ELFT>::dumpCustomSection(const Elf_Shdr *Shdr) {
Expected<StringRef> NameOrErr = getUniquedSectionName(*Shdr);
if (Error E = NameOrErr.takeError())
return nullptr;
auto Name = std::move(*NameOrErr);
- auto S = Opt.makeCustomRawContentSection(Name);
+ auto S = Opt.makeCustomSection(Name);
if (!S)
return nullptr;
