guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libexpr/genericClosure: de-ptr-ize UnsafeValueList

Browse Source 
UnsafeValueList held pointers from Value which were not necessarily GC
allocated, causing mayhem when evaluating something with genericClosure
(texlive environments).

We get rid of storing pointers and we let comparison take places on
const references.

We keep `gc_allocator<Value>` so that GC can scan things it allocates
inside the `res` list.

Co-authored-by: eldritch horrors <pennae@lix.systems>
Reported-by: qbit
Change-Id: I4fed3a3d9e18a2ef2d751f32d81801540e196f92
Signed-off-by: Raito Bezarius <raito@lix.systems>
This commit is contained in:
Raito Bezarius
2025-10-06 23:00:40 +02:00
co-authored by eldritch horrors
parent b5d31b7780
commit 7b6bcffe8b
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lix/libexpr/primops.cc
+16 -11
View File
@@ -523,9 +523,9 @@ struct CompareValues : NeverAsync
/// NOTE: this type must NEVER be outside of GC-scanned memory.
#if HAVE_BOEHMGC
using UnsafeValueList = std::list<Value *, gc_allocator<Value *>>;
using UnsafeValueList = std::list<Value, gc_allocator<Value>>;
#else
using UnsafeValueList = std::list<Value *>;
using UnsafeValueList = std::list<Value>;
#endif
static const Attr *
@@ -558,7 +558,7 @@ static void prim_genericClosure(EvalState & state, Value * * args, Value & v)
UnsafeValueList workSet;
for (auto & elem : startSet->value.listItems()) {
workSet.push_back(&elem);
workSet.push_back(elem);
}
if (startSet->value.listSize() == 0) {
@@ -586,36 +586,41 @@ static void prim_genericClosure(EvalState & state, Value * * args, Value & v)
// `doneKeys' doesn't need to be a GC root, because its values are
// reachable from res.
auto cmp = CompareValues(state, "while comparing the `key` attributes of two genericClosure elements");
std::set<Value *, decltype(cmp)> doneKeys(cmp);
std::set<Value, decltype(cmp)> doneKeys(cmp);
while (!workSet.empty()) {
Value * e = *(workSet.begin());
Value e = *(workSet.begin());
workSet.pop_front();
state.forceAttrs(*e, noPos, "while evaluating one of the elements generated by (or initially passed to) builtins.genericClosure");
state.forceAttrs(
e,
noPos,
"while evaluating one of the elements generated by (or initially passed to) "
"builtins.genericClosure"
);
auto key = getAttr(
state,
state.ctx.s.key,
e->attrs(),
e.attrs(),
"in one of the attrsets generated by (or initially passed to) builtins.genericClosure"
);
state.forceValue(key->value, noPos);
if (!doneKeys.insert(&key->value).second) {
if (!doneKeys.insert(key->value).second) {
continue;
}
res.push_back(e);
/* Call the `operator' function with `e' as argument. */
Value newElements;
state.callFunction(op->value, {e, 1}, newElements, noPos);
state.callFunction(op->value, {&e, 1}, newElements, noPos);
state.forceList(newElements, noPos, "while evaluating the return value of the `operator` passed to builtins.genericClosure");
/* Add the values returned by the operator to the work set. */
for (auto & elem : newElements.listItems()) {
state.forceValue(elem, noPos); // "while evaluating one one of the elements returned by
// the `operator` passed to builtins.genericClosure");
workSet.push_back(&elem);
workSet.push_back(elem);
}
}
@@ -624,7 +629,7 @@ static void prim_genericClosure(EvalState & state, Value * * args, Value & v)
v = {NewValueAs::list, result};
unsigned int n = 0;
for (auto & i : res)
result->elems[n++] = *i;
result->elems[n++] = i;
}