Fix reentrancy of Code.eval_*#15306
Merged
josevalim merged 2 commits intoelixir-lang:mainfrom Apr 28, 2026
Merged
Conversation
Keep env and dbg callbacks on stacks in process dict Fixes elixir-lang#15303
| Code.eval_string( | ||
| """ | ||
| Code.eval_string("1 + 1") | ||
| dbg(1) |
Member
There was a problem hiding this comment.
This already works, because the dbg is expanded using the dbg_callback before Code.eval_string runs. So to actually test it we need this:
Suggested change
| dbg(1) | |
| Code.eval_string("dbg(1)") |
Contributor
Author
There was a problem hiding this comment.
Nice catch, fixed
josevalim
reviewed
Apr 26, 2026
| %% | ||
| %% We keep a stack of envs in the process dictionary so nested eval calls | ||
| %% in the same process do not clobber the outer env. | ||
| push_pdict(?elixir_eval_env, Env), |
Member
There was a problem hiding this comment.
I am not sure if we need the push and pop into the direct, because the try-block already captures the state. I'd do this:
PreviousEvalEnv = erlang:get(?elixir_eval_env),
try
after
case PreviousEvalEnv of
undefined -> erlang:delete(?elixir_eval_env);
_ -> erlang:put(?elixir_eval_env, PreviousEvalEnv)
end
end
The same for dbg_callback. WDYT?
Contributor
Author
There was a problem hiding this comment.
Agreed, I was too fixated on stack model
- Replace process-dict stack with direct save/restore via local variables in eval_forms/4 and erl_eval/3 (per @josevalim). - Fix nested dbg_callback test to actually exercise the path via Code.eval_string("dbg(1)") (per @jonatanklosko).
Member
|
💚 💙 💜 💛 ❤️ |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Keep env and dbg callbacks on stacks in process dict
Fixes #15303