From 9df71d7673b5c98e1032d01be83724a45b42fafc Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 28 Jun 2024 08:36:49 +0200 Subject: [IR] Add getDataLayout() helpers to Function and GlobalValue (#96919) Similar to https://github.com/llvm/llvm-project/pull/96902, this adds `getDataLayout()` helpers to Function and GlobalValue, replacing the current `getParent()->getDataLayout()` pattern. --- llvm/lib/ExecutionEngine/ExecutionEngine.cpp | 4 ++-- llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp | 2 +- llvm/lib/ExecutionEngine/Orc/Mangling.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'llvm/lib/ExecutionEngine') diff --git a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp index 31c290a..28e4f96 100644 --- a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp +++ b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp @@ -192,9 +192,9 @@ std::string ExecutionEngine::getMangledName(const GlobalValue *GV) { SmallString<128> FullName; const DataLayout &DL = - GV->getParent()->getDataLayout().isDefault() + GV->getDataLayout().isDefault() ? getDataLayout() - : GV->getParent()->getDataLayout(); + : GV->getDataLayout(); Mangler::getNameWithPrefix(FullName, GV->getName(), DL); return std::string(FullName); diff --git a/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp b/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp index 670c8cf..8a5986c 100644 --- a/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp +++ b/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp @@ -117,7 +117,7 @@ void CtorDtorRunner::add(iterator_range CtorDtors) { MangleAndInterner Mangle( JD.getExecutionSession(), - (*CtorDtors.begin()).Func->getParent()->getDataLayout()); + (*CtorDtors.begin()).Func->getDataLayout()); for (auto CtorDtor : CtorDtors) { assert(CtorDtor.Func && CtorDtor.Func->hasName() && diff --git a/llvm/lib/ExecutionEngine/Orc/Mangling.cpp b/llvm/lib/ExecutionEngine/Orc/Mangling.cpp index 9c243c9..9abf7c1 100644 --- a/llvm/lib/ExecutionEngine/Orc/Mangling.cpp +++ b/llvm/lib/ExecutionEngine/Orc/Mangling.cpp @@ -35,7 +35,7 @@ void IRSymbolMapper::add(ExecutionSession &ES, const ManglingOptions &MO, if (GVs.empty()) return; - MangleAndInterner Mangle(ES, GVs[0]->getParent()->getDataLayout()); + MangleAndInterner Mangle(ES, GVs[0]->getDataLayout()); for (auto *G : GVs) { assert(G && "GVs cannot contain null elements"); if (!G->hasName() || G->isDeclaration() || G->hasLocalLinkage() || -- cgit v1.1