From 457c8ebfd070eb7ee840ec97142f975974cfc834 Mon Sep 17 00:00:00 2001
From: Sean Silva <silvas@purdue.edu>
Date: Tue, 11 Jun 2013 00:13:52 +0000
Subject: [PATCH] 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
---
 include/llvm/Object/ELFYAML.h      |  8 ++++----
 lib/Object/ELFYAML.cpp             | 14 +++++++-------
 test/Object/Inputs/ELF/BE32.yaml   |  2 +-
 test/Object/Inputs/ELF/BE64.yaml   |  2 +-
 test/Object/Inputs/ELF/Header.yaml |  2 +-
 test/Object/Inputs/ELF/LE32.yaml   |  2 +-
 test/Object/Inputs/ELF/LE64.yaml   |  2 +-
 tools/yaml2obj/yaml2elf.cpp        |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/llvm/Object/ELFYAML.h b/include/llvm/Object/ELFYAML.h
index d0067caeeef..029a8ab2e5a 100644
--- 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 c4f3fc187ac..fcd4091fb7a 100644
--- 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 3709ff70cd3..2a18d6fca7c 100644
--- 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 d1c4401c0c0..091793f3952 100644
--- 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 085b12077d9..39f98147bee 100644
--- 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 a4f30fbb803..021fb0d93c2 100644
--- 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 cd0ca2545b9..2fefc0b0c98 100644
--- 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 d59594236f9..45ccb629e74 100644
--- 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;
-- 
2.34.1