Skip to content

libexpr: allocate the Exprs themselves in Exprs::alloc #14472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xokdvium merged 1 commit into from
Nov 6, 2025
Merged

libexpr: allocate the Exprs themselves in Exprs::alloc #14472

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/libexpr/include/nix/expr/nixexpr.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ public:
[[gnu::always_inline]]
C * add(auto &&... args)
{
return new C(std::forward<decltype(args)>(args)...);
return alloc.new_object<C>(std::forward<decltype(args)>(args)...);
}

// we define some calls to add explicitly so that the argument can be passed in as initializer lists
Expand All @@ -822,15 +822,15 @@ public:
C * add(const PosIdx & pos, Expr * fun, std::vector<Expr *> && args)
requires(std::same_as<C, ExprCall>)
{
return new C(pos, fun, std::move(args));
return alloc.new_object<C>(pos, fun, std::move(args));
}

template<class C>
[[gnu::always_inline]]
C * add(const PosIdx & pos, Expr * fun, std::vector<Expr *> && args, PosIdx && cursedOrEndPos)
requires(std::same_as<C, ExprCall>)
{
return new C(pos, fun, std::move(args), std::move(cursedOrEndPos));
return alloc.new_object<C>(pos, fun, std::move(args), std::move(cursedOrEndPos));
}

template<class C>
Expand Down
Loading