Fix auto argument passing for more auto arguments than formals #4005
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
glittershark
suggested changes
Sep 11, 2020
src/libexpr/eval.cc
Outdated
| @@ -1348,7 +1348,7 @@ void EvalState::autoCallFunction(Bindings & args, Value & fun, Value & res) | |||
| } | |||
|
|
|||
| Value * actualArgs = allocValue(); | |||
| mkAttrs(*actualArgs, fun.lambda.fun->formals->formals.size()); | |||
| mkAttrs(*actualArgs, std::max((uint32_t) fun.lambda.fun->formals->formals.size(), args.size())); | |||
There was a problem hiding this comment.
generally I'd push for a static_cast here over a C-style cast.
There was a problem hiding this comment.
Thanks, did that, I literally have no clue about C++ :)
The change in 6262007 didn't account for when the number of auto arguments is bigger than the number of formal arguments. This causes the following: $ nix-instantiate --eval -E '{ ... }@Args: args.foo' --argstr foo foo nix-instantiate: src/libexpr/attr-set.hh:55: void nix::Bindings::push_back(const nix::Attr&): Assertion `size_ < capacity_' failed. Aborted (core dumped)
infinisil
force-pushed
the
fix-autoArgs
branch
from
2f8c112
to
8dbd57a
Compare
glittershark
approved these changes
Sep 11, 2020
ajs124
approved these changes
Sep 13, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The change in #3965 didn't account for when the number of auto arguments is bigger than the number of formal arguments. This causes the following:
This fixes it
Ping @glittershark