D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-02-24 07:33:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[svn r124] Fixed another D vararg + return in ptr bug.

Browse Source 
Fixed some nested function calls failed to resolve the context ptr.
This commit is contained in:
Tomas Lindquist Olsen
2007-11-26 07:26:21 +01:00
parent 282f60e4a0
commit 935dfae9c8
6 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gen/toir.cpp
View File

@@ -936,7 +936,7 @@ DValue* CallExp::toElem(IRState* p)
Logger::println("This Call");
if (dfn->vthis->getType() != argiter->get()) {
//Logger::cout() << *fn->thisparam << '|' << *argiter->get() << '\n';
llargs[j] = new llvm::BitCastInst(dfn->vthis, argiter->get(), "tmp", p->scopebb());
llargs[j] = DtoBitCast(dfn->vthis, argiter->get());
}
else {
llargs[j] = dfn->vthis;
@@ -956,8 +956,9 @@ DValue* CallExp::toElem(IRState* p)
else if (dfn && dfn->func && dfn->func->isNested()) {
Logger::println("Nested Call");
llvm::Value* contextptr = p->func()->decl->llvmNested;
assert(contextptr);
llargs[j] = p->ir->CreateBitCast(contextptr, llvm::PointerType::get(llvm::Type::Int8Ty), "tmp");
if (!contextptr)
contextptr = llvm::ConstantPointerNull::get(llvm::PointerType::get(llvm::Type::Int8Ty));
llargs[j] = DtoBitCast(contextptr, llvm::PointerType::get(llvm::Type::Int8Ty));
++j;
++argiter;
}
@@ -970,7 +971,7 @@ DValue* CallExp::toElem(IRState* p)
Argument* fnarg = Argument::getNth(tf->parameters, i);
Expression* exp = (Expression*)arguments->data[i];
DValue* expelem = exp->toElem(p);
llargs[j] = p->ir->CreateBitCast(expelem->getLVal(), llvm::PointerType::get(llvm::Type::Int8Ty), "tmp");
llargs[j] = DtoBitCast(expelem->getLVal(), llvm::PointerType::get(llvm::Type::Int8Ty));
}
}
// regular arguments
@@ -979,6 +980,8 @@ DValue* CallExp::toElem(IRState* p)
{
Logger::println("doing d-style variadic arguments");
size_t nimplicit = j;
std::vector<const llvm::Type*> vtypes;
std::vector<llvm::Value*> vvalues;
std::vector<llvm::Value*> vtypeinfos;
@@ -1020,7 +1023,7 @@ DValue* CallExp::toElem(IRState* p)
j++;
llargs[j] = p->ir->CreateBitCast(mem, llvm::PointerType::get(llvm::Type::Int8Ty), "tmp");
j++;
llargs.resize(2);
llargs.resize(nimplicit+2);
}
else {
Logger::println("doing normal arguments");