Streamline BuildGlobResultFromIncludeItem #12178
Open
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
There was a problem hiding this comment.
Pull Request Overview
This PR optimizes the BuildGlobResultFromIncludeItem method to reduce memory allocations by replacing LINQ operations with more efficient manual iteration and array initialization patterns.
- Replaces LINQ
Where().ToArray()with manual foreach loop and lazy list initialization - Replaces LINQ
Select().ToImmutableArray()with direct array allocation and population - Maintains the same filtering logic while improving performance characteristics
Comment on lines
+2627
to
+2645
| List<ItemSpecFragment> includeGobFragmentsList = null; | ||
| foreach (ItemSpecFragment fragment in includeItemspec.Fragments) | ||
| { | ||
| if (fragment is GlobFragment && fragment.TextFragment.AsSpan().IndexOfAny(s_invalidGlobChars) < 0) | ||
| { | ||
| includeGobFragmentsList ??= new List<ItemSpecFragment>(includeItemspec.Fragments.Count); | ||
| includeGobFragmentsList.Add(fragment); | ||
| } | ||
| } | ||
|
|
||
| if (includeGobFragmentsList == null || includeGobFragmentsList.Count == 0) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| ImmutableArray<string> includeGlobStrings = includeGlobFragments.Select(f => f.TextFragment).ToImmutableArray(); | ||
| var includeGlob = CompositeGlob.Create(includeGlobFragments.Select(f => f.ToMSBuildGlob())); | ||
| string[] includeGlobStrings = new string[includeGobFragmentsList.Count]; | ||
| for (int i = 0; i < includeGlobStrings.Length; ++i) | ||
| { | ||
| includeGlobStrings[i] = includeGobFragmentsList[i].TextFragment; |
There was a problem hiding this comment.
Variable name contains a typo: 'includeGobFragmentsList' should be 'includeGlobFragmentsList' (missing 'l' in 'Glob')
Copilot uses AI. Check for mistakes.
Comment on lines
+2627
to
+2645
| List<ItemSpecFragment> includeGobFragmentsList = null; | ||
| foreach (ItemSpecFragment fragment in includeItemspec.Fragments) | ||
| { | ||
| if (fragment is GlobFragment && fragment.TextFragment.AsSpan().IndexOfAny(s_invalidGlobChars) < 0) | ||
| { | ||
| includeGobFragmentsList ??= new List<ItemSpecFragment>(includeItemspec.Fragments.Count); | ||
| includeGobFragmentsList.Add(fragment); | ||
| } | ||
| } | ||
|
|
||
| if (includeGobFragmentsList == null || includeGobFragmentsList.Count == 0) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| ImmutableArray<string> includeGlobStrings = includeGlobFragments.Select(f => f.TextFragment).ToImmutableArray(); | ||
| var includeGlob = CompositeGlob.Create(includeGlobFragments.Select(f => f.ToMSBuildGlob())); | ||
| string[] includeGlobStrings = new string[includeGobFragmentsList.Count]; | ||
| for (int i = 0; i < includeGlobStrings.Length; ++i) | ||
| { | ||
| includeGlobStrings[i] = includeGobFragmentsList[i].TextFragment; |
There was a problem hiding this comment.
Variable name contains a typo: 'includeGobFragmentsList' should be 'includeGlobFragmentsList' (missing 'l' in 'Glob')
Copilot uses AI. Check for mistakes.
Comment on lines
+2627
to
+2645
| List<ItemSpecFragment> includeGobFragmentsList = null; | ||
| foreach (ItemSpecFragment fragment in includeItemspec.Fragments) | ||
| { | ||
| if (fragment is GlobFragment && fragment.TextFragment.AsSpan().IndexOfAny(s_invalidGlobChars) < 0) | ||
| { | ||
| includeGobFragmentsList ??= new List<ItemSpecFragment>(includeItemspec.Fragments.Count); | ||
| includeGobFragmentsList.Add(fragment); | ||
| } | ||
| } | ||
|
|
||
| if (includeGobFragmentsList == null || includeGobFragmentsList.Count == 0) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| ImmutableArray<string> includeGlobStrings = includeGlobFragments.Select(f => f.TextFragment).ToImmutableArray(); | ||
| var includeGlob = CompositeGlob.Create(includeGlobFragments.Select(f => f.ToMSBuildGlob())); | ||
| string[] includeGlobStrings = new string[includeGobFragmentsList.Count]; | ||
| for (int i = 0; i < includeGlobStrings.Length; ++i) | ||
| { | ||
| includeGlobStrings[i] = includeGobFragmentsList[i].TextFragment; |
There was a problem hiding this comment.
Variable name contains a typo: 'includeGobFragmentsList' should be 'includeGlobFragmentsList' (missing 'l' in 'Glob')
Copilot uses AI. Check for mistakes.
Comment on lines
+2627
to
+2648
| List<ItemSpecFragment> includeGobFragmentsList = null; | ||
| foreach (ItemSpecFragment fragment in includeItemspec.Fragments) | ||
| { | ||
| if (fragment is GlobFragment && fragment.TextFragment.AsSpan().IndexOfAny(s_invalidGlobChars) < 0) | ||
| { | ||
| includeGobFragmentsList ??= new List<ItemSpecFragment>(includeItemspec.Fragments.Count); | ||
| includeGobFragmentsList.Add(fragment); | ||
| } | ||
| } | ||
|
|
||
| if (includeGobFragmentsList == null || includeGobFragmentsList.Count == 0) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| ImmutableArray<string> includeGlobStrings = includeGlobFragments.Select(f => f.TextFragment).ToImmutableArray(); | ||
| var includeGlob = CompositeGlob.Create(includeGlobFragments.Select(f => f.ToMSBuildGlob())); | ||
| string[] includeGlobStrings = new string[includeGobFragmentsList.Count]; | ||
| for (int i = 0; i < includeGlobStrings.Length; ++i) | ||
| { | ||
| includeGlobStrings[i] = includeGobFragmentsList[i].TextFragment; | ||
| } | ||
|
|
||
| var includeGlob = CompositeGlob.Create(includeGobFragmentsList.Select(f => f.ToMSBuildGlob())); |
There was a problem hiding this comment.
Variable name contains a typo: 'includeGobFragmentsList' should be 'includeGlobFragmentsList' (missing 'l' in 'Glob')
Copilot uses AI. Check for mistakes.
Comment on lines
+2627
to
+2648
| List<ItemSpecFragment> includeGobFragmentsList = null; | ||
| foreach (ItemSpecFragment fragment in includeItemspec.Fragments) | ||
| { | ||
| if (fragment is GlobFragment && fragment.TextFragment.AsSpan().IndexOfAny(s_invalidGlobChars) < 0) | ||
| { | ||
| includeGobFragmentsList ??= new List<ItemSpecFragment>(includeItemspec.Fragments.Count); | ||
| includeGobFragmentsList.Add(fragment); | ||
| } | ||
| } | ||
|
|
||
| if (includeGobFragmentsList == null || includeGobFragmentsList.Count == 0) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| ImmutableArray<string> includeGlobStrings = includeGlobFragments.Select(f => f.TextFragment).ToImmutableArray(); | ||
| var includeGlob = CompositeGlob.Create(includeGlobFragments.Select(f => f.ToMSBuildGlob())); | ||
| string[] includeGlobStrings = new string[includeGobFragmentsList.Count]; | ||
| for (int i = 0; i < includeGlobStrings.Length; ++i) | ||
| { | ||
| includeGlobStrings[i] = includeGobFragmentsList[i].TextFragment; | ||
| } | ||
|
|
||
| var includeGlob = CompositeGlob.Create(includeGobFragmentsList.Select(f => f.ToMSBuildGlob())); |
There was a problem hiding this comment.
Variable name contains a typo: 'includeGobFragmentsList' should be 'includeGlobFragmentsList' (missing 'l' in 'Glob')
Copilot uses AI. Check for mistakes.
Comment on lines
+2627
to
+2648
| List<ItemSpecFragment> includeGobFragmentsList = null; | ||
| foreach (ItemSpecFragment fragment in includeItemspec.Fragments) | ||
| { | ||
| if (fragment is GlobFragment && fragment.TextFragment.AsSpan().IndexOfAny(s_invalidGlobChars) < 0) | ||
| { | ||
| includeGobFragmentsList ??= new List<ItemSpecFragment>(includeItemspec.Fragments.Count); | ||
| includeGobFragmentsList.Add(fragment); | ||
| } | ||
| } | ||
|
|
||
| if (includeGobFragmentsList == null || includeGobFragmentsList.Count == 0) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| ImmutableArray<string> includeGlobStrings = includeGlobFragments.Select(f => f.TextFragment).ToImmutableArray(); | ||
| var includeGlob = CompositeGlob.Create(includeGlobFragments.Select(f => f.ToMSBuildGlob())); | ||
| string[] includeGlobStrings = new string[includeGobFragmentsList.Count]; | ||
| for (int i = 0; i < includeGlobStrings.Length; ++i) | ||
| { | ||
| includeGlobStrings[i] = includeGobFragmentsList[i].TextFragment; | ||
| } | ||
|
|
||
| var includeGlob = CompositeGlob.Create(includeGobFragmentsList.Select(f => f.ToMSBuildGlob())); |
There was a problem hiding this comment.
Variable name contains a typo: 'includeGobFragmentsList' should be 'includeGlobFragmentsList' (missing 'l' in 'Glob')
Copilot uses AI. Check for mistakes.
Comment on lines
+2627
to
+2648
| List<ItemSpecFragment> includeGobFragmentsList = null; | ||
| foreach (ItemSpecFragment fragment in includeItemspec.Fragments) | ||
| { | ||
| if (fragment is GlobFragment && fragment.TextFragment.AsSpan().IndexOfAny(s_invalidGlobChars) < 0) | ||
| { | ||
| includeGobFragmentsList ??= new List<ItemSpecFragment>(includeItemspec.Fragments.Count); | ||
| includeGobFragmentsList.Add(fragment); | ||
| } | ||
| } | ||
|
|
||
| if (includeGobFragmentsList == null || includeGobFragmentsList.Count == 0) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| ImmutableArray<string> includeGlobStrings = includeGlobFragments.Select(f => f.TextFragment).ToImmutableArray(); | ||
| var includeGlob = CompositeGlob.Create(includeGlobFragments.Select(f => f.ToMSBuildGlob())); | ||
| string[] includeGlobStrings = new string[includeGobFragmentsList.Count]; | ||
| for (int i = 0; i < includeGlobStrings.Length; ++i) | ||
| { | ||
| includeGlobStrings[i] = includeGobFragmentsList[i].TextFragment; | ||
| } | ||
|
|
||
| var includeGlob = CompositeGlob.Create(includeGobFragmentsList.Select(f => f.ToMSBuildGlob())); |
There was a problem hiding this comment.
Variable name contains a typo: 'includeGobFragmentsList' should be 'includeGlobFragmentsList' (missing 'l' in 'Glob')
Copilot uses AI. Check for mistakes.
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.
Fixes #
Context
There are some easy allocation wins in
BuildGlobResultFromIncludeItem(), and the highlighted lines can either be reduced or removed:Here is the method after changes:
Changes Made
Testing
Notes