Use asserts for checks that should never fail.

If a section is not SHT_REL or SHT_RELA, we never create a valid iterator,
so the getRelocation* methods should always see a section with the correct type.

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

diff --git a/include/llvm/Object/ELFObjectFile.h b/include/llvm/Object/ELFObjectFile.h
index 9c82fa8486b961b950800c5532659740d8f78d2a..39c504848e770fd7b8f93efed2503353173b9eff 100644 (file)
--- a/include/llvm/Object/ELFObjectFile.h
+++ b/include/llvm/Object/ELFObjectFile.h
@@ -637,18 +637,10 @@ symbol_iterator
 ELFObjectFile<ELFT>::getRelocationSymbol(DataRefImpl Rel) const {
   uint32_t symbolIdx;
   const Elf_Shdr *sec = getRelSection(Rel);
 ELFObjectFile<ELFT>::getRelocationSymbol(DataRefImpl Rel) const {
   uint32_t symbolIdx;
   const Elf_Shdr *sec = getRelSection(Rel);

-  switch (sec->sh_type) {
-  default:
-    report_fatal_error("Invalid section type in Rel!");
-  case ELF::SHT_REL: {
+  if (sec->sh_type == ELF::SHT_REL)

     symbolIdx = getRel(Rel)->getSymbol(EF.isMips64EL());
     symbolIdx = getRel(Rel)->getSymbol(EF.isMips64EL());

-    break;
-  }
-  case ELF::SHT_RELA: {
+  else

     symbolIdx = getRela(Rel)->getSymbol(EF.isMips64EL());
     symbolIdx = getRela(Rel)->getSymbol(EF.isMips64EL());

-    break;
-  }
-  }

   if (!symbolIdx)
     return symbol_end();
 
   if (!symbolIdx)
     return symbol_end();
 


@@ -697,32 +689,20 @@ uint64_t ELFObjectFile<ELFT>::getRelocationOffset(DataRefImpl Rel) const {
 template <class ELFT>
 uint64_t ELFObjectFile<ELFT>::getROffset(DataRefImpl Rel) const {
   const Elf_Shdr *sec = getRelSection(Rel);
 template <class ELFT>
 uint64_t ELFObjectFile<ELFT>::getROffset(DataRefImpl Rel) const {
   const Elf_Shdr *sec = getRelSection(Rel);

-  switch (sec->sh_type) {
-  default:
-    report_fatal_error("Invalid section type in Rel!");
-  case ELF::SHT_REL:
+  if (sec->sh_type == ELF::SHT_REL)

     return getRel(Rel)->r_offset;
     return getRel(Rel)->r_offset;

-  case ELF::SHT_RELA:
-    return getRela(Rel)->r_offset;
-  }
+
+  return getRela(Rel)->r_offset;

 }
 
 template <class ELFT>
 std::error_code ELFObjectFile<ELFT>::getRelocationType(DataRefImpl Rel,
                                                        uint64_t &Result) const {
   const Elf_Shdr *sec = getRelSection(Rel);
 }
 
 template <class ELFT>
 std::error_code ELFObjectFile<ELFT>::getRelocationType(DataRefImpl Rel,
                                                        uint64_t &Result) const {
   const Elf_Shdr *sec = getRelSection(Rel);

-  switch (sec->sh_type) {
-  default:
-    report_fatal_error("Invalid section type in Rel!");
-  case ELF::SHT_REL: {
+  if (sec->sh_type == ELF::SHT_REL)

     Result = getRel(Rel)->getType(EF.isMips64EL());
     Result = getRel(Rel)->getType(EF.isMips64EL());

-    break;
-  }
-  case ELF::SHT_RELA: {
+  else

     Result = getRela(Rel)->getType(EF.isMips64EL());
     Result = getRela(Rel)->getType(EF.isMips64EL());

-    break;
-  }
-  }

   return std::error_code();
 }
 
   return std::error_code();
 }
 


@@ -736,18 +716,10 @@ std::error_code ELFObjectFile<ELFT>::getRelocationTypeName(
     DataRefImpl Rel, SmallVectorImpl<char> &Result) const {
   const Elf_Shdr *sec = getRelSection(Rel);
   uint32_t type;
     DataRefImpl Rel, SmallVectorImpl<char> &Result) const {
   const Elf_Shdr *sec = getRelSection(Rel);
   uint32_t type;

-  switch (sec->sh_type) {
-  default:
-    return object_error::parse_failed;
-  case ELF::SHT_REL: {
+  if (sec->sh_type == ELF::SHT_REL)

     type = getRel(Rel)->getType(EF.isMips64EL());
     type = getRel(Rel)->getType(EF.isMips64EL());

-    break;
-  }
-  case ELF::SHT_RELA: {
+  else

     type = getRela(Rel)->getType(EF.isMips64EL());
     type = getRela(Rel)->getType(EF.isMips64EL());

-    break;
-  }
-  }

 
   EF.getRelocationTypeName(type, Result);
   return std::error_code();
 
   EF.getRelocationTypeName(type, Result);
   return std::error_code();


@@ -775,12 +747,14 @@ ELFObjectFile<ELFT>::getSymbol(DataRefImpl Symb) const {
 template <class ELFT>
 const typename ELFObjectFile<ELFT>::Elf_Rel *
 ELFObjectFile<ELFT>::getRel(DataRefImpl Rel) const {
 template <class ELFT>
 const typename ELFObjectFile<ELFT>::Elf_Rel *
 ELFObjectFile<ELFT>::getRel(DataRefImpl Rel) const {

+  assert(getRelSection(Rel)->sh_type == ELF::SHT_REL);

   return EF.template getEntry<Elf_Rel>(Rel.d.a, Rel.d.b);
 }
 
 template <class ELFT>
 const typename ELFObjectFile<ELFT>::Elf_Rela *
 ELFObjectFile<ELFT>::getRela(DataRefImpl Rela) const {
   return EF.template getEntry<Elf_Rel>(Rel.d.a, Rel.d.b);
 }
 
 template <class ELFT>
 const typename ELFObjectFile<ELFT>::Elf_Rela *
 ELFObjectFile<ELFT>::getRela(DataRefImpl Rela) const {

+  assert(getRelSection(Rela)->sh_type == ELF::SHT_RELA);

   return EF.template getEntry<Elf_Rela>(Rela.d.a, Rela.d.b);
 }
 
   return EF.template getEntry<Elf_Rela>(Rela.d.a, Rela.d.b);
 }