mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-15 05:24:01 +00:00
[Orc] During module partitioning, rename anonymous and asm-private globals.
If they're not (re)named, these globals will fail to resolve when the partitioned modules are linked. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@234707 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -14,6 +14,7 @@
|
|||||||
#include "llvm/IR/CallSite.h"
|
#include "llvm/IR/CallSite.h"
|
||||||
#include "llvm/IR/IRBuilder.h"
|
#include "llvm/IR/IRBuilder.h"
|
||||||
#include <set>
|
#include <set>
|
||||||
|
#include <sstream>
|
||||||
|
|
||||||
namespace llvm {
|
namespace llvm {
|
||||||
namespace orc {
|
namespace orc {
|
||||||
@ -51,32 +52,69 @@ void makeStub(Function &F, GlobalVariable &ImplPointer) {
|
|||||||
Builder.CreateRet(Call);
|
Builder.CreateRet(Call);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Utility class for renaming global values and functions during partitioning.
|
||||||
|
class GlobalRenamer {
|
||||||
|
public:
|
||||||
|
|
||||||
|
static bool needsRenaming(const Value &New) {
|
||||||
|
if (!New.hasName() || New.getName().startswith("\01L"))
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const std::string& getRename(const Value &Orig) {
|
||||||
|
// See if we have a name for this global.
|
||||||
|
{
|
||||||
|
auto I = Names.find(&Orig);
|
||||||
|
if (I != Names.end())
|
||||||
|
return I->second;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Nope. Create a new one.
|
||||||
|
// FIXME: Use a more robust uniquing scheme. (This may blow up if the user
|
||||||
|
// writes a "__orc_anon[[:digit:]]* method).
|
||||||
|
unsigned ID = Names.size();
|
||||||
|
std::ostringstream NameStream;
|
||||||
|
NameStream << "__orc_anon" << ID++;
|
||||||
|
auto I = Names.insert(std::make_pair(&Orig, NameStream.str()));
|
||||||
|
return I.first->second;
|
||||||
|
}
|
||||||
|
private:
|
||||||
|
DenseMap<const Value*, std::string> Names;
|
||||||
|
};
|
||||||
|
|
||||||
void partition(Module &M, const ModulePartitionMap &PMap) {
|
void partition(Module &M, const ModulePartitionMap &PMap) {
|
||||||
|
|
||||||
|
GlobalRenamer Renamer;
|
||||||
|
|
||||||
for (auto &KVPair : PMap) {
|
for (auto &KVPair : PMap) {
|
||||||
|
|
||||||
auto ExtractGlobalVars =
|
auto ExtractGlobalVars =
|
||||||
[&](GlobalVariable &New, const GlobalVariable &Orig,
|
[&](GlobalVariable &New, const GlobalVariable &Orig,
|
||||||
ValueToValueMapTy &VMap) {
|
ValueToValueMapTy &VMap) {
|
||||||
assert(Orig.hasName() && "Extracted globals must have names.");
|
|
||||||
if (KVPair.second.count(&Orig)) {
|
if (KVPair.second.count(&Orig)) {
|
||||||
copyGVInitializer(New, Orig, VMap);
|
copyGVInitializer(New, Orig, VMap);
|
||||||
}
|
}
|
||||||
if (New.hasLocalLinkage()) {
|
if (New.hasLocalLinkage()) {
|
||||||
|
if (Renamer.needsRenaming(New))
|
||||||
|
New.setName(Renamer.getRename(Orig));
|
||||||
New.setLinkage(GlobalValue::ExternalLinkage);
|
New.setLinkage(GlobalValue::ExternalLinkage);
|
||||||
New.setVisibility(GlobalValue::HiddenVisibility);
|
New.setVisibility(GlobalValue::HiddenVisibility);
|
||||||
}
|
}
|
||||||
|
assert(!Renamer.needsRenaming(New) && "Invalid global name.");
|
||||||
};
|
};
|
||||||
|
|
||||||
auto ExtractFunctions =
|
auto ExtractFunctions =
|
||||||
[&](Function &New, const Function &Orig, ValueToValueMapTy &VMap) {
|
[&](Function &New, const Function &Orig, ValueToValueMapTy &VMap) {
|
||||||
assert(Orig.hasName() && "Extracted functions must have names.");
|
|
||||||
if (KVPair.second.count(&Orig))
|
if (KVPair.second.count(&Orig))
|
||||||
copyFunctionBody(New, Orig, VMap);
|
copyFunctionBody(New, Orig, VMap);
|
||||||
if (New.hasLocalLinkage()) {
|
if (New.hasLocalLinkage()) {
|
||||||
|
if (Renamer.needsRenaming(New))
|
||||||
|
New.setName(Renamer.getRename(Orig));
|
||||||
New.setLinkage(GlobalValue::ExternalLinkage);
|
New.setLinkage(GlobalValue::ExternalLinkage);
|
||||||
New.setVisibility(GlobalValue::HiddenVisibility);
|
New.setVisibility(GlobalValue::HiddenVisibility);
|
||||||
}
|
}
|
||||||
|
assert(!Renamer.needsRenaming(New) && "Invalid function name.");
|
||||||
};
|
};
|
||||||
|
|
||||||
CloneSubModule(*KVPair.first, M, ExtractGlobalVars, ExtractFunctions,
|
CloneSubModule(*KVPair.first, M, ExtractGlobalVars, ExtractFunctions,
|
||||||
|
18
test/ExecutionEngine/OrcLazy/anonymous_globals.ll
Normal file
18
test/ExecutionEngine/OrcLazy/anonymous_globals.ll
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
; RUN: lli -jit-kind=orc-lazy %s
|
||||||
|
|
||||||
|
define private void @0() {
|
||||||
|
entry:
|
||||||
|
ret void
|
||||||
|
}
|
||||||
|
|
||||||
|
define private void @"\01L_foo"() {
|
||||||
|
entry:
|
||||||
|
ret void
|
||||||
|
}
|
||||||
|
|
||||||
|
define i32 @main(i32 %argc, i8** nocapture readnone %argv) {
|
||||||
|
entry:
|
||||||
|
call void @0()
|
||||||
|
tail call void @"\01L_foo"()
|
||||||
|
ret i32 0
|
||||||
|
}
|
Reference in New Issue
Block a user