D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-08-02 04:20:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

[svn r70] Fixed bug where correct calling convention was not set on calling aggregate methods

Browse Source
This commit is contained in:
Tomas Lindquist Olsen
2007-10-28 02:03:42 +02:00
parent 49deafe227
commit a5d3910b57
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gen/toir.c
View File

@@ -1254,7 +1254,13 @@ elem* CallExp::toElem(IRState* p)
e->val = call;
// set calling convention
if ((fn->funcdecl && (fn->funcdecl->llvmInternal != LLVMintrinsic && fn->funcdecl->llvmInternal != LLVMva_start)) || delegateCall)
if (fn->funcdecl) {
int li = fn->funcdecl->llvmInternal;
if (li != LLVMintrinsic && li != LLVMva_start && li != LLVMva_intrinsic) {
call->setCallingConv(LLVM_DtoCallingConv(dlink));
}
}
else if (delegateCall)
call->setCallingConv(LLVM_DtoCallingConv(dlink));
else if (fn->callconv != (unsigned)-1)
call->setCallingConv(fn->callconv);
@@ -1600,7 +1606,8 @@ elem* DotVarExp::toElem(IRState* p)
e->callconv = LLVM_DtoCallingConv(fdecl->linkage);
}
e->val = funcval;
e->type = elem::VAL;
e->type = elem::FUNC;
e->funcdecl = fdecl;
}
else {
printf("unknown: %s\n", var->toChars());