Skip to content

libexpr: Fix invalid handling of errors for imported functions (backport #13450) #13453

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
Jul 11, 2025
Merged

libexpr: Fix invalid handling of errors for imported functions (backport #13450) #13453

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/libexpr/eval.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1602,7 +1602,7 @@ void EvalState::callFunction(Value & fun, std::span<Value *> args, Value & vRes,
symbols[i.name])
.atPos(lambda.pos)
.withTrace(pos, "from call site")
.withFrame(*fun.lambda().env, lambda)
.withFrame(*vCur.lambda().env, lambda)
.debugThrow();
}
env2.values[displ++] = i.def->maybeThunk(*this, env2);
Expand All @@ -1629,7 +1629,7 @@ void EvalState::callFunction(Value & fun, std::span<Value *> args, Value & vRes,
.atPos(lambda.pos)
.withTrace(pos, "from call site")
.withSuggestions(suggestions)
.withFrame(*fun.lambda().env, lambda)
.withFrame(*vCur.lambda().env, lambda)
.debugThrow();
}
unreachable();
Expand Down
12 changes: 12 additions & 0 deletions tests/functional/lang/eval-fail-missing-arg-import.err.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
error:
… from call site
at /pwd/lang/eval-fail-missing-arg-import.nix:1:1:
1| import ./non-eval-trivial-lambda-formals.nix { }
| ^
2|

error: function 'anonymous lambda' called without required argument 'a'
at /pwd/lang/non-eval-trivial-lambda-formals.nix:1:1:
1| { a }: a
| ^
2|
1 change: 1 addition & 0 deletions tests/functional/lang/eval-fail-missing-arg-import.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import ./non-eval-trivial-lambda-formals.nix { }
13 changes: 13 additions & 0 deletions tests/functional/lang/eval-fail-undeclared-arg-import.err.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
error:
… from call site
at /pwd/lang/eval-fail-undeclared-arg-import.nix:1:1:
1| import ./non-eval-trivial-lambda-formals.nix {
| ^
2| a = "a";

error: function 'anonymous lambda' called with unexpected argument 'b'
at /pwd/lang/non-eval-trivial-lambda-formals.nix:1:1:
1| { a }: a
| ^
2|
Did you mean a?
4 changes: 4 additions & 0 deletions tests/functional/lang/eval-fail-undeclared-arg-import.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import ./non-eval-trivial-lambda-formals.nix {
a = "a";
b = "b";
}
1 change: 1 addition & 0 deletions tests/functional/lang/non-eval-trivial-lambda-formals.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ a }: a
Loading