mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-09 12:32:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

multiple jit modules linking fixes and test

Browse source
This commit is contained in:
Ivan 2017-10-20 13:06:13 +03:00
parent a6d788cdb5
commit e55a84e846
5 changed files with 70 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gen/runtimecompile.cpp
View file

@ -165,8 +165,12 @@ void fixRtModule(llvm::Module &newModule,
std::unordered_set<std::string> externalFuncs;
for (auto &&it : funcs) {
assert(nullptr != it.first);
assert(nullptr != it.second.thunkVar);
assert(nullptr != it.second.thunkFunc);
if (nullptr == it.second.thunkVar) {
// thunkVar is not available
// e.g. runtimeCompile function from other module, ignore
continue;
}
assert(!contains(thunkVar2func, it.second.thunkVar->getName()));
thunkVar2func.insert({it.second.thunkVar->getName(), it.first->getName()});
thunkFun2func.insert({it.second.thunkFunc->getName(), it.first->getName()});
@ -497,8 +501,12 @@ generateFuncList(IRState *irs, const Types &types) {
std::vector<llvm::Constant *> elements;
for (auto &&it : irs->runtimeCompiledFunctions) {
assert(nullptr != it.first);
assert(nullptr != it.second.thunkVar);
assert(nullptr != it.second.thunkFunc);
if (nullptr == it.second.thunkVar) {
// thunkVar is not available
// e.g. runtimeCompile function from other module, ignore
continue;
}
auto name = it.first->getName();
llvm::Constant *fields[] = {
createStringInitializer(irs->module, name),