Fix null ref in complex per resolve

DevTeam · Sep 22, 2023 · e826370 · e826370
1 parent cce403a
commit e826370
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 22 deletions.
diff --git a/src/Pure.DI.Core/Core/ApiInvocationProcessor.cs b/src/Pure.DI.Core/Core/ApiInvocationProcessor.cs
@@ -1,3 +1,4 @@
+// ReSharper disable ClassNeverInstantiated.Global
 namespace Pure.DI.Core;
 
 using System.Text.RegularExpressions;

diff --git a/src/Pure.DI.Core/Core/Cache.cs b/src/Pure.DI.Core/Core/Cache.cs
@@ -1,4 +1,5 @@
 // ReSharper disable HeapView.ObjectAllocation.Evident
+// ReSharper disable ClassNeverInstantiated.Global
 namespace Pure.DI.Core;
 
 using System.Collections.Concurrent;

diff --git a/src/Pure.DI.Core/Core/Code/Block.cs b/src/Pure.DI.Core/Core/Code/Block.cs
@@ -2,8 +2,7 @@ namespace Pure.DI.Core.Code;
 
 internal record Block(
     IStatement? Parent,
-    LinkedList<IStatement> Statements,
-    HashSet<MdBinding> Created) : IStatement
+    LinkedList<IStatement> Statements) : IStatement
 {
     public Variable Current => Statements.OfType<Variable>().Last();
 }
diff --git a/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs b/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs
@@ -1,16 +1,19 @@
-namespace Pure.DI.Core.Code;
+// ReSharper disable ClassNeverInstantiated.Global
+namespace Pure.DI.Core.Code;
 
 internal class BlockCodeBuilder: ICodeBuilder<Block>
 {
     public void Build(BuildContext ctx, in Block block)
     {
         var variable = ctx.Variable;
-        if (!TryCreate(variable))
+        if (!TryCreate(ctx, variable))
         {
             return;
         }
 
+        ctx.Code.AppendLine($"// Level {variable.Info.Level}");
         var toCheckExistence = variable.Node.Lifetime != Lifetime.Transient;
+        var level = ctx.Level;
         if (toCheckExistence)
         {
             var checkExpression = variable.InstanceType.IsValueType switch
@@ -32,11 +35,12 @@ public void Build(BuildContext ctx, in Block block)
             ctx.Code.AppendLine($"if ({checkExpression})");
             ctx.Code.AppendLine("{");
             ctx.Code.IncIndent();
+            level++;
         }
-
+        
         foreach (var statement in block.Statements)
         {
-            ctx.StatementBuilder.Build(ctx with{ Variable = statement.Current }, statement);
+            ctx.StatementBuilder.Build(ctx with { Level = level, Variable = statement.Current }, statement);
         }
 
         if (!toCheckExistence)
@@ -69,22 +73,20 @@ public void Build(BuildContext ctx, in Block block)
         ctx.Code.AppendLine();
     }
 
-    private static bool TryCreate(Variable variable)
+    private static bool TryCreate(BuildContext ctx, Variable variable)
     {
         // A transient instance must be created each time
         if (variable.Node.Lifetime == Lifetime.Transient)
         {
             return true;
         }
 
-        // An instance has been created in some parent block
-        if (variable.GetPath().OfType<Block>().Any(i => i.Created.Contains(variable.Node.Binding)))
+        if (ctx.Level >= variable.Info.Level)
         {
             return false;
         }
-
-        // An instance has already been created in the current block
-        var block = variable.GetPath().OfType<Block>().First();
-        return block.Created.Add(variable.Node.Binding);
+
+        variable.Info.Level = ctx.Level;
+        return true;
     }
 }
diff --git a/src/Pure.DI.Core/Core/Code/BuildContext.cs b/src/Pure.DI.Core/Core/Code/BuildContext.cs
@@ -1,6 +1,7 @@
 namespace Pure.DI.Core.Code;
 
 internal record BuildContext(
+    int Level,
     IBuildTools BuildTools,
     ICodeBuilder<IStatement> StatementBuilder,
     DependencyGraph DependencyGraph,

diff --git a/src/Pure.DI.Core/Core/Code/BuildTools.cs b/src/Pure.DI.Core/Core/Code/BuildTools.cs
@@ -1,4 +1,5 @@
 // ReSharper disable InvertIf
+// ReSharper disable ClassNeverInstantiated.Global
 namespace Pure.DI.Core.Code;
 
 internal class BuildTools : IBuildTools

diff --git a/src/Pure.DI.Core/Core/Code/CompositionBuilder.cs b/src/Pure.DI.Core/Core/Code/CompositionBuilder.cs
@@ -1,4 +1,5 @@
 // ReSharper disable InvertIf
+// ReSharper disable ClassNeverInstantiated.Global
 namespace Pure.DI.Core.Code;
 
 internal class CompositionBuilder: IBuilder<DependencyGraph, CompositionCode>
@@ -33,7 +34,7 @@ public CompositionCode Build(DependencyGraph graph)
         {
             _cancellationToken.ThrowIfCancellationRequested();
             var rootBlock = _variablesBuilder.Build(graph.Graph, map, root.Node, root.Injection);
-            var ctx = new BuildContext(_buildTools, _statementBuilder, graph, rootBlock.Current, new LinesBuilder(), default, isThreadSafe);
+            var ctx = new BuildContext(0, _buildTools, _statementBuilder, graph, rootBlock.Current, new LinesBuilder(), default, isThreadSafe);
             foreach (var perResolveVar in map.GetPerResolves())
             {
                 ctx.Code.AppendLine($"{perResolveVar.InstanceType} {perResolveVar.VarName} = default({perResolveVar.InstanceType});");

diff --git a/src/Pure.DI.Core/Core/Code/ConstructCodeBuilder.cs b/src/Pure.DI.Core/Core/Code/ConstructCodeBuilder.cs
@@ -1,3 +1,4 @@
+// ReSharper disable ClassNeverInstantiated.Global
 namespace Pure.DI.Core.Code;
 
 internal class ConstructCodeBuilder : ICodeBuilder<DpConstruct>
@@ -35,6 +36,7 @@ private static void BuildEnumerable(BuildContext ctx)
     {
         var variable = ctx.Variable;
         var code = ctx.Code;
+        var level = ctx.Level + 1;
         var localFuncName = $"LocalFunc_{variable.VarName}";
         code.AppendLine($"{variable.InstanceType} {localFuncName}()");
         code.AppendLine("{");
@@ -43,7 +45,7 @@ private static void BuildEnumerable(BuildContext ctx)
             var hasYieldReturn = false;
             foreach (var statement in variable.Args)
             {
-                ctx.StatementBuilder.Build(ctx with { Variable = statement.Current }, statement);
+                ctx.StatementBuilder.Build(ctx with { Level = level, Variable = statement.Current }, statement);
                 code.AppendLine($"yield return {ctx.BuildTools.OnInjected(ctx, statement.Current)};");
                 hasYieldReturn = true;
             }

diff --git a/src/Pure.DI.Core/Core/Code/FactoryCodeBuilder.cs b/src/Pure.DI.Core/Core/Code/FactoryCodeBuilder.cs
@@ -1,4 +1,5 @@
-namespace Pure.DI.Core.Code;
+// ReSharper disable ClassNeverInstantiated.Global
+namespace Pure.DI.Core.Code;
 
 internal class FactoryCodeBuilder: ICodeBuilder<DpFactory>
 {
@@ -8,6 +9,12 @@ public void Build(BuildContext ctx, in DpFactory factory)
     {
         var variable = ctx.Variable;
         var code = ctx.Code;
+        var level = ctx.Level;
+        if (variable.Node.IsLazy())
+        {
+            level++;
+        }
+
         // Rewrites syntax tree
         var finishLabel = $"label{Names.Salt}{variable.Id}";
         var injections = new List<FactoryRewriter.Injection>();
@@ -43,7 +50,7 @@ public void Build(BuildContext ctx, in DpFactory factory)
                 var (injection, argument) = resolvers.Current;
                 using (code.Indent(indent.Value))
                 {
-                    ctx.StatementBuilder.Build(ctx with { Variable = argument.Current }, argument);
+                    ctx.StatementBuilder.Build(ctx with { Level = level, Variable = argument.Current }, argument);
                     code.AppendLine($"{(injection.DeclarationRequired ? "var " : "")}{injection.VariableName} = {ctx.BuildTools.OnInjected(ctx, argument.Current)};");
                 }
             }

diff --git a/src/Pure.DI.Core/Core/Code/ImplementationCodeBuilder.cs b/src/Pure.DI.Core/Core/Code/ImplementationCodeBuilder.cs
@@ -1,4 +1,5 @@
-namespace Pure.DI.Core.Code;
+// ReSharper disable ClassNeverInstantiated.Global
+namespace Pure.DI.Core.Code;
 
 internal class ImplementationCodeBuilder: ICodeBuilder<DpImplementation>
 {

diff --git a/src/Pure.DI.Core/Core/Code/StatementCodeBuilder.cs b/src/Pure.DI.Core/Core/Code/StatementCodeBuilder.cs
@@ -1,5 +1,6 @@
 // ReSharper disable RedundantJumpStatement
 // ReSharper disable InvertIf
+// ReSharper disable ClassNeverInstantiated.Global
 namespace Pure.DI.Core.Code;
 
 internal class StatementCodeBuilder : ICodeBuilder<IStatement>

diff --git a/src/Pure.DI.Core/Core/Code/Variable.cs b/src/Pure.DI.Core/Core/Code/Variable.cs
@@ -5,7 +5,8 @@ internal record Variable(
         int Id,
         in DependencyNode Node,
         in Injection Injection,
-        ICollection<IStatement> Args)
+        ICollection<IStatement> Args,
+        VariableInfo Info)
         : IStatement
 {
     public Variable Current => this;
@@ -50,5 +51,6 @@ public string VarName
     public void Reset()
     {
         IsCreated = false;
+        Info.Level = int.MaxValue;
     }
 }
diff --git a/src/Pure.DI.Core/Core/Code/VariableCodeBuilder.cs b/src/Pure.DI.Core/Core/Code/VariableCodeBuilder.cs
@@ -1,5 +1,6 @@
 // ReSharper disable InvertIf
 // ReSharper disable RedundantJumpStatement
+// ReSharper disable ClassNeverInstantiated.Global
 namespace Pure.DI.Core.Code;
 
 internal class VariableCodeBuilder : DependenciesWalker<BuildContext>, ICodeBuilder<Variable>

diff --git a/src/Pure.DI.Core/Core/Code/VariableInfo.cs b/src/Pure.DI.Core/Core/Code/VariableInfo.cs
@@ -0,0 +1,6 @@
+namespace Pure.DI.Core.Code;
+
+internal class VariableInfo
+{
+    public int Level = int.MaxValue; 
+}
diff --git a/src/Pure.DI.Core/Core/Code/VariablesBuilder.cs b/src/Pure.DI.Core/Core/Code/VariablesBuilder.cs
@@ -1,3 +1,4 @@
+// ReSharper disable ClassNeverInstantiated.Global
 namespace Pure.DI.Core.Code;
 
 internal class VariablesBuilder : IVariablesBuilder
@@ -11,7 +12,7 @@ public Block Build(
         DependencyNode rootNode,
         Injection rootInjection)
     {
-        var rootBlock = new Block(default, new LinkedList<IStatement>(), new HashSet<MdBinding>());
+        var rootBlock = new Block(default, new LinkedList<IStatement>());
         var rootVar = CreateVariable(rootBlock, map, rootNode, rootInjection);
         rootBlock.Statements.AddFirst(rootVar);
         var blocks = new Stack<Block>();
@@ -65,7 +66,7 @@ public Block Build(
                             var isBlock = depNode.Lifetime != Lifetime.Transient || variable.Node.IsLazy();
                             if (isBlock)
                             {
-                                var depBlock = new Block(currentStatement, new LinkedList<IStatement>(), new HashSet<MdBinding>());
+                                var depBlock = new Block(currentStatement, new LinkedList<IStatement>());
                                 depBlock.Statements.AddFirst(depVariable);
                                 if (!isAlreadyCreated)
                                 {
@@ -125,7 +126,7 @@ private Variable CreateVariable(
         }
 
         var id = GetId(node);
-        var var = new Variable(parent, id, node, injection, new List<IStatement>());
+        var var = new Variable(parent, id, node, injection, new List<IStatement>(), new VariableInfo());
         if (isSharedVar)
         {
             map.Add(node.Binding, var);

diff --git a/src/Pure.DI.Core/Core/TypeConstructor.cs b/src/Pure.DI.Core/Core/TypeConstructor.cs
@@ -1,5 +1,6 @@
 // ReSharper disable InvertIf
 // ReSharper disable once ClassNeverInstantiated.Global
+// ReSharper disable ClassNeverInstantiated.Global
 namespace Pure.DI.Core;
 
 [SuppressMessage("MicrosoftCodeAnalysisCorrectness", "RS1024:Symbols should be compared for equality")]