[lld] Fix ILP32 ABI checks for bitcode files. #116537
Conversation
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
alexrp
force-pushed
the
lld-ilp32-checks
branch
from
36c92b8 to
711eccb
Compare
|
@llvm/pr-subscribers-lld Author: Alex Rønne Petersen (alexrp) ChangesPreviously, using LTO with the MIPS N32 ABI and (e.g.) There's probably still more work to be done for LTO to fully work for these ABIs, but this should hopefully be an uncontroversial step in the right direction. Note: I don't have commit access. Full diff: https://github.com/llvm/llvm-project/pull/116537.diff 3 Files Affected:
diff --git a/lld/ELF/Arch/MipsArchTree.cpp b/lld/ELF/Arch/MipsArchTree.cpp
index 0c64a46fe85d08..e7d3d591e3b27b 100644
--- a/lld/ELF/Arch/MipsArchTree.cpp
+++ b/lld/ELF/Arch/MipsArchTree.cpp
@@ -365,6 +365,8 @@ uint8_t elf::getMipsFpAbiFlag(Ctx &ctx, uint8_t oldFlag, uint8_t newFlag,
template <class ELFT> static bool isN32Abi(const InputFile &f) {
if (auto *ef = dyn_cast<ELFFileBase>(&f))
return ef->template getObj<ELFT>().getHeader().e_flags & EF_MIPS_ABI2;
+ if (auto *bc = dyn_cast<BitcodeFile>(&f))
+ return bc->triple.isABIN32();
return false;
}
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 769081fa71a449..d6f55603be6791 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -1636,9 +1636,10 @@ template <class ELFT> void SharedFile::parse() {
}
static ELFKind getBitcodeELFKind(const Triple &t) {
- if (t.isLittleEndian())
- return t.isArch64Bit() ? ELF64LEKind : ELF32LEKind;
- return t.isArch64Bit() ? ELF64BEKind : ELF32BEKind;
+ if (t.isArch64Bit() && !t.isABIN32() && !t.isX32() &&
+ t.getEnvironment() != Triple::GNUILP32)
+ return t.isLittleEndian() ? ELF64LEKind : ELF64BEKind;
+ return t.isLittleEndian() ? ELF32LEKind : ELF32BEKind;
}
static uint16_t getBitcodeMachineKind(Ctx &ctx, StringRef path,
@@ -1731,10 +1732,11 @@ BitcodeFile::BitcodeFile(Ctx &ctx, MemoryBufferRef mb, StringRef archiveName,
obj = CHECK(lto::InputFile::create(mbref), this);
- Triple t(obj->getTargetTriple());
- ekind = getBitcodeELFKind(t);
- emachine = getBitcodeMachineKind(ctx, mb.getBufferIdentifier(), t);
- osabi = getOsAbi(t);
+ this->triple = Triple(obj->getTargetTriple());
+
+ ekind = getBitcodeELFKind(this->triple);
+ emachine = getBitcodeMachineKind(ctx, mb.getBufferIdentifier(), this->triple);
+ osabi = getOsAbi(this->triple);
}
static uint8_t mapVisibility(GlobalValue::VisibilityTypes gvVisibility) {
diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h
index e00e2c83d017c2..33bc26cdf9e3a5 100644
--- a/lld/ELF/InputFiles.h
+++ b/lld/ELF/InputFiles.h
@@ -19,6 +19,7 @@
#include "llvm/Object/ELF.h"
#include "llvm/Support/MemoryBufferRef.h"
#include "llvm/Support/Threading.h"
+#include "llvm/TargetParser/Triple.h"
namespace llvm {
struct DILineInfo;
@@ -335,6 +336,8 @@ class BitcodeFile : public InputFile {
void postParse();
std::unique_ptr<llvm::lto::InputFile> obj;
std::vector<bool> keptComdats;
+
+ llvm::Triple triple;
};
// .so file.
|
|
@llvm/pr-subscribers-lld-elf Author: Alex Rønne Petersen (alexrp) ChangesPreviously, using LTO with the MIPS N32 ABI and (e.g.) There's probably still more work to be done for LTO to fully work for these ABIs, but this should hopefully be an uncontroversial step in the right direction. Note: I don't have commit access. Full diff: https://github.com/llvm/llvm-project/pull/116537.diff 3 Files Affected:
diff --git a/lld/ELF/Arch/MipsArchTree.cpp b/lld/ELF/Arch/MipsArchTree.cpp
index 0c64a46fe85d08..e7d3d591e3b27b 100644
--- a/lld/ELF/Arch/MipsArchTree.cpp
+++ b/lld/ELF/Arch/MipsArchTree.cpp
@@ -365,6 +365,8 @@ uint8_t elf::getMipsFpAbiFlag(Ctx &ctx, uint8_t oldFlag, uint8_t newFlag,
template <class ELFT> static bool isN32Abi(const InputFile &f) {
if (auto *ef = dyn_cast<ELFFileBase>(&f))
return ef->template getObj<ELFT>().getHeader().e_flags & EF_MIPS_ABI2;
+ if (auto *bc = dyn_cast<BitcodeFile>(&f))
+ return bc->triple.isABIN32();
return false;
}
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 769081fa71a449..d6f55603be6791 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -1636,9 +1636,10 @@ template <class ELFT> void SharedFile::parse() {
}
static ELFKind getBitcodeELFKind(const Triple &t) {
- if (t.isLittleEndian())
- return t.isArch64Bit() ? ELF64LEKind : ELF32LEKind;
- return t.isArch64Bit() ? ELF64BEKind : ELF32BEKind;
+ if (t.isArch64Bit() && !t.isABIN32() && !t.isX32() &&
+ t.getEnvironment() != Triple::GNUILP32)
+ return t.isLittleEndian() ? ELF64LEKind : ELF64BEKind;
+ return t.isLittleEndian() ? ELF32LEKind : ELF32BEKind;
}
static uint16_t getBitcodeMachineKind(Ctx &ctx, StringRef path,
@@ -1731,10 +1732,11 @@ BitcodeFile::BitcodeFile(Ctx &ctx, MemoryBufferRef mb, StringRef archiveName,
obj = CHECK(lto::InputFile::create(mbref), this);
- Triple t(obj->getTargetTriple());
- ekind = getBitcodeELFKind(t);
- emachine = getBitcodeMachineKind(ctx, mb.getBufferIdentifier(), t);
- osabi = getOsAbi(t);
+ this->triple = Triple(obj->getTargetTriple());
+
+ ekind = getBitcodeELFKind(this->triple);
+ emachine = getBitcodeMachineKind(ctx, mb.getBufferIdentifier(), this->triple);
+ osabi = getOsAbi(this->triple);
}
static uint8_t mapVisibility(GlobalValue::VisibilityTypes gvVisibility) {
diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h
index e00e2c83d017c2..33bc26cdf9e3a5 100644
--- a/lld/ELF/InputFiles.h
+++ b/lld/ELF/InputFiles.h
@@ -19,6 +19,7 @@
#include "llvm/Object/ELF.h"
#include "llvm/Support/MemoryBufferRef.h"
#include "llvm/Support/Threading.h"
+#include "llvm/TargetParser/Triple.h"
namespace llvm {
struct DILineInfo;
@@ -335,6 +336,8 @@ class BitcodeFile : public InputFile {
void postParse();
std::unique_ptr<llvm::lto::InputFile> obj;
std::vector<bool> keptComdats;
+
+ llvm::Triple triple;
};
// .so file.
|
alexrp
force-pushed
the
lld-ilp32-checks
branch
3 times, most recently
from
066b9c8 to
85cd568
Compare
Previously, using LTO with the MIPS N32 ABI and (e.g.) -m elf32btsmipn32 would fail because isN32Abi() made no effort to check whether a bitcode file is using the N32 ABI. Additionally, getBitcodeELFKind() would incorrectly pick 64-bit ELF for all ILP32 ABIs (not just N32).
alexrp
force-pushed
the
lld-ilp32-checks
branch
from
85cd568 to
59c50cf
Compare
|
ping |
| if (t.isLittleEndian()) | ||
| return t.isArch64Bit() ? ELF64LEKind : ELF32LEKind; | ||
| return t.isArch64Bit() ? ELF64BEKind : ELF32BEKind; | ||
| if (t.isArch64Bit() && !t.isABIN32() && !t.isX32() && |
There was a problem hiding this comment.
Can you add a test to cover every condition here? lld/ELF has very rigid test coverage requirement to ensure refactoring would not regress.
There was a problem hiding this comment.
Would you mind pointing me in the right direction for how the test should be done? I'm not as familiar with LLD's testing infrastructure as LLVM's.
There was a problem hiding this comment.
The tests are in lld/test/ELF. Many LTO tests are in lld/test/ELF/lto. Run them with ninja check-lld-elf.
lld/test/ELF/lto/aarch64.ll may be useful.
| @@ -337,6 +338,8 @@ class BitcodeFile : public InputFile { | |||
| void postParse(); | |||
| std::unique_ptr<llvm::lto::InputFile> obj; | |||
| std::vector<bool> keptComdats; | |||
|
|
|||
| llvm::Triple triple; | |||
There was a problem hiding this comment.
Instead of adding a Triple and an llvm/TargetParser include to this header file, you can compute and cache the getBitcodeELFKind value instead.
Previously, using LTO with the MIPS N32 ABI and (e.g.)
-m elf32btsmipn32would fail becauseisN32Abi()made no effort to check whether a bitcode file is using the N32 ABI. Additionally,getBitcodeELFKind()would incorrectly pick 64-bit ELF for all ILP32 ABIs (not just N32).There's probably still more work to be done for LTO to fully work for these ABIs, but this should hopefully be an uncontroversial step in the right direction.