Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks - #118467

Merged
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46
Aug 7, 2025
Merged

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks#118467
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46

Conversation

CopilotAI commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

This PR simplifies the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() implementation by merging the MoveNextRare helper method directly into MoveNext, following the pattern established by the recent improvement to List<T>.Enumerator. Additionally, it replaces manual exception throwing with ThrowHelper calls to improve method inlining performance.

Changes Made

  • Merged MoveNextRare logic into MoveNext: The version validation and end-of-enumeration handling is now done directly in the main MoveNext method
  • Removed the MoveNextRare helper method: No longer needed since its logic is integrated into MoveNext
  • Simplified control flow: The method now checks version first (throwing on mismatch), then bounds, matching the pattern used in List<T>.Enumerator
  • Improved inlining performance: Replaced manual throw new InvalidOperationException(SR.InvalidOperation_EnumFailedVersion) with System.Collections.ThrowHelper.ThrowVersionCheckFailed() calls in both MoveNext and Reset methods
  • Consistent index handling: Changed _index = localQueue._size + 1 to _index = -1 to match the pattern used in List<T>.Enumerator

Before

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version==localQueue._version&&((uint)_index<(uint)localQueue._size)){_current=localQueue._nodes[_index];_index++;returntrue;}returnMoveNextRare();}privateboolMoveNextRare(){if(_version!=_queue._version){thrownewInvalidOperationException(SR.InvalidOperation_EnumFailedVersion);}_index=_queue._size+1;_current=default;returnfalse;}

After

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version!=localQueue._version){System.Collections.ThrowHelper.ThrowVersionCheckFailed();}if((uint)_index<(uint)localQueue._size){_current=localQueue._nodes[_index];_index++;returntrue;}_current=default;_index=-1;returnfalse;}

Benefits

  • Simplified code structure: Eliminates the helper method call overhead
  • Consistent pattern: Matches the approach used in List<T>.Enumerator after its recent improvement, including the -1 index value for end-of-enumeration
  • Maintained behavior: Preserves all existing functionality and error handling
  • Better performance: Potential minor performance improvement by avoiding method calls in failure cases and better inlining characteristics through ThrowHelper usage

All existing tests pass (33,438 System.Collections tests), confirming the change maintains correctness while improving the implementation.


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title [WIP] Merge PriorityQueue<TElement,TPriority>.Enumerator.MoveNextRare into MoveNext to simplify implementationMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 22:26
… throwing
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checksAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 23:44
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
Co-authored-by: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
@stephentoub
stephentoub marked this pull request as ready for review August 7, 2025 01:15
CopilotAI review requested due to automatic review settings August 7, 2025 01:15

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR optimizes the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() method by inlining the MoveNextRare helper method and using ThrowHelper for better performance. The changes align the implementation with patterns used in List<T>.Enumerator after its recent improvements.

Key changes:

  • Merged MoveNextRare logic directly into MoveNext to eliminate method call overhead
  • Replaced manual exception throwing with ThrowHelper.ThrowVersionCheckFailed() for better inlining
  • Changed end-of-enumeration index from _queue._size + 1 to -1 for consistency with other enumerators

@stephentoub
stephentoub enabled auto-merge (squash) August 7, 2025 01:16
@xtqqczze

Copy link
Copy Markdown
Contributor

localQueue is not required for correctness or optimization and can be safely removed.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@xtqqczze@stephentoub@eiriktsarpalis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks - #118467

Merged
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46
Aug 7, 2025
Merged

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks#118467
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46

Conversation

CopilotAI commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

This PR simplifies the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() implementation by merging the MoveNextRare helper method directly into MoveNext, following the pattern established by the recent improvement to List<T>.Enumerator. Additionally, it replaces manual exception throwing with ThrowHelper calls to improve method inlining performance.

Changes Made

  • Merged MoveNextRare logic into MoveNext: The version validation and end-of-enumeration handling is now done directly in the main MoveNext method
  • Removed the MoveNextRare helper method: No longer needed since its logic is integrated into MoveNext
  • Simplified control flow: The method now checks version first (throwing on mismatch), then bounds, matching the pattern used in List<T>.Enumerator
  • Improved inlining performance: Replaced manual throw new InvalidOperationException(SR.InvalidOperation_EnumFailedVersion) with System.Collections.ThrowHelper.ThrowVersionCheckFailed() calls in both MoveNext and Reset methods
  • Consistent index handling: Changed _index = localQueue._size + 1 to _index = -1 to match the pattern used in List<T>.Enumerator

Before

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version==localQueue._version&&((uint)_index<(uint)localQueue._size)){_current=localQueue._nodes[_index];_index++;returntrue;}returnMoveNextRare();}privateboolMoveNextRare(){if(_version!=_queue._version){thrownewInvalidOperationException(SR.InvalidOperation_EnumFailedVersion);}_index=_queue._size+1;_current=default;returnfalse;}

After

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version!=localQueue._version){System.Collections.ThrowHelper.ThrowVersionCheckFailed();}if((uint)_index<(uint)localQueue._size){_current=localQueue._nodes[_index];_index++;returntrue;}_current=default;_index=-1;returnfalse;}

Benefits

  • Simplified code structure: Eliminates the helper method call overhead
  • Consistent pattern: Matches the approach used in List<T>.Enumerator after its recent improvement, including the -1 index value for end-of-enumeration
  • Maintained behavior: Preserves all existing functionality and error handling
  • Better performance: Potential minor performance improvement by avoiding method calls in failure cases and better inlining characteristics through ThrowHelper usage

All existing tests pass (33,438 System.Collections tests), confirming the change maintains correctness while improving the implementation.


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title [WIP] Merge PriorityQueue<TElement,TPriority>.Enumerator.MoveNextRare into MoveNext to simplify implementationMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 22:26
… throwing
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checksAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 23:44
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
Co-authored-by: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
@stephentoub
stephentoub marked this pull request as ready for review August 7, 2025 01:15
CopilotAI review requested due to automatic review settings August 7, 2025 01:15

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR optimizes the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() method by inlining the MoveNextRare helper method and using ThrowHelper for better performance. The changes align the implementation with patterns used in List<T>.Enumerator after its recent improvements.

Key changes:

  • Merged MoveNextRare logic directly into MoveNext to eliminate method call overhead
  • Replaced manual exception throwing with ThrowHelper.ThrowVersionCheckFailed() for better inlining
  • Changed end-of-enumeration index from _queue._size + 1 to -1 for consistency with other enumerators

@stephentoub
stephentoub enabled auto-merge (squash) August 7, 2025 01:16
@xtqqczze

Copy link
Copy Markdown
Contributor

localQueue is not required for correctness or optimization and can be safely removed.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@xtqqczze@stephentoub@eiriktsarpalis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks - #118467

Merged
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46
Aug 7, 2025
Merged

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks#118467
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46

Conversation

CopilotAI commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

This PR simplifies the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() implementation by merging the MoveNextRare helper method directly into MoveNext, following the pattern established by the recent improvement to List<T>.Enumerator. Additionally, it replaces manual exception throwing with ThrowHelper calls to improve method inlining performance.

Changes Made

  • Merged MoveNextRare logic into MoveNext: The version validation and end-of-enumeration handling is now done directly in the main MoveNext method
  • Removed the MoveNextRare helper method: No longer needed since its logic is integrated into MoveNext
  • Simplified control flow: The method now checks version first (throwing on mismatch), then bounds, matching the pattern used in List<T>.Enumerator
  • Improved inlining performance: Replaced manual throw new InvalidOperationException(SR.InvalidOperation_EnumFailedVersion) with System.Collections.ThrowHelper.ThrowVersionCheckFailed() calls in both MoveNext and Reset methods
  • Consistent index handling: Changed _index = localQueue._size + 1 to _index = -1 to match the pattern used in List<T>.Enumerator

Before

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version==localQueue._version&&((uint)_index<(uint)localQueue._size)){_current=localQueue._nodes[_index];_index++;returntrue;}returnMoveNextRare();}privateboolMoveNextRare(){if(_version!=_queue._version){thrownewInvalidOperationException(SR.InvalidOperation_EnumFailedVersion);}_index=_queue._size+1;_current=default;returnfalse;}

After

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version!=localQueue._version){System.Collections.ThrowHelper.ThrowVersionCheckFailed();}if((uint)_index<(uint)localQueue._size){_current=localQueue._nodes[_index];_index++;returntrue;}_current=default;_index=-1;returnfalse;}

Benefits

  • Simplified code structure: Eliminates the helper method call overhead
  • Consistent pattern: Matches the approach used in List<T>.Enumerator after its recent improvement, including the -1 index value for end-of-enumeration
  • Maintained behavior: Preserves all existing functionality and error handling
  • Better performance: Potential minor performance improvement by avoiding method calls in failure cases and better inlining characteristics through ThrowHelper usage

All existing tests pass (33,438 System.Collections tests), confirming the change maintains correctness while improving the implementation.


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title [WIP] Merge PriorityQueue<TElement,TPriority>.Enumerator.MoveNextRare into MoveNext to simplify implementationMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 22:26
… throwing
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checksAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 23:44
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
Co-authored-by: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
@stephentoub
stephentoub marked this pull request as ready for review August 7, 2025 01:15
CopilotAI review requested due to automatic review settings August 7, 2025 01:15

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR optimizes the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() method by inlining the MoveNextRare helper method and using ThrowHelper for better performance. The changes align the implementation with patterns used in List<T>.Enumerator after its recent improvements.

Key changes:

  • Merged MoveNextRare logic directly into MoveNext to eliminate method call overhead
  • Replaced manual exception throwing with ThrowHelper.ThrowVersionCheckFailed() for better inlining
  • Changed end-of-enumeration index from _queue._size + 1 to -1 for consistency with other enumerators

@stephentoub
stephentoub enabled auto-merge (squash) August 7, 2025 01:16
@xtqqczze

Copy link
Copy Markdown
Contributor

localQueue is not required for correctness or optimization and can be safely removed.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@xtqqczze@stephentoub@eiriktsarpalis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks - #118467

Merged
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46
Aug 7, 2025
Merged

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks#118467
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46

Conversation

CopilotAI commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

This PR simplifies the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() implementation by merging the MoveNextRare helper method directly into MoveNext, following the pattern established by the recent improvement to List<T>.Enumerator. Additionally, it replaces manual exception throwing with ThrowHelper calls to improve method inlining performance.

Changes Made

  • Merged MoveNextRare logic into MoveNext: The version validation and end-of-enumeration handling is now done directly in the main MoveNext method
  • Removed the MoveNextRare helper method: No longer needed since its logic is integrated into MoveNext
  • Simplified control flow: The method now checks version first (throwing on mismatch), then bounds, matching the pattern used in List<T>.Enumerator
  • Improved inlining performance: Replaced manual throw new InvalidOperationException(SR.InvalidOperation_EnumFailedVersion) with System.Collections.ThrowHelper.ThrowVersionCheckFailed() calls in both MoveNext and Reset methods
  • Consistent index handling: Changed _index = localQueue._size + 1 to _index = -1 to match the pattern used in List<T>.Enumerator

Before

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version==localQueue._version&&((uint)_index<(uint)localQueue._size)){_current=localQueue._nodes[_index];_index++;returntrue;}returnMoveNextRare();}privateboolMoveNextRare(){if(_version!=_queue._version){thrownewInvalidOperationException(SR.InvalidOperation_EnumFailedVersion);}_index=_queue._size+1;_current=default;returnfalse;}

After

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version!=localQueue._version){System.Collections.ThrowHelper.ThrowVersionCheckFailed();}if((uint)_index<(uint)localQueue._size){_current=localQueue._nodes[_index];_index++;returntrue;}_current=default;_index=-1;returnfalse;}

Benefits

  • Simplified code structure: Eliminates the helper method call overhead
  • Consistent pattern: Matches the approach used in List<T>.Enumerator after its recent improvement, including the -1 index value for end-of-enumeration
  • Maintained behavior: Preserves all existing functionality and error handling
  • Better performance: Potential minor performance improvement by avoiding method calls in failure cases and better inlining characteristics through ThrowHelper usage

All existing tests pass (33,438 System.Collections tests), confirming the change maintains correctness while improving the implementation.


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title [WIP] Merge PriorityQueue<TElement,TPriority>.Enumerator.MoveNextRare into MoveNext to simplify implementationMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 22:26
… throwing
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checksAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 23:44
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
Co-authored-by: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
@stephentoub
stephentoub marked this pull request as ready for review August 7, 2025 01:15
CopilotAI review requested due to automatic review settings August 7, 2025 01:15

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR optimizes the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() method by inlining the MoveNextRare helper method and using ThrowHelper for better performance. The changes align the implementation with patterns used in List<T>.Enumerator after its recent improvements.

Key changes:

  • Merged MoveNextRare logic directly into MoveNext to eliminate method call overhead
  • Replaced manual exception throwing with ThrowHelper.ThrowVersionCheckFailed() for better inlining
  • Changed end-of-enumeration index from _queue._size + 1 to -1 for consistency with other enumerators

@stephentoub
stephentoub enabled auto-merge (squash) August 7, 2025 01:16
@xtqqczze

Copy link
Copy Markdown
Contributor

localQueue is not required for correctness or optimization and can be safely removed.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@xtqqczze@stephentoub@eiriktsarpalis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks - #118467

Merged
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46
Aug 7, 2025
Merged

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks#118467
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46

Conversation

CopilotAI commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

This PR simplifies the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() implementation by merging the MoveNextRare helper method directly into MoveNext, following the pattern established by the recent improvement to List<T>.Enumerator. Additionally, it replaces manual exception throwing with ThrowHelper calls to improve method inlining performance.

Changes Made

  • Merged MoveNextRare logic into MoveNext: The version validation and end-of-enumeration handling is now done directly in the main MoveNext method
  • Removed the MoveNextRare helper method: No longer needed since its logic is integrated into MoveNext
  • Simplified control flow: The method now checks version first (throwing on mismatch), then bounds, matching the pattern used in List<T>.Enumerator
  • Improved inlining performance: Replaced manual throw new InvalidOperationException(SR.InvalidOperation_EnumFailedVersion) with System.Collections.ThrowHelper.ThrowVersionCheckFailed() calls in both MoveNext and Reset methods
  • Consistent index handling: Changed _index = localQueue._size + 1 to _index = -1 to match the pattern used in List<T>.Enumerator

Before

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version==localQueue._version&&((uint)_index<(uint)localQueue._size)){_current=localQueue._nodes[_index];_index++;returntrue;}returnMoveNextRare();}privateboolMoveNextRare(){if(_version!=_queue._version){thrownewInvalidOperationException(SR.InvalidOperation_EnumFailedVersion);}_index=_queue._size+1;_current=default;returnfalse;}

After

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version!=localQueue._version){System.Collections.ThrowHelper.ThrowVersionCheckFailed();}if((uint)_index<(uint)localQueue._size){_current=localQueue._nodes[_index];_index++;returntrue;}_current=default;_index=-1;returnfalse;}

Benefits

  • Simplified code structure: Eliminates the helper method call overhead
  • Consistent pattern: Matches the approach used in List<T>.Enumerator after its recent improvement, including the -1 index value for end-of-enumeration
  • Maintained behavior: Preserves all existing functionality and error handling
  • Better performance: Potential minor performance improvement by avoiding method calls in failure cases and better inlining characteristics through ThrowHelper usage

All existing tests pass (33,438 System.Collections tests), confirming the change maintains correctness while improving the implementation.


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title [WIP] Merge PriorityQueue<TElement,TPriority>.Enumerator.MoveNextRare into MoveNext to simplify implementationMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 22:26
… throwing
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checksAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 23:44
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
Co-authored-by: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
@stephentoub
stephentoub marked this pull request as ready for review August 7, 2025 01:15
CopilotAI review requested due to automatic review settings August 7, 2025 01:15

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR optimizes the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() method by inlining the MoveNextRare helper method and using ThrowHelper for better performance. The changes align the implementation with patterns used in List<T>.Enumerator after its recent improvements.

Key changes:

  • Merged MoveNextRare logic directly into MoveNext to eliminate method call overhead
  • Replaced manual exception throwing with ThrowHelper.ThrowVersionCheckFailed() for better inlining
  • Changed end-of-enumeration index from _queue._size + 1 to -1 for consistency with other enumerators

@stephentoub
stephentoub enabled auto-merge (squash) August 7, 2025 01:16
@xtqqczze

Copy link
Copy Markdown
Contributor

localQueue is not required for correctness or optimization and can be safely removed.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@xtqqczze@stephentoub@eiriktsarpalis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks - #118467

Merged
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46
Aug 7, 2025
Merged

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks#118467
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46

Conversation

CopilotAI commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

This PR simplifies the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() implementation by merging the MoveNextRare helper method directly into MoveNext, following the pattern established by the recent improvement to List<T>.Enumerator. Additionally, it replaces manual exception throwing with ThrowHelper calls to improve method inlining performance.

Changes Made

  • Merged MoveNextRare logic into MoveNext: The version validation and end-of-enumeration handling is now done directly in the main MoveNext method
  • Removed the MoveNextRare helper method: No longer needed since its logic is integrated into MoveNext
  • Simplified control flow: The method now checks version first (throwing on mismatch), then bounds, matching the pattern used in List<T>.Enumerator
  • Improved inlining performance: Replaced manual throw new InvalidOperationException(SR.InvalidOperation_EnumFailedVersion) with System.Collections.ThrowHelper.ThrowVersionCheckFailed() calls in both MoveNext and Reset methods
  • Consistent index handling: Changed _index = localQueue._size + 1 to _index = -1 to match the pattern used in List<T>.Enumerator

Before

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version==localQueue._version&&((uint)_index<(uint)localQueue._size)){_current=localQueue._nodes[_index];_index++;returntrue;}returnMoveNextRare();}privateboolMoveNextRare(){if(_version!=_queue._version){thrownewInvalidOperationException(SR.InvalidOperation_EnumFailedVersion);}_index=_queue._size+1;_current=default;returnfalse;}

After

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version!=localQueue._version){System.Collections.ThrowHelper.ThrowVersionCheckFailed();}if((uint)_index<(uint)localQueue._size){_current=localQueue._nodes[_index];_index++;returntrue;}_current=default;_index=-1;returnfalse;}

Benefits

  • Simplified code structure: Eliminates the helper method call overhead
  • Consistent pattern: Matches the approach used in List<T>.Enumerator after its recent improvement, including the -1 index value for end-of-enumeration
  • Maintained behavior: Preserves all existing functionality and error handling
  • Better performance: Potential minor performance improvement by avoiding method calls in failure cases and better inlining characteristics through ThrowHelper usage

All existing tests pass (33,438 System.Collections tests), confirming the change maintains correctness while improving the implementation.


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title [WIP] Merge PriorityQueue<TElement,TPriority>.Enumerator.MoveNextRare into MoveNext to simplify implementationMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 22:26
… throwing
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checksAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 23:44
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
Co-authored-by: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
@stephentoub
stephentoub marked this pull request as ready for review August 7, 2025 01:15
CopilotAI review requested due to automatic review settings August 7, 2025 01:15

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR optimizes the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() method by inlining the MoveNextRare helper method and using ThrowHelper for better performance. The changes align the implementation with patterns used in List<T>.Enumerator after its recent improvements.

Key changes:

  • Merged MoveNextRare logic directly into MoveNext to eliminate method call overhead
  • Replaced manual exception throwing with ThrowHelper.ThrowVersionCheckFailed() for better inlining
  • Changed end-of-enumeration index from _queue._size + 1 to -1 for consistency with other enumerators

@stephentoub
stephentoub enabled auto-merge (squash) August 7, 2025 01:16
@xtqqczze

Copy link
Copy Markdown
Contributor

localQueue is not required for correctness or optimization and can be safely removed.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@xtqqczze@stephentoub@eiriktsarpalis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks - #118467

Merged
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46
Aug 7, 2025
Merged

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks#118467
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46

Conversation

CopilotAI commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

This PR simplifies the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() implementation by merging the MoveNextRare helper method directly into MoveNext, following the pattern established by the recent improvement to List<T>.Enumerator. Additionally, it replaces manual exception throwing with ThrowHelper calls to improve method inlining performance.

Changes Made

  • Merged MoveNextRare logic into MoveNext: The version validation and end-of-enumeration handling is now done directly in the main MoveNext method
  • Removed the MoveNextRare helper method: No longer needed since its logic is integrated into MoveNext
  • Simplified control flow: The method now checks version first (throwing on mismatch), then bounds, matching the pattern used in List<T>.Enumerator
  • Improved inlining performance: Replaced manual throw new InvalidOperationException(SR.InvalidOperation_EnumFailedVersion) with System.Collections.ThrowHelper.ThrowVersionCheckFailed() calls in both MoveNext and Reset methods
  • Consistent index handling: Changed _index = localQueue._size + 1 to _index = -1 to match the pattern used in List<T>.Enumerator

Before

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version==localQueue._version&&((uint)_index<(uint)localQueue._size)){_current=localQueue._nodes[_index];_index++;returntrue;}returnMoveNextRare();}privateboolMoveNextRare(){if(_version!=_queue._version){thrownewInvalidOperationException(SR.InvalidOperation_EnumFailedVersion);}_index=_queue._size+1;_current=default;returnfalse;}

After

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version!=localQueue._version){System.Collections.ThrowHelper.ThrowVersionCheckFailed();}if((uint)_index<(uint)localQueue._size){_current=localQueue._nodes[_index];_index++;returntrue;}_current=default;_index=-1;returnfalse;}

Benefits

  • Simplified code structure: Eliminates the helper method call overhead
  • Consistent pattern: Matches the approach used in List<T>.Enumerator after its recent improvement, including the -1 index value for end-of-enumeration
  • Maintained behavior: Preserves all existing functionality and error handling
  • Better performance: Potential minor performance improvement by avoiding method calls in failure cases and better inlining characteristics through ThrowHelper usage

All existing tests pass (33,438 System.Collections tests), confirming the change maintains correctness while improving the implementation.


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title [WIP] Merge PriorityQueue<TElement,TPriority>.Enumerator.MoveNextRare into MoveNext to simplify implementationMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 22:26
… throwing
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checksAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 23:44
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
Co-authored-by: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
@stephentoub
stephentoub marked this pull request as ready for review August 7, 2025 01:15
CopilotAI review requested due to automatic review settings August 7, 2025 01:15

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR optimizes the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() method by inlining the MoveNextRare helper method and using ThrowHelper for better performance. The changes align the implementation with patterns used in List<T>.Enumerator after its recent improvements.

Key changes:

  • Merged MoveNextRare logic directly into MoveNext to eliminate method call overhead
  • Replaced manual exception throwing with ThrowHelper.ThrowVersionCheckFailed() for better inlining
  • Changed end-of-enumeration index from _queue._size + 1 to -1 for consistency with other enumerators

@stephentoub
stephentoub enabled auto-merge (squash) August 7, 2025 01:16
@xtqqczze

Copy link
Copy Markdown
Contributor

localQueue is not required for correctness or optimization and can be safely removed.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@xtqqczze@stephentoub@eiriktsarpalis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks - #118467

Merged
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46
Aug 7, 2025
Merged

Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checks#118467
stephentoub merged 5 commits into
mainfrom
copilot/fix-ad880edc-20a2-480a-b30e-c820cc9a9a46

Conversation

CopilotAI commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

This PR simplifies the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() implementation by merging the MoveNextRare helper method directly into MoveNext, following the pattern established by the recent improvement to List<T>.Enumerator. Additionally, it replaces manual exception throwing with ThrowHelper calls to improve method inlining performance.

Changes Made

  • Merged MoveNextRare logic into MoveNext: The version validation and end-of-enumeration handling is now done directly in the main MoveNext method
  • Removed the MoveNextRare helper method: No longer needed since its logic is integrated into MoveNext
  • Simplified control flow: The method now checks version first (throwing on mismatch), then bounds, matching the pattern used in List<T>.Enumerator
  • Improved inlining performance: Replaced manual throw new InvalidOperationException(SR.InvalidOperation_EnumFailedVersion) with System.Collections.ThrowHelper.ThrowVersionCheckFailed() calls in both MoveNext and Reset methods
  • Consistent index handling: Changed _index = localQueue._size + 1 to _index = -1 to match the pattern used in List<T>.Enumerator

Before

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version==localQueue._version&&((uint)_index<(uint)localQueue._size)){_current=localQueue._nodes[_index];_index++;returntrue;}returnMoveNextRare();}privateboolMoveNextRare(){if(_version!=_queue._version){thrownewInvalidOperationException(SR.InvalidOperation_EnumFailedVersion);}_index=_queue._size+1;_current=default;returnfalse;}

After

publicboolMoveNext(){PriorityQueue<TElement,TPriority>localQueue=_queue;if(_version!=localQueue._version){System.Collections.ThrowHelper.ThrowVersionCheckFailed();}if((uint)_index<(uint)localQueue._size){_current=localQueue._nodes[_index];_index++;returntrue;}_current=default;_index=-1;returnfalse;}

Benefits

  • Simplified code structure: Eliminates the helper method call overhead
  • Consistent pattern: Matches the approach used in List<T>.Enumerator after its recent improvement, including the -1 index value for end-of-enumeration
  • Maintained behavior: Preserves all existing functionality and error handling
  • Better performance: Potential minor performance improvement by avoiding method calls in failure cases and better inlining characteristics through ThrowHelper usage

All existing tests pass (33,438 System.Collections tests), confirming the change maintains correctness while improving the implementation.


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title [WIP] Merge PriorityQueue<TElement,TPriority>.Enumerator.MoveNextRare into MoveNext to simplify implementationMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 22:26
… throwing
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
CopilotAI changed the title Merge PriorityQueue.Enumerator.MoveNextRare into MoveNext methodMerge PriorityQueue.Enumerator.MoveNextRare into MoveNext and use ThrowHelper for version checksAug 6, 2025
CopilotAI requested a review from stephentoubAugust 6, 2025 23:44
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
Co-authored-by: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
@stephentoub
stephentoub marked this pull request as ready for review August 7, 2025 01:15
CopilotAI review requested due to automatic review settings August 7, 2025 01:15

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR optimizes the PriorityQueue<TElement, TPriority>.UnorderedItemsCollection.Enumerator.MoveNext() method by inlining the MoveNextRare helper method and using ThrowHelper for better performance. The changes align the implementation with patterns used in List<T>.Enumerator after its recent improvements.

Key changes:

  • Merged MoveNextRare logic directly into MoveNext to eliminate method call overhead
  • Replaced manual exception throwing with ThrowHelper.ThrowVersionCheckFailed() for better inlining
  • Changed end-of-enumeration index from _queue._size + 1 to -1 for consistency with other enumerators

@stephentoub
stephentoub enabled auto-merge (squash) August 7, 2025 01:16
@xtqqczze

Copy link
Copy Markdown
Contributor

localQueue is not required for correctness or optimization and can be safely removed.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@xtqqczze@stephentoub@eiriktsarpalis