Merge pull request #14161 from Radvendii/exprophasattr-alloc

xokdvium · web-flow · commit d5fa131cfb85 · 2025-10-05T22:49:17.000Z
libexpr: fixup ExprOpHasAttr() to take allocator reference
diff --git a/src/libexpr/include/nix/expr/nixexpr.hh b/src/libexpr/include/nix/expr/nixexpr.hh
@@ -350,7 +350,7 @@ struct ExprOpHasAttr : Expr
     Expr * e;
     std::span<AttrName> attrPath;
 
-    ExprOpHasAttr(std::pmr::polymorphic_allocator<char> alloc, Expr * e, std::vector<AttrName> attrPath)
+    ExprOpHasAttr(std::pmr::polymorphic_allocator<char> & alloc, Expr * e, std::vector<AttrName> attrPath)
         : e(e)
         , attrPath({alloc.allocate_object<AttrName>(attrPath.size()), attrPath.size()})
     {

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ struct ExprOpHasAttr : Expr`
`350`	`350`	`Expr * e;`
`351`	`351`	`std::span<AttrName> attrPath;`
`352`	`352`
`353`		`- ExprOpHasAttr(std::pmr::polymorphic_allocator<char> alloc, Expr * e, std::vector<AttrName> attrPath)`
	`353`	`+ ExprOpHasAttr(std::pmr::polymorphic_allocator<char> & alloc, Expr * e, std::vector<AttrName> attrPath)`
`354`	`354`	`: e(e)`
`355`	`355`	`, attrPath({alloc.allocate_object<AttrName>(attrPath.size()), attrPath.size()})`
`356`	`356`	`{`