nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 11:36:03 +01:00
Code Activity

libexpr: shrink ExprWith by 8 bytes

Browse source 
Correct bound on prevWith

Co-authored-by: John Ericson <git@JohnEricson.me>
This commit is contained in:
Taeer Bar-Yam 2025-10-31 21:52:10 +01:00 • committed by Taeer Bar-Yam
parent 2d83bc6b83
commit 11e19ee690
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/include/nix/expr/nixexpr.hh
View file

@ -637,8 +637,8 @@ struct ExprLet : Expr
struct ExprWith : Expr struct ExprWith : Expr
{ {
PosIdx pos; PosIdx pos;
uint32_t prevWith;
Expr *attrs, *body; Expr *attrs, *body;
size_t prevWith;
ExprWith * parentWith; ExprWith * parentWith;
ExprWith(const PosIdx & pos, Expr * attrs, Expr * body) ExprWith(const PosIdx & pos, Expr * attrs, Expr * body)
: pos(pos) : pos(pos)

1
src/libexpr/nixexpr.cc
View file

@ -523,6 +523,7 @@ void ExprWith::bindVars(EvalState & es, const std::shared_ptr<const StaticEnv> &
prevWith = 0; prevWith = 0;
for (curEnv = env.get(), level = 1; curEnv; curEnv = curEnv->up.get(), level++) for (curEnv = env.get(), level = 1; curEnv; curEnv = curEnv->up.get(), level++)
if (curEnv->isWith) { if (curEnv->isWith) {
assert(level <= std::numeric_limits<uint32_t>::max());
prevWith = level; prevWith = level;
break; break;
} }