Skip to content

Commit 233ed51

Browse files
authored
[LLD][COFF][NFC] Use is64Bit in Baserel::getDefaultType. (#107378)
In preparation for ARM64EC support. Also make it static.
1 parent 0ba7818 commit 233ed51

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

lld/COFF/Chunks.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,16 +1000,7 @@ void BaserelChunk::writeTo(uint8_t *buf) const {
10001000
}
10011001

10021002
uint8_t Baserel::getDefaultType(llvm::COFF::MachineTypes machine) {
1003-
switch (machine) {
1004-
case AMD64:
1005-
case ARM64:
1006-
return IMAGE_REL_BASED_DIR64;
1007-
case I386:
1008-
case ARMNT:
1009-
return IMAGE_REL_BASED_HIGHLOW;
1010-
default:
1011-
llvm_unreachable("unknown machine type");
1012-
}
1003+
return is64Bit(machine) ? IMAGE_REL_BASED_DIR64 : IMAGE_REL_BASED_HIGHLOW;
10131004
}
10141005

10151006
MergeChunk::MergeChunk(uint32_t alignment)

lld/COFF/Chunks.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ class Baserel {
713713
Baserel(uint32_t v, uint8_t ty) : rva(v), type(ty) {}
714714
explicit Baserel(uint32_t v, llvm::COFF::MachineTypes machine)
715715
: Baserel(v, getDefaultType(machine)) {}
716-
uint8_t getDefaultType(llvm::COFF::MachineTypes machine);
716+
static uint8_t getDefaultType(llvm::COFF::MachineTypes machine);
717717

718718
uint32_t rva;
719719
uint8_t type;

0 commit comments

Comments
 (0)