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

Fix a bug I noticed. Varargs were broken if preceded by tuple parameters.

Browse Source
This commit is contained in:
Frits van Bommel
2009-03-30 00:00:43 +02:00
parent 972fca5729
commit b7ca040f7c
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gen/tocall.cpp
View File

@@ -122,11 +122,12 @@ const LLFunctionType* DtoExtractFunctionType(const LLType* type)
void DtoBuildDVarArgList(std::vector<LLValue*>& args, std::vector<llvm::AttributeWithIndex>& attrs, TypeFunction* tf, Expressions* arguments, size_t argidx)
{
Logger::println("doing d-style variadic arguments");
LOG_SCOPE
std::vector<const LLType*> vtypes;
// number of non variadic args
int begin = tf->parameters->dim;
int begin = Argument::dim(tf->parameters);
Logger::println("num non vararg params = %d", begin);
// get n args in arguments list
@@ -136,6 +137,7 @@ void DtoBuildDVarArgList(std::vector<LLValue*>& args, std::vector<llvm::Attribut
for (int i=begin; i<n_arguments; i++)
{
Expression* argexp = (Expression*)arguments->data[i];
assert(argexp->type->ty != Ttuple);
vtypes.push_back(DtoType(argexp->type));
size_t sz = getTypePaddedSize(vtypes.back());
if (sz < PTRSIZE)

13
tests/mini/tuple_and_vararg.d Normal file
View File

@@ -0,0 +1,13 @@
// Based on dstress.run.t.tuple_15_A;
module tuple_and_vararg;
template TypeTuple(TList...){
alias TList TypeTuple;
}
void main(){
auto y = function(TypeTuple!(uint,uint) ab, ...){};
y(1, 2);
y(1, 2, "foo", 3.0);
}