cleanups

peachpiecompiler · May 9, 2024 · a861c32 · a861c32
1 parent d8f7544
commit a861c32
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/Peachpie.CodeAnalysis/Semantics/SemanticsBinder.cs b/src/Peachpie.CodeAnalysis/Semantics/SemanticsBinder.cs
@@ -2,6 +2,7 @@
 using Devsense.PHP.Text;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Operations;
+using Microsoft.CodeAnalysis.PooledObjects;
 using Pchp.CodeAnalysis.Symbols;
 using Roslyn.Utilities;
 using System;
@@ -10,7 +11,6 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using AST = Devsense.PHP.Syntax.Ast;
 using Pchp.CodeAnalysis.Semantics.Graph;
 using Pchp.CodeAnalysis.FlowAnalysis;
@@ -1095,8 +1095,8 @@ protected ImmutableArray<BoundArrayItem> BindArrayItems(ReadOnlySpan<AST.Item> i
                 return ImmutableArray<BoundArrayItem>.Empty;
             }
 
-            var builder = ImmutableArray.CreateBuilder<BoundArrayItem>(items.Length);
-
+            var builder = ArrayBuilder<BoundArrayItem>.GetInstance();
+            
             foreach (var x in items)
             {
                 if (x == null)
@@ -1124,7 +1124,7 @@ protected ImmutableArray<BoundArrayItem> BindArrayItems(ReadOnlySpan<AST.Item> i
             }
 
             //
-            return builder.ToImmutable();
+            return builder.ToImmutableAndFree();
         }
 
         protected BoundExpression BindItemUse(AST.ItemUse x, BoundAccess access)

diff --git a/src/Peachpie.CodeAnalysis/Symbols/PE/PENamedTypeSymbol.cs b/src/Peachpie.CodeAnalysis/Symbols/PE/PENamedTypeSymbol.cs
@@ -980,15 +980,13 @@ public override ImmutableArray<Symbol> GetMembers(string name)
         {
             EnsureAllMembersAreLoaded();
 
-            ImmutableArray<Symbol> m;
-            if (!_lazyMembersByName.TryGetValue(name, out m))
+            if (!_lazyMembersByName.TryGetValue(name, out var m))
             {
                 m = ImmutableArray<Symbol>.Empty;
             }
 
             // nested types are not common, but we need to check just in case
-            ImmutableArray<PENamedTypeSymbol> t;
-            if (_lazyNestedTypes.TryGetValue(name, out t))
+            if (_lazyNestedTypes.TryGetValue(name, out var t))
             {
                 m = m.Concat(StaticCast<Symbol>.From(t));
             }

diff --git a/src/Peachpie.CodeAnalysis/Symbols/SubstitutedNamedTypeSymbol.cs b/src/Peachpie.CodeAnalysis/Symbols/SubstitutedNamedTypeSymbol.cs
@@ -378,9 +378,8 @@ public sealed override ImmutableArray<Symbol> GetMembers(string name)
         {
             if (_unbound) return StaticCast<Symbol>.From(GetTypeMembers(name));
 
-            ImmutableArray<Symbol> result;
             var cache = _lazyMembersByNameCache;
-            if (cache != null && cache.TryGetValue(name, out result))
+            if (cache != null && cache.TryGetValue(name, out var result))
             {
                 return result;
             }