[ELF] Make RelType a struct type

MaskRay · MaskRay · commit c1a6defd9ff1 · 2024-11-16T20:26:34.000-08:00
otherwise operator&lt;&lt;(const ELFSyncStream &amp;s, RelType type) applies to
non-reloc-type uint32_t, which can be confusing.
diff --git a/lld/ELF/Arch/AArch64.cpp b/lld/ELF/Arch/AArch64.cpp
@@ -213,7 +213,7 @@ RelExpr AArch64::getRelExpr(RelType type, const Symbol &s,
   case R_AARCH64_NONE:
     return R_NONE;
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
diff --git a/lld/ELF/Arch/AMDGPU.cpp b/lld/ELF/Arch/AMDGPU.cpp
@@ -193,7 +193,7 @@ RelExpr AMDGPU::getRelExpr(RelType type, const Symbol &s,
   case R_AMDGPU_GOTPCREL32_HI:
     return R_GOT_PC;
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
diff --git a/lld/ELF/Arch/ARM.cpp b/lld/ELF/Arch/ARM.cpp
@@ -195,7 +195,7 @@ RelExpr ARM::getRelExpr(RelType type, const Symbol &s,
     // not ARMv4 output, we can just ignore it.
     return R_NONE;
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
diff --git a/lld/ELF/Arch/AVR.cpp b/lld/ELF/Arch/AVR.cpp
@@ -93,7 +93,7 @@ RelExpr AVR::getRelExpr(RelType type, const Symbol &s,
   case R_AVR_13_PCREL:
     return R_PC;
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
diff --git a/lld/ELF/Arch/Hexagon.cpp b/lld/ELF/Arch/Hexagon.cpp
@@ -153,7 +153,7 @@ RelExpr Hexagon::getRelExpr(RelType type, const Symbol &s,
   case R_HEX_TPREL_LO16:
     return R_TPREL;
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
diff --git a/lld/ELF/Arch/LoongArch.cpp b/lld/ELF/Arch/LoongArch.cpp
@@ -527,7 +527,7 @@ RelExpr LoongArch::getRelExpr(const RelType type, const Symbol &s,
   //
   // [1]: https://web.archive.org/web/20230709064026/https://github.com/loongson/LoongArch-Documentation/issues/51
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
diff --git a/lld/ELF/Arch/Mips.cpp b/lld/ELF/Arch/Mips.cpp
@@ -78,7 +78,7 @@ RelExpr MIPS<ELFT>::getRelExpr(RelType type, const Symbol &s,
                                const uint8_t *loc) const {
   // See comment in the calculateMipsRelChain.
   if (ELFT::Is64Bits || ctx.arg.mipsN32Abi)
-    type &= 0xff;
+    type.v &= 0xff;
 
   switch (type) {
   case R_MIPS_JALR:
@@ -191,7 +191,7 @@ RelExpr MIPS<ELFT>::getRelExpr(RelType type, const Symbol &s,
   case R_MIPS_NONE:
     return R_NONE;
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
@@ -481,7 +481,7 @@ int64_t MIPS<ELFT>::getImplicitAddend(const uint8_t *buf, RelType type) const {
 }
 
 static std::pair<uint32_t, uint64_t>
-calculateMipsRelChain(Ctx &ctx, uint8_t *loc, RelType type, uint64_t val) {
+calculateMipsRelChain(Ctx &ctx, uint8_t *loc, uint32_t type, uint64_t val) {
   // MIPS N64 ABI packs multiple relocations into the single relocation
   // record. In general, all up to three relocations can have arbitrary
   // types. In fact, Clang and GCC uses only a few combinations. For now,
@@ -494,8 +494,8 @@ calculateMipsRelChain(Ctx &ctx, uint8_t *loc, RelType type, uint64_t val) {
   // relocations used to modify result of the first one: extend it to
   // 64-bit, extract high or low part etc. For details, see part 2.9 Relocation
   // at the https://dmz-portal.mips.com/mw/images/8/82/007-4658-001.pdf
-  RelType type2 = (type >> 8) & 0xff;
-  RelType type3 = (type >> 16) & 0xff;
+  uint32_t type2 = (type >> 8) & 0xff;
+  uint32_t type3 = (type >> 16) & 0xff;
   if (type2 == R_MIPS_NONE && type3 == R_MIPS_NONE)
     return std::make_pair(type, val);
   if (type2 == R_MIPS_64 && type3 == R_MIPS_NONE)
diff --git a/lld/ELF/Arch/PPC.cpp b/lld/ELF/Arch/PPC.cpp
@@ -269,7 +269,7 @@ RelExpr PPC::getRelExpr(RelType type, const Symbol &s,
   case R_PPC_TPREL16_HI:
     return R_TPREL;
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
diff --git a/lld/ELF/Arch/PPC64.cpp b/lld/ELF/Arch/PPC64.cpp
@@ -644,7 +644,7 @@ uint32_t PPC64::calcEFlags() const {
     if (flag == 1)
       ErrAlways(ctx) << f << ": ABI version 1 is not supported";
     else if (flag > 2)
-      ErrAlways(ctx) << f << ": unrecognized e_flags: " << Twine(flag);
+      ErrAlways(ctx) << f << ": unrecognized e_flags: " << flag;
   }
   return 2;
 }
@@ -1100,7 +1100,7 @@ RelExpr PPC64::getRelExpr(RelType type, const Symbol &s,
   case R_PPC64_TLS:
     return R_TLSIE_HINT;
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
diff --git a/lld/ELF/Arch/RISCV.cpp b/lld/ELF/Arch/RISCV.cpp
@@ -324,7 +324,7 @@ RelExpr RISCV::getRelExpr(const RelType type, const Symbol &s,
   case R_RISCV_SUB_ULEB128:
     return R_RISCV_LEB128;
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
diff --git a/lld/ELF/Arch/SPARCV9.cpp b/lld/ELF/Arch/SPARCV9.cpp
@@ -78,7 +78,7 @@ RelExpr SPARCV9::getRelExpr(RelType type, const Symbol &s,
   case R_SPARC_TLS_LE_LOX10:
     return R_TPREL;
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
diff --git a/lld/ELF/Arch/SystemZ.cpp b/lld/ELF/Arch/SystemZ.cpp
@@ -170,7 +170,7 @@ RelExpr SystemZ::getRelExpr(RelType type, const Symbol &s,
     return R_GOT_PC;
 
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
diff --git a/lld/ELF/Arch/X86.cpp b/lld/ELF/Arch/X86.cpp
@@ -151,7 +151,7 @@ RelExpr X86::getRelExpr(RelType type, const Symbol &s,
   case R_386_NONE:
     return R_NONE;
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
diff --git a/lld/ELF/Arch/X86_64.cpp b/lld/ELF/Arch/X86_64.cpp
@@ -407,7 +407,7 @@ RelExpr X86_64::getRelExpr(RelType type, const Symbol &s,
   case R_X86_64_NONE:
     return R_NONE;
   default:
-    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)
+    Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
     return R_NONE;
   }
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
@@ -1042,8 +1042,8 @@ InputSectionBase *ObjFile<ELFT>::getRelocTarget(uint32_t idx, uint32_t info) {
       return target;
   }
 
-  ErrAlways(ctx) << this << Twine(": relocation section (index ") << Twine(idx)
-                 << ") has invalid sh_info (" << Twine(info) << ")";
+  ErrAlways(ctx) << this << Twine(": relocation section (index ") << idx
+                 << ") has invalid sh_info (" << info << ')';
   return nullptr;
 }
 
@@ -1211,9 +1211,8 @@ void ObjFile<ELFT>::initSectionsAndLocalSyms(bool ignoreComdats) {
     if (LLVM_UNLIKELY(secIdx >= sections.size()))
       Fatal(ctx) << this << ": invalid section index: " << Twine(secIdx);
     if (LLVM_UNLIKELY(eSym.getBinding() != STB_LOCAL))
-      ErrAlways(ctx) << this << ": non-local symbol (" << Twine(i)
-                     << ") found at index < .symtab's sh_info (" << Twine(end)
-                     << ")";
+      ErrAlways(ctx) << this << ": non-local symbol (" << i
+                     << ") found at index < .symtab's sh_info (" << end << ")";
 
     InputSectionBase *sec = sections[secIdx];
     uint8_t type = eSym.getType();
@@ -1247,8 +1246,8 @@ template <class ELFT> void ObjFile<ELFT>::postParse() {
     uint8_t binding = eSym.getBinding();
     if (LLVM_UNLIKELY(binding != STB_GLOBAL && binding != STB_WEAK &&
                       binding != STB_GNU_UNIQUE))
-      Err(ctx) << this << ": symbol (" << Twine(i)
-               << ") has invalid binding: " << Twine((int)binding);
+      Err(ctx) << this << ": symbol (" << i
+               << ") has invalid binding: " << (int)binding;
 
     // st_value of STT_TLS represents the assigned offset, not the actual
     // address which is used by STT_FUNC and STT_OBJECT. STT_TLS symbols can
diff --git a/lld/ELF/OutputSections.cpp b/lld/ELF/OutputSections.cpp
@@ -315,7 +315,7 @@ static SmallVector<uint8_t, 0> deflateShard(Ctx &ctx, ArrayRef<uint8_t> in,
   z_stream s = {};
   auto res = deflateInit2(&s, level, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY);
   if (res != 0) {
-    Err(ctx) << "--compress-sections: deflateInit2 returned " << Twine(res);
+    Err(ctx) << "--compress-sections: deflateInit2 returned " << res;
     return {};
   }
   s.next_in = const_cast<uint8_t *>(in.data());
diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp
@@ -502,7 +502,7 @@ int64_t RelocationScanner::computeMipsAddend(const RelTy &rel, RelExpr expr,
     return 0;
 
   RelType type = rel.getType(ctx.arg.isMips64EL);
-  uint32_t pairTy = getMipsPairType(type, isLocal);
+  RelType pairTy = getMipsPairType(type, isLocal);
   if (pairTy == R_MIPS_NONE)
     return 0;
 
@@ -843,7 +843,7 @@ static bool maybeReportUndefined(Ctx &ctx, Undefined &sym,
 // theirs types into the single bit-set.
 template <class RelTy>
 RelType RelocationScanner::getMipsN32RelType(RelTy *&rel) const {
-  RelType type = 0;
+  uint32_t type = 0;
   uint64_t offset = rel->r_offset;
 
   int n = 0;
diff --git a/lld/ELF/Relocations.h b/lld/ELF/Relocations.h
@@ -25,7 +25,12 @@ class OutputSection;
 class SectionBase;
 
 // Represents a relocation type, such as R_X86_64_PC32 or R_ARM_THM_CALL.
-using RelType = uint32_t;
+struct RelType {
+  uint32_t v = 0;
+  /*implicit*/ constexpr RelType(uint32_t v = 0) : v(v) {}
+  /*implicit*/ operator uint32_t() const { return v; }
+};
+
 using JumpModType = uint32_t;
 
 // List of target-independent relocation types. Relocations read

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ RelExpr AArch64::getRelExpr(RelType type, const Symbol &s,`
`213`	`213`	`case R_AARCH64_NONE:`
`214`	`214`	`return R_NONE;`
`215`	`215`	`default:`
`216`		`- Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)`
	`216`	`+ Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v`
`217`	`217`	`<< ") against symbol " << &s;`
`218`	`218`	`return R_NONE;`
`219`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ RelExpr AMDGPU::getRelExpr(RelType type, const Symbol &s,`
`193`	`193`	`case R_AMDGPU_GOTPCREL32_HI:`
`194`	`194`	`return R_GOT_PC;`
`195`	`195`	`default:`
`196`		`- Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)`
	`196`	`+ Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v`
`197`	`197`	`<< ") against symbol " << &s;`
`198`	`198`	`return R_NONE;`
`199`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ RelExpr ARM::getRelExpr(RelType type, const Symbol &s,`
`195`	`195`	`// not ARMv4 output, we can just ignore it.`
`196`	`196`	`return R_NONE;`
`197`	`197`	`default:`
`198`		`- Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)`
	`198`	`+ Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v`
`199`	`199`	`<< ") against symbol " << &s;`
`200`	`200`	`return R_NONE;`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ RelExpr AVR::getRelExpr(RelType type, const Symbol &s,`
`93`	`93`	`case R_AVR_13_PCREL:`
`94`	`94`	`return R_PC;`
`95`	`95`	`default:`
`96`		`- Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)`
	`96`	`+ Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v`
`97`	`97`	`<< ") against symbol " << &s;`
`98`	`98`	`return R_NONE;`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ RelExpr Hexagon::getRelExpr(RelType type, const Symbol &s,`
`153`	`153`	`case R_HEX_TPREL_LO16:`
`154`	`154`	`return R_TPREL;`
`155`	`155`	`default:`
`156`		`- Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)`
	`156`	`+ Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v`
`157`	`157`	`<< ") against symbol " << &s;`
`158`	`158`	`return R_NONE;`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ RelExpr LoongArch::getRelExpr(const RelType type, const Symbol &s,`
`527`	`527`	`//`
`528`	`528`	`// [1]: https://web.archive.org/web/20230709064026/https://github.com/loongson/LoongArch-Documentation/issues/51`
`529`	`529`	`default:`
`530`		`- Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)`
	`530`	`+ Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v`
`531`	`531`	`<< ") against symbol " << &s;`
`532`	`532`	`return R_NONE;`
`533`	`533`	`}`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ RelExpr PPC::getRelExpr(RelType type, const Symbol &s,`
`269`	`269`	`case R_PPC_TPREL16_HI:`
`270`	`270`	`return R_TPREL;`
`271`	`271`	`default:`
`272`		`- Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)`
	`272`	`+ Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v`
`273`	`273`	`<< ") against symbol " << &s;`
`274`	`274`	`return R_NONE;`
`275`	`275`	`}`
Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,7 @@ uint32_t PPC64::calcEFlags() const {`
`644`	`644`	`if (flag == 1)`
`645`	`645`	`ErrAlways(ctx) << f << ": ABI version 1 is not supported";`
`646`	`646`	`else if (flag > 2)`
`647`		`- ErrAlways(ctx) << f << ": unrecognized e_flags: " << Twine(flag);`
	`647`	`+ ErrAlways(ctx) << f << ": unrecognized e_flags: " << flag;`
`648`	`648`	`}`
`649`	`649`	`return 2;`
`650`	`650`	`}`
`@@ -1100,7 +1100,7 @@ RelExpr PPC64::getRelExpr(RelType type, const Symbol &s,`
`1100`	`1100`	`case R_PPC64_TLS:`
`1101`	`1101`	`return R_TLSIE_HINT;`
`1102`	`1102`	`default:`
`1103`		`- Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)`
	`1103`	`+ Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v`
`1104`	`1104`	`<< ") against symbol " << &s;`
`1105`	`1105`	`return R_NONE;`
`1106`	`1106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ RelExpr RISCV::getRelExpr(const RelType type, const Symbol &s,`
`324`	`324`	`case R_RISCV_SUB_ULEB128:`
`325`	`325`	`return R_RISCV_LEB128;`
`326`	`326`	`default:`
`327`		`- Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << Twine(type)`
	`327`	`+ Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v`
`328`	`328`	`<< ") against symbol " << &s;`
`329`	`329`	`return R_NONE;`
`330`	`330`	`}`