[llvm] 348d0a6 - [JITLink] Add target features to LinkGraph
Job Noorman via llvm-commits
llvm-commits at lists.llvm.org
Wed May 17 02:35:36 PDT 2023
Author: Job Noorman
Date: 2023-05-17T11:35:19+02:00
New Revision: 348d0a6bf66be8816c26a387c0a023225afe6e34
URL: https://github.com/llvm/llvm-project/commit/348d0a6bf66be8816c26a387c0a023225afe6e34
DIFF: https://github.com/llvm/llvm-project/commit/348d0a6bf66be8816c26a387c0a023225afe6e34.diff
LOG: [JITLink] Add target features to LinkGraph
This patch adds SubtargetFeatures to LinkGraph. Similar to Triple, some
targets might use this information while linking.
One example, and the reason this patch was written, is linker relaxation
on RISC-V: different relaxations are possible depending on if the C
extension is enabled.
Note that the features are stored as `std::vector<std::string>` to prevent a
public dependency on MC. There is still a private dependency to be able to
convert SubtargetFeatures to a vector.
Reviewed By: lhames
Differential Revision: https://reviews.llvm.org/D149522
Added:
Modified:
llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h
llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.cpp
llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.h
llvm/lib/ExecutionEngine/JITLink/COFF_x86_64.cpp
llvm/lib/ExecutionEngine/JITLink/ELFLinkGraphBuilder.h
llvm/lib/ExecutionEngine/JITLink/ELF_aarch32.cpp
llvm/lib/ExecutionEngine/JITLink/ELF_aarch64.cpp
llvm/lib/ExecutionEngine/JITLink/ELF_i386.cpp
llvm/lib/ExecutionEngine/JITLink/ELF_loongarch.cpp
llvm/lib/ExecutionEngine/JITLink/ELF_riscv.cpp
llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp
llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp
llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.h
llvm/lib/ExecutionEngine/JITLink/MachO_arm64.cpp
llvm/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h b/llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h
index e7787197e3e3f..a9c47d94496c2 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h
@@ -984,11 +984,20 @@ class LinkGraph {
using GetEdgeKindNameFunction = const char *(*)(Edge::Kind);
+ using FeatureVector = std::vector<std::string>;
+
+ LinkGraph(std::string Name, const Triple &TT, FeatureVector Features,
+ unsigned PointerSize, support::endianness Endianness,
+ GetEdgeKindNameFunction GetEdgeKindName)
+ : Name(std::move(Name)), TT(TT), Features(std::move(Features)),
+ PointerSize(PointerSize), Endianness(Endianness),
+ GetEdgeKindName(std::move(GetEdgeKindName)) {}
+
LinkGraph(std::string Name, const Triple &TT, unsigned PointerSize,
support::endianness Endianness,
GetEdgeKindNameFunction GetEdgeKindName)
- : Name(std::move(Name)), TT(TT), PointerSize(PointerSize),
- Endianness(Endianness), GetEdgeKindName(std::move(GetEdgeKindName)) {}
+ : LinkGraph(std::move(Name), TT, FeatureVector(), PointerSize, Endianness,
+ GetEdgeKindName) {}
LinkGraph(const LinkGraph &) = delete;
LinkGraph &operator=(const LinkGraph &) = delete;
@@ -1002,6 +1011,9 @@ class LinkGraph {
/// Returns the target triple for this Graph.
const Triple &getTargetTriple() const { return TT; }
+ /// Return the subtarget features for this Graph.
+ const FeatureVector &getFeatures() const { return Features; }
+
/// Returns the pointer size for use in this graph.
unsigned getPointerSize() const { return PointerSize; }
@@ -1507,6 +1519,7 @@ class LinkGraph {
std::string Name;
Triple TT;
+ FeatureVector Features;
unsigned PointerSize;
support::endianness Endianness;
GetEdgeKindNameFunction GetEdgeKindName = nullptr;
diff --git a/llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt b/llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
index bc86f45d3c185..5f8d2c51d91b8 100644
--- a/llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
@@ -50,6 +50,7 @@ add_llvm_component_library(LLVMJITLink
LINK_COMPONENTS
BinaryFormat
+ MC
Object
Option
OrcTargetProcess
diff --git a/llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.cpp b/llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.cpp
index fe6252f9aa1f9..5aee66094dca6 100644
--- a/llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.cpp
@@ -25,12 +25,12 @@ static Triple createTripleWithCOFFFormat(Triple T) {
COFFLinkGraphBuilder::COFFLinkGraphBuilder(
const object::COFFObjectFile &Obj, Triple TT,
+ LinkGraph::FeatureVector Features,
LinkGraph::GetEdgeKindNameFunction GetEdgeKindName)
- : Obj(Obj),
- G(std::make_unique<LinkGraph>(Obj.getFileName().str(),
- createTripleWithCOFFFormat(TT),
- getPointerSize(Obj), getEndianness(Obj),
- std::move(GetEdgeKindName))) {
+ : Obj(Obj), G(std::make_unique<LinkGraph>(
+ Obj.getFileName().str(), createTripleWithCOFFFormat(TT),
+ std::move(Features), getPointerSize(Obj),
+ getEndianness(Obj), std::move(GetEdgeKindName))) {
LLVM_DEBUG({
dbgs() << "Created COFFLinkGraphBuilder for \"" << Obj.getFileName()
<< "\"\n";
diff --git a/llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.h b/llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.h
index 0c0a1a536deb0..d7812a3963ac3 100644
--- a/llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.h
+++ b/llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.h
@@ -39,6 +39,7 @@ class COFFLinkGraphBuilder {
using COFFSymbolIndex = int32_t;
COFFLinkGraphBuilder(const object::COFFObjectFile &Obj, Triple TT,
+ LinkGraph::FeatureVector Features,
LinkGraph::GetEdgeKindNameFunction GetEdgeKindName);
LinkGraph &getGraph() const { return *G; }
diff --git a/llvm/lib/ExecutionEngine/JITLink/COFF_x86_64.cpp b/llvm/lib/ExecutionEngine/JITLink/COFF_x86_64.cpp
index b74164e4228a9..b957d21a086c7 100644
--- a/llvm/lib/ExecutionEngine/JITLink/COFF_x86_64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/COFF_x86_64.cpp
@@ -181,8 +181,10 @@ class COFFLinkGraphBuilder_x86_64 : public COFFLinkGraphBuilder {
}
public:
- COFFLinkGraphBuilder_x86_64(const object::COFFObjectFile &Obj, const Triple T)
- : COFFLinkGraphBuilder(Obj, std::move(T), getCOFFX86RelocationKindName) {}
+ COFFLinkGraphBuilder_x86_64(const object::COFFObjectFile &Obj, const Triple T,
+ const LinkGraph::FeatureVector Features)
+ : COFFLinkGraphBuilder(Obj, std::move(T), std::move(Features),
+ getCOFFX86RelocationKindName) {}
};
class COFFLinkGraphLowering_x86_64 {
@@ -314,7 +316,12 @@ createLinkGraphFromCOFFObject_x86_64(MemoryBufferRef ObjectBuffer) {
if (!COFFObj)
return COFFObj.takeError();
- return COFFLinkGraphBuilder_x86_64(**COFFObj, (*COFFObj)->makeTriple())
+ auto Features = (*COFFObj)->getFeatures();
+ if (!Features)
+ return Features.takeError();
+
+ return COFFLinkGraphBuilder_x86_64(**COFFObj, (*COFFObj)->makeTriple(),
+ Features->getFeatures())
.buildGraph();
}
diff --git a/llvm/lib/ExecutionEngine/JITLink/ELFLinkGraphBuilder.h b/llvm/lib/ExecutionEngine/JITLink/ELFLinkGraphBuilder.h
index 2fa4162f89b79..e1c1d498f5aed 100644
--- a/llvm/lib/ExecutionEngine/JITLink/ELFLinkGraphBuilder.h
+++ b/llvm/lib/ExecutionEngine/JITLink/ELFLinkGraphBuilder.h
@@ -59,7 +59,7 @@ class ELFLinkGraphBuilder : public ELFLinkGraphBuilderBase {
public:
ELFLinkGraphBuilder(const object::ELFFile<ELFT> &Obj, Triple TT,
- StringRef FileName,
+ LinkGraph::FeatureVector Features, StringRef FileName,
LinkGraph::GetEdgeKindNameFunction GetEdgeKindName);
/// Debug sections are included in the graph by default. Use
@@ -195,11 +195,11 @@ class ELFLinkGraphBuilder : public ELFLinkGraphBuilderBase {
template <typename ELFT>
ELFLinkGraphBuilder<ELFT>::ELFLinkGraphBuilder(
- const ELFFile &Obj, Triple TT, StringRef FileName,
- LinkGraph::GetEdgeKindNameFunction GetEdgeKindName)
+ const ELFFile &Obj, Triple TT, LinkGraph::FeatureVector Features,
+ StringRef FileName, LinkGraph::GetEdgeKindNameFunction GetEdgeKindName)
: ELFLinkGraphBuilderBase(std::make_unique<LinkGraph>(
- FileName.str(), Triple(std::move(TT)), ELFT::Is64Bits ? 8 : 4,
- support::endianness(ELFT::TargetEndianness),
+ FileName.str(), Triple(std::move(TT)), std::move(Features),
+ ELFT::Is64Bits ? 8 : 4, support::endianness(ELFT::TargetEndianness),
std::move(GetEdgeKindName))),
Obj(Obj) {
LLVM_DEBUG(
diff --git a/llvm/lib/ExecutionEngine/JITLink/ELF_aarch32.cpp b/llvm/lib/ExecutionEngine/JITLink/ELF_aarch32.cpp
index 570e4dc95c036..872f192633d31 100644
--- a/llvm/lib/ExecutionEngine/JITLink/ELF_aarch32.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/ELF_aarch32.cpp
@@ -191,9 +191,10 @@ class ELFLinkGraphBuilder_aarch32
public:
ELFLinkGraphBuilder_aarch32(StringRef FileName,
const llvm::object::ELFFile<ELFT> &Obj, Triple TT,
+ LinkGraph::FeatureVector Features,
aarch32::ArmConfig ArmCfg)
- : ELFLinkGraphBuilder<ELFT>(Obj, std::move(TT), FileName,
- getELFAArch32EdgeKindName),
+ : ELFLinkGraphBuilder<ELFT>(Obj, std::move(TT), std::move(Features),
+ FileName, getELFAArch32EdgeKindName),
ArmCfg(std::move(ArmCfg)) {}
};
@@ -217,6 +218,10 @@ createLinkGraphFromELFObject_aarch32(MemoryBufferRef ObjectBuffer) {
if (!ELFObj)
return ELFObj.takeError();
+ auto Features = (*ELFObj)->getFeatures();
+ if (!Features)
+ return Features.takeError();
+
// Find out what exact AArch32 instruction set and features we target.
auto TT = (*ELFObj)->makeTriple();
ARM::ArchKind AK = ARM::parseArch(TT.getArchName());
@@ -249,14 +254,16 @@ createLinkGraphFromELFObject_aarch32(MemoryBufferRef ObjectBuffer) {
case Triple::thumb: {
auto &ELFFile = cast<ELFObjectFile<ELF32LE>>(**ELFObj).getELFFile();
return ELFLinkGraphBuilder_aarch32<support::little>(
- (*ELFObj)->getFileName(), ELFFile, TT, ArmCfg)
+ (*ELFObj)->getFileName(), ELFFile, TT, Features->getFeatures(),
+ ArmCfg)
.buildGraph();
}
case Triple::armeb:
case Triple::thumbeb: {
auto &ELFFile = cast<ELFObjectFile<ELF32BE>>(**ELFObj).getELFFile();
- return ELFLinkGraphBuilder_aarch32<support::big>((*ELFObj)->getFileName(),
- ELFFile, TT, ArmCfg)
+ return ELFLinkGraphBuilder_aarch32<support::big>(
+ (*ELFObj)->getFileName(), ELFFile, TT, Features->getFeatures(),
+ ArmCfg)
.buildGraph();
}
default:
diff --git a/llvm/lib/ExecutionEngine/JITLink/ELF_aarch64.cpp b/llvm/lib/ExecutionEngine/JITLink/ELF_aarch64.cpp
index 9df1126277e9a..23ad696a2ba63 100644
--- a/llvm/lib/ExecutionEngine/JITLink/ELF_aarch64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/ELF_aarch64.cpp
@@ -404,9 +404,10 @@ class ELFLinkGraphBuilder_aarch64 : public ELFLinkGraphBuilder<ELFT> {
public:
ELFLinkGraphBuilder_aarch64(StringRef FileName,
- const object::ELFFile<ELFT> &Obj, Triple TT)
- : ELFLinkGraphBuilder<ELFT>(Obj, std::move(TT), FileName,
- aarch64::getEdgeKindName) {}
+ const object::ELFFile<ELFT> &Obj, Triple TT,
+ LinkGraph::FeatureVector Features)
+ : ELFLinkGraphBuilder<ELFT>(Obj, std::move(TT), std::move(Features),
+ FileName, aarch64::getEdgeKindName) {}
};
// TLS Info Builder.
@@ -554,13 +555,17 @@ createLinkGraphFromELFObject_aarch64(MemoryBufferRef ObjectBuffer) {
if (!ELFObj)
return ELFObj.takeError();
+ auto Features = (*ELFObj)->getFeatures();
+ if (!Features)
+ return Features.takeError();
+
assert((*ELFObj)->getArch() == Triple::aarch64 &&
"Only AArch64 (little endian) is supported for now");
auto &ELFObjFile = cast<object::ELFObjectFile<object::ELF64LE>>(**ELFObj);
- return ELFLinkGraphBuilder_aarch64<object::ELF64LE>((*ELFObj)->getFileName(),
- ELFObjFile.getELFFile(),
- (*ELFObj)->makeTriple())
+ return ELFLinkGraphBuilder_aarch64<object::ELF64LE>(
+ (*ELFObj)->getFileName(), ELFObjFile.getELFFile(),
+ (*ELFObj)->makeTriple(), Features->getFeatures())
.buildGraph();
}
diff --git a/llvm/lib/ExecutionEngine/JITLink/ELF_i386.cpp b/llvm/lib/ExecutionEngine/JITLink/ELF_i386.cpp
index d78c50a0a35e0..f17007f81e68e 100644
--- a/llvm/lib/ExecutionEngine/JITLink/ELF_i386.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/ELF_i386.cpp
@@ -210,9 +210,9 @@ class ELFLinkGraphBuilder_i386 : public ELFLinkGraphBuilder<ELFT> {
public:
ELFLinkGraphBuilder_i386(StringRef FileName, const object::ELFFile<ELFT> &Obj,
- Triple TT)
- : ELFLinkGraphBuilder<ELFT>(Obj, std::move(TT), FileName,
- i386::getEdgeKindName) {}
+ Triple TT, LinkGraph::FeatureVector Features)
+ : ELFLinkGraphBuilder<ELFT>(Obj, std::move(TT), std::move(Features),
+ FileName, i386::getEdgeKindName) {}
};
Expected<std::unique_ptr<LinkGraph>>
@@ -226,13 +226,17 @@ createLinkGraphFromELFObject_i386(MemoryBufferRef ObjectBuffer) {
if (!ELFObj)
return ELFObj.takeError();
+ auto Features = (*ELFObj)->getFeatures();
+ if (!Features)
+ return Features.takeError();
+
assert((*ELFObj)->getArch() == Triple::x86 &&
"Only i386 (little endian) is supported for now");
auto &ELFObjFile = cast<object::ELFObjectFile<object::ELF32LE>>(**ELFObj);
- return ELFLinkGraphBuilder_i386<object::ELF32LE>((*ELFObj)->getFileName(),
- ELFObjFile.getELFFile(),
- (*ELFObj)->makeTriple())
+ return ELFLinkGraphBuilder_i386<object::ELF32LE>(
+ (*ELFObj)->getFileName(), ELFObjFile.getELFFile(),
+ (*ELFObj)->makeTriple(), Features->getFeatures())
.buildGraph();
}
diff --git a/llvm/lib/ExecutionEngine/JITLink/ELF_loongarch.cpp b/llvm/lib/ExecutionEngine/JITLink/ELF_loongarch.cpp
index 96effbf69cefa..9945cd3a4639c 100644
--- a/llvm/lib/ExecutionEngine/JITLink/ELF_loongarch.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/ELF_loongarch.cpp
@@ -129,9 +129,10 @@ class ELFLinkGraphBuilder_loongarch : public ELFLinkGraphBuilder<ELFT> {
public:
ELFLinkGraphBuilder_loongarch(StringRef FileName,
- const object::ELFFile<ELFT> &Obj, Triple TT)
- : ELFLinkGraphBuilder<ELFT>(Obj, std::move(TT), FileName,
- loongarch::getEdgeKindName) {}
+ const object::ELFFile<ELFT> &Obj, Triple TT,
+ LinkGraph::FeatureVector Features)
+ : ELFLinkGraphBuilder<ELFT>(Obj, std::move(TT), std::move(Features),
+ FileName, loongarch::getEdgeKindName) {}
};
Error buildTables_ELF_loongarch(LinkGraph &G) {
@@ -159,11 +160,15 @@ createLinkGraphFromELFObject_loongarch(MemoryBufferRef ObjectBuffer) {
if (!ELFObj)
return ELFObj.takeError();
+ auto Features = (*ELFObj)->getFeatures();
+ if (!Features)
+ return Features.takeError();
+
if ((*ELFObj)->getArch() == Triple::loongarch64) {
auto &ELFObjFile = cast<object::ELFObjectFile<object::ELF64LE>>(**ELFObj);
return ELFLinkGraphBuilder_loongarch<object::ELF64LE>(
(*ELFObj)->getFileName(), ELFObjFile.getELFFile(),
- (*ELFObj)->makeTriple())
+ (*ELFObj)->makeTriple(), Features->getFeatures())
.buildGraph();
}
@@ -172,7 +177,7 @@ createLinkGraphFromELFObject_loongarch(MemoryBufferRef ObjectBuffer) {
auto &ELFObjFile = cast<object::ELFObjectFile<object::ELF32LE>>(**ELFObj);
return ELFLinkGraphBuilder_loongarch<object::ELF32LE>(
(*ELFObj)->getFileName(), ELFObjFile.getELFFile(),
- (*ELFObj)->makeTriple())
+ (*ELFObj)->makeTriple(), Features->getFeatures())
.buildGraph();
}
diff --git a/llvm/lib/ExecutionEngine/JITLink/ELF_riscv.cpp b/llvm/lib/ExecutionEngine/JITLink/ELF_riscv.cpp
index e4dfbe10b3588..309913475ed4e 100644
--- a/llvm/lib/ExecutionEngine/JITLink/ELF_riscv.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/ELF_riscv.cpp
@@ -596,9 +596,10 @@ class ELFLinkGraphBuilder_riscv : public ELFLinkGraphBuilder<ELFT> {
public:
ELFLinkGraphBuilder_riscv(StringRef FileName,
- const object::ELFFile<ELFT> &Obj, Triple TT)
- : ELFLinkGraphBuilder<ELFT>(Obj, std::move(TT), FileName,
- riscv::getEdgeKindName) {}
+ const object::ELFFile<ELFT> &Obj, Triple TT,
+ LinkGraph::FeatureVector Features)
+ : ELFLinkGraphBuilder<ELFT>(Obj, std::move(TT), std::move(Features),
+ FileName, riscv::getEdgeKindName) {}
};
Expected<std::unique_ptr<LinkGraph>>
@@ -612,11 +613,15 @@ createLinkGraphFromELFObject_riscv(MemoryBufferRef ObjectBuffer) {
if (!ELFObj)
return ELFObj.takeError();
+ auto Features = (*ELFObj)->getFeatures();
+ if (!Features)
+ return Features.takeError();
+
if ((*ELFObj)->getArch() == Triple::riscv64) {
auto &ELFObjFile = cast<object::ELFObjectFile<object::ELF64LE>>(**ELFObj);
return ELFLinkGraphBuilder_riscv<object::ELF64LE>(
(*ELFObj)->getFileName(), ELFObjFile.getELFFile(),
- (*ELFObj)->makeTriple())
+ (*ELFObj)->makeTriple(), Features->getFeatures())
.buildGraph();
} else {
assert((*ELFObj)->getArch() == Triple::riscv32 &&
@@ -624,7 +629,7 @@ createLinkGraphFromELFObject_riscv(MemoryBufferRef ObjectBuffer) {
auto &ELFObjFile = cast<object::ELFObjectFile<object::ELF32LE>>(**ELFObj);
return ELFLinkGraphBuilder_riscv<object::ELF32LE>(
(*ELFObj)->getFileName(), ELFObjFile.getELFFile(),
- (*ELFObj)->makeTriple())
+ (*ELFObj)->makeTriple(), Features->getFeatures())
.buildGraph();
}
}
diff --git a/llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp b/llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp
index e3cfe7040a13c..d46e525704c80 100644
--- a/llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp
@@ -227,8 +227,10 @@ class ELFLinkGraphBuilder_x86_64 : public ELFLinkGraphBuilder<object::ELF64LE> {
public:
ELFLinkGraphBuilder_x86_64(StringRef FileName,
- const object::ELFFile<object::ELF64LE> &Obj)
- : ELFLinkGraphBuilder(Obj, Triple("x86_64-unknown-linux"), FileName,
+ const object::ELFFile<object::ELF64LE> &Obj,
+ LinkGraph::FeatureVector Features)
+ : ELFLinkGraphBuilder(Obj, Triple("x86_64-unknown-linux"),
+ std::move(Features), FileName,
x86_64::getEdgeKindName) {}
};
@@ -329,9 +331,14 @@ createLinkGraphFromELFObject_x86_64(MemoryBufferRef ObjectBuffer) {
if (!ELFObj)
return ELFObj.takeError();
+ auto Features = (*ELFObj)->getFeatures();
+ if (!Features)
+ return Features.takeError();
+
auto &ELFObjFile = cast<object::ELFObjectFile<object::ELF64LE>>(**ELFObj);
return ELFLinkGraphBuilder_x86_64((*ELFObj)->getFileName(),
- ELFObjFile.getELFFile())
+ ELFObjFile.getELFFile(),
+ Features->getFeatures())
.buildGraph();
}
diff --git a/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp b/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp
index 385230c53f914..aed28a3d4be17 100644
--- a/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp
@@ -48,11 +48,13 @@ Expected<std::unique_ptr<LinkGraph>> MachOLinkGraphBuilder::buildGraph() {
MachOLinkGraphBuilder::MachOLinkGraphBuilder(
const object::MachOObjectFile &Obj, Triple TT,
+ LinkGraph::FeatureVector Features,
LinkGraph::GetEdgeKindNameFunction GetEdgeKindName)
: Obj(Obj),
- G(std::make_unique<LinkGraph>(
- std::string(Obj.getFileName()), std::move(TT), getPointerSize(Obj),
- getEndianness(Obj), std::move(GetEdgeKindName))) {
+ G(std::make_unique<LinkGraph>(std::string(Obj.getFileName()),
+ std::move(TT), std::move(Features),
+ getPointerSize(Obj), getEndianness(Obj),
+ std::move(GetEdgeKindName))) {
auto &MachHeader = Obj.getHeader64();
SubsectionsViaSymbols = MachHeader.flags & MachO::MH_SUBSECTIONS_VIA_SYMBOLS;
}
diff --git a/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.h b/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.h
index ba6cfaf8aa947..e0e581653c29d 100644
--- a/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.h
+++ b/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.h
@@ -84,6 +84,7 @@ class MachOLinkGraphBuilder {
using SectionParserFunction = std::function<Error(NormalizedSection &S)>;
MachOLinkGraphBuilder(const object::MachOObjectFile &Obj, Triple TT,
+ LinkGraph::FeatureVector Features,
LinkGraph::GetEdgeKindNameFunction GetEdgeKindName);
LinkGraph &getGraph() const { return *G; }
diff --git a/llvm/lib/ExecutionEngine/JITLink/MachO_arm64.cpp b/llvm/lib/ExecutionEngine/JITLink/MachO_arm64.cpp
index 3380bb563140d..5598b57d7a048 100644
--- a/llvm/lib/ExecutionEngine/JITLink/MachO_arm64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/MachO_arm64.cpp
@@ -25,9 +25,10 @@ namespace {
class MachOLinkGraphBuilder_arm64 : public MachOLinkGraphBuilder {
public:
- MachOLinkGraphBuilder_arm64(const object::MachOObjectFile &Obj)
+ MachOLinkGraphBuilder_arm64(const object::MachOObjectFile &Obj,
+ LinkGraph::FeatureVector Features)
: MachOLinkGraphBuilder(Obj, Triple("arm64-apple-darwin"),
- aarch64::getEdgeKindName),
+ std::move(Features), aarch64::getEdgeKindName),
NumSymbols(Obj.getSymtabLoadCommand().nsyms) {}
private:
@@ -541,7 +542,13 @@ createLinkGraphFromMachOObject_arm64(MemoryBufferRef ObjectBuffer) {
auto MachOObj = object::ObjectFile::createMachOObjectFile(ObjectBuffer);
if (!MachOObj)
return MachOObj.takeError();
- return MachOLinkGraphBuilder_arm64(**MachOObj).buildGraph();
+
+ auto Features = (*MachOObj)->getFeatures();
+ if (!Features)
+ return Features.takeError();
+
+ return MachOLinkGraphBuilder_arm64(**MachOObj, Features->getFeatures())
+ .buildGraph();
}
void link_MachO_arm64(std::unique_ptr<LinkGraph> G,
diff --git a/llvm/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp b/llvm/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp
index be40b740a5a7f..a4606929d494e 100644
--- a/llvm/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp
@@ -25,9 +25,10 @@ namespace {
class MachOLinkGraphBuilder_x86_64 : public MachOLinkGraphBuilder {
public:
- MachOLinkGraphBuilder_x86_64(const object::MachOObjectFile &Obj)
+ MachOLinkGraphBuilder_x86_64(const object::MachOObjectFile &Obj,
+ LinkGraph::FeatureVector Features)
: MachOLinkGraphBuilder(Obj, Triple("x86_64-apple-darwin"),
- x86_64::getEdgeKindName) {}
+ std::move(Features), x86_64::getEdgeKindName) {}
private:
enum MachONormalizedRelocationType : unsigned {
@@ -466,7 +467,13 @@ createLinkGraphFromMachOObject_x86_64(MemoryBufferRef ObjectBuffer) {
auto MachOObj = object::ObjectFile::createMachOObjectFile(ObjectBuffer);
if (!MachOObj)
return MachOObj.takeError();
- return MachOLinkGraphBuilder_x86_64(**MachOObj).buildGraph();
+
+ auto Features = (*MachOObj)->getFeatures();
+ if (!Features)
+ return Features.takeError();
+
+ return MachOLinkGraphBuilder_x86_64(**MachOObj, Features->getFeatures())
+ .buildGraph();
}
void link_MachO_x86_64(std::unique_ptr<LinkGraph> G,
More information about the llvm-commits
mailing list