Preserve per-block Func vars during lazy scope cleanup (fix Benchmarks regression)#135
Merged
NikolayPianikov merged 6 commits intodevfrom Feb 20, 2026
Conversation
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
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.
Motivation
ShouldSupportFuncWhenPerBlockby causing repeated constructions ofService3instead of reusing the per-block factory value.Func<T>variables across lazy scope restoration.Description
VarsMap.RemoveNewNonPersistentVarsso the current scope variable (the one identified byvar.Declaration.Node.BindingId) is not removed for normal non-persistent lifetimes, and is only removed when it was created via an override construct (MdConstructKind.Override).src/Pure.DI.Core/Core/Code/VarsMap.cs(logic inCreateState/RemoveNewNonPersistentVars).Testing
dotnet testin this environment because the .NET SDK is unavailable, so no automated test execution was performed here (tooling error:dotnet: command not found).VarsMap.cslines aroundCreateStateandRemoveNewNonPersistentVars, confirmed the logic now preserves per-block factory vars while still targeting override-constructed vars for removal.ShouldSupportFuncWhenPerBlockandShouldSupportOverrideInFactoryWithLocalFunctionAndFuncArgs) and verified the change addresses the per-block reuse regression by reasoning over the generation/restoration code paths.Codex Task