Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/cpyrt/Converters.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -3186,7 +3186,9 @@ bool cpyrt::InitializerListConverter::SetArg(PyObject* pyobject,
PyObject* item = PySequence_GetItem(pyobject, i);
bool convert_ok = false;
if (item) {
Converter* converter = CreateConverter(fValueTypeName);
if (i >= fConverters.size())
fConverters.emplace_back(CreateConverter(fValueTypeName));
Converter* converter = fConverters[i];
if (!converter) {
if (CPPInstance_Check(item)) {
// by convention, use byte copy
Expand All @@ -3208,10 +3210,8 @@ bool cpyrt::InitializerListConverter::SetArg(PyObject* pyobject,
.c_str());
entries += 1;
}
if (memloc) {
if (memloc)
convert_ok = converter->ToMemory(item, memloc);
}
fConverters.emplace_back(converter);
}

Py_DECREF(item);
Expand Down
18 changes: 18 additions & 0 deletions test/test_leakcheck.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,3 +282,21 @@ def wrapped_list_by_value():
ns.leak_list = wrapped_list_by_value

self.check_func(ns, "leak_list")

def test09_initializer_list_argument(self):
"""Leak check of passing a list as an std::initializer_list argument"""

import cppjit

cppjit.cppdef("""\
namespace LeakCheck {
int sum_il(std::initializer_list<int> l) {
int s = 0;
for (auto i : l) s += i;
return s;
}
}""")

ns = cppjit.gbl.LeakCheck

self.check_func(ns, "sum_il", [1, 2, 3])
Loading