Fix dubious type name similar to member name.

Should bring bots back to life.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183715 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Object/ELFYAML.h b/include/llvm/Object/ELFYAML.h
index d0067caeeeff695e57aaac5b6ddbdefc968be5e3..029a8ab2e5a3c3626a357f67338f1f6f0ba18bff 100644 (file)
--- a/include/llvm/Object/ELFYAML.h
+++ b/include/llvm/Object/ELFYAML.h
@@ -39,7 +39,7 @@ LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_ELFDATA)
 
 // For now, hardcode 64 bits everywhere that 32 or 64 would be needed
 // since 64-bit can hold 32-bit values too.
-struct Header {
+struct FileHeader {
   ELF_ELFCLASS Class;
   ELF_ELFDATA Data;
   ELF_ET Type;
@@ -47,7 +47,7 @@ struct Header {
   llvm::yaml::Hex64 Entry;
 };
 struct Object {
-  Header Header;
+  FileHeader Header;
 };
 
 } // end namespace ELFYAML
@@ -77,8 +77,8 @@ struct ScalarEnumerationTraits<ELFYAML::ELF_ELFDATA> {
 };
 
 template <>
-struct MappingTraits<ELFYAML::Header> {
-  static void mapping(IO &IO, ELFYAML::Header &Header);
+struct MappingTraits<ELFYAML::FileHeader> {
+  static void mapping(IO &IO, ELFYAML::FileHeader &FileHdr);
 };
 
 template <>

diff --git a/lib/Object/ELFYAML.cpp b/lib/Object/ELFYAML.cpp
index c4f3fc187ac0298de82b4fd40ae8644487b0d6d2..fcd4091fb7a9707147be9cd9827789491e05f365 100644 (file)
--- a/lib/Object/ELFYAML.cpp
+++ b/lib/Object/ELFYAML.cpp
@@ -212,16 +212,16 @@ void ScalarEnumerationTraits<ELFYAML::ELF_ELFDATA>::enumeration(
 #undef ECase
 }
 
-void MappingTraits<ELFYAML::Header>::mapping(IO &IO, ELFYAML::Header &Header) {
-  IO.mapRequired("Class", Header.Class);
-  IO.mapRequired("Data", Header.Data);
-  IO.mapRequired("Type", Header.Type);
-  IO.mapRequired("Machine", Header.Machine);
-  IO.mapOptional("Entry", Header.Entry, Hex64(0));
+void MappingTraits<ELFYAML::FileHeader>::mapping(IO &IO, ELFYAML::FileHeader &FileHdr) {
+  IO.mapRequired("Class", FileHdr.Class);
+  IO.mapRequired("Data", FileHdr.Data);
+  IO.mapRequired("Type", FileHdr.Type);
+  IO.mapRequired("Machine", FileHdr.Machine);
+  IO.mapOptional("Entry", FileHdr.Entry, Hex64(0));
 }
 
 void MappingTraits<ELFYAML::Object>::mapping(IO &IO, ELFYAML::Object &Object) {
-  IO.mapRequired("Header", Object.Header);
+  IO.mapRequired("FileHeader", Object.Header);
 }
 
 } // end namespace yaml

diff --git a/test/Object/Inputs/ELF/BE32.yaml b/test/Object/Inputs/ELF/BE32.yaml
index 3709ff70cd3c512aca51212d834edfea0112a5f2..2a18d6fca7cb414aa80a2c3c53d516d0e0005321 100644 (file)
--- a/test/Object/Inputs/ELF/BE32.yaml
+++ b/test/Object/Inputs/ELF/BE32.yaml
@@ -1,5 +1,5 @@
 !ELF
-Header: !Header
+FileHeader: !FileHeader
   Class: ELFCLASS32
   Data: ELFDATA2MSB
   Type: ET_EXEC

diff --git a/test/Object/Inputs/ELF/BE64.yaml b/test/Object/Inputs/ELF/BE64.yaml
index d1c4401c0c0fd749fc1b49b225f88205c10feb87..091793f395293b5d9ccadc9594bba539337d91d8 100644 (file)
--- a/test/Object/Inputs/ELF/BE64.yaml
+++ b/test/Object/Inputs/ELF/BE64.yaml
@@ -1,5 +1,5 @@
 !ELF
-Header: !Header
+FileHeader: !FileHeader
   Class: ELFCLASS64
   Data: ELFDATA2MSB
   Type: ET_EXEC

diff --git a/test/Object/Inputs/ELF/Header.yaml b/test/Object/Inputs/ELF/Header.yaml
index 085b12077d941ee728cdf34fe9cabf2dfa043c31..39f98147bee3e08b44bf628e594fff47745992e8 100644 (file)
--- a/test/Object/Inputs/ELF/Header.yaml
+++ b/test/Object/Inputs/ELF/Header.yaml
@@ -1,5 +1,5 @@
 !ELF
-Header: !Header
+FileHeader: !FileHeader
   Class: ELFCLASS64
   Data: ELFDATA2LSB
   Type: ET_EXEC

diff --git a/test/Object/Inputs/ELF/LE32.yaml b/test/Object/Inputs/ELF/LE32.yaml
index a4f30fbb803487d96badbc143fe34758b2f38744..021fb0d93c2e84362ab51d6f9f25123b2b3aab5d 100644 (file)
--- a/test/Object/Inputs/ELF/LE32.yaml
+++ b/test/Object/Inputs/ELF/LE32.yaml
@@ -1,5 +1,5 @@
 !ELF
-Header: !Header
+FileHeader: !FileHeader
   Class: ELFCLASS32
   Data: ELFDATA2LSB
   Type: ET_EXEC

diff --git a/test/Object/Inputs/ELF/LE64.yaml b/test/Object/Inputs/ELF/LE64.yaml
index cd0ca2545b9c9c79f823ce7f2434fc890c102415..2fefc0b0c98f33b221a34f7ba0d02b64e6d269aa 100644 (file)
--- a/test/Object/Inputs/ELF/LE64.yaml
+++ b/test/Object/Inputs/ELF/LE64.yaml
@@ -1,5 +1,5 @@
 !ELF
-Header: !Header
+FileHeader: !FileHeader
   Class: ELFCLASS64
   Data: ELFDATA2LSB
   Type: ET_EXEC

diff --git a/tools/yaml2obj/yaml2elf.cpp b/tools/yaml2obj/yaml2elf.cpp
index d59594236f9386ac3e66a8c9d675cd42e84607f5..45ccb629e7473f19b56f7c0bdefed91df35cd43f 100644 (file)
--- a/tools/yaml2obj/yaml2elf.cpp
+++ b/tools/yaml2obj/yaml2elf.cpp
@@ -24,7 +24,7 @@ using namespace llvm;
 
 template <class ELFT>
 static void writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) {
-  const ELFYAML::Header &Hdr = Doc.Header;
+  const ELFYAML::FileHeader &Hdr = Doc.Header;
   using namespace llvm::ELF;
   using namespace llvm::object;
   typename ELFObjectFile<ELFT>::Elf_Ehdr Header;