Reapply "Create a single copy of stub templates - #115749

Merged
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert
May 20, 2025
Merged

Reapply "Create a single copy of stub templates#115749
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert

Conversation

@davidwrighton

@davidwrightondavidwrighton commented May 19, 2025

Copy link
Copy Markdown
Member

Revert PR #115665 which reverted #114462

@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @mangod9
See info in area-owners.md if you want to be subscribed.

@davidwrighton
davidwrighton marked this pull request as ready for review May 19, 2025 23:25
CopilotAI review requested due to automatic review settings May 19, 2025 23:25

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 reverts previous changes that affected the creation of a single copy of stub templates and disables the feature on Apple platforms pending resolution of dotnet/diagnostics#5487.

  • Reintroduces changes to use standard integer types (uint8_t and size_t) in function signatures.
  • Integrates a new configuration structure (InterleavedLoaderHeapConfig) for loader heap initialization and code page generation.
  • Disables the template mapping feature on Apple platforms and adds related conditional logic.

Reviewed Changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated no comments.

Show a summary per file
FileDescription
src/coreclr/vm/precode.h / precode.cppUpdated function signatures to use uint8_t* and size_t for improved clarity and consistency.
src/coreclr/vm/loaderallocator.cppReplacing function pointer parameters with references to InterleavedLoaderHeapConfig for stub code page generation.
src/coreclr/utilcode/interleavedloaderheap.cppUpdated allocation paths to support template-based thunk allocation and proper configuration initialization.
src/coreclr/inc/loaderheap.hAdded and updated the configuration structure and its usage in loader heap initialization.
Other filesAdjustments in assembly and executable allocator files to integrate template-based thunk allocation.
Comments suppressed due to low confidence (3)

src/coreclr/utilcode/interleavedloaderheap.cpp:542

  • The integration of the new InterleavedLoaderHeapConfig and its initialization via CreateTemplate appears correct. Please ensure that the template-based allocation paths are covered by adequate tests to validate the behavior under both standard and template-enabled environments.
void InitializeLoaderHeapConfig(InterleavedLoaderHeapConfig *pConfig, size_t stubSize, void* templateInImage, void (*codePageGenerator)(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size))

src/coreclr/vm/precode.h:228

  • Changing function signatures from BYTE* and SIZE_T to uint8_t* and size_t improves type clarity and portability. Please ensure that all related pointer arithmetic and casting remain consistent across the codebase.
static void GenerateCodePage(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size);

src/coreclr/vm/loaderallocator.cpp:1211

  • Replacing the original code page generator function pointer with a reference to the global configuration ensures a centralized management approach. Verify that all caller sites of the loader heap allocation have been updated to work with the new configuration structure.
&s_stubPrecodeHeapConfig

@thaystg

Copy link
Copy Markdown
Member

I think we need to merge and release dbgshim, then bump it everywhere and then merge here. What do you think @tommcdon@davidwrighton ?

@thaystg

Copy link
Copy Markdown
Member

Ah okay, we should enable on Mac after doing what I asked :)

Comment threadsrc/coreclr/clrdefinitions.cmake Outdated

@tommcdontommcdon left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Left a minor comment change for your review

Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@davidwrighton

Copy link
Copy Markdown
MemberAuthor

/ba-g The build break is unrelated and has already been fixed by #115767

@davidwrighton
davidwrighton merged commit 35514ca into dotnet:mainMay 20, 2025
SimaTian pushed a commit that referenced this pull request May 27, 2025
* Reapply "Create a single copy of stub templates (#114462)" (#115665)
This reverts commit f7fc178.
* Disable feature on Apple platforms for now
Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 20, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@davidwrighton@thaystg@tommcdon
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 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

Reapply "Create a single copy of stub templates - #115749

Merged
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert
May 20, 2025
Merged

Reapply "Create a single copy of stub templates#115749
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert

Conversation

@davidwrighton

@davidwrightondavidwrighton commented May 19, 2025

Copy link
Copy Markdown
Member

Revert PR #115665 which reverted #114462

@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @mangod9
See info in area-owners.md if you want to be subscribed.

@davidwrighton
davidwrighton marked this pull request as ready for review May 19, 2025 23:25
CopilotAI review requested due to automatic review settings May 19, 2025 23:25

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 reverts previous changes that affected the creation of a single copy of stub templates and disables the feature on Apple platforms pending resolution of dotnet/diagnostics#5487.

  • Reintroduces changes to use standard integer types (uint8_t and size_t) in function signatures.
  • Integrates a new configuration structure (InterleavedLoaderHeapConfig) for loader heap initialization and code page generation.
  • Disables the template mapping feature on Apple platforms and adds related conditional logic.

Reviewed Changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated no comments.

Show a summary per file
FileDescription
src/coreclr/vm/precode.h / precode.cppUpdated function signatures to use uint8_t* and size_t for improved clarity and consistency.
src/coreclr/vm/loaderallocator.cppReplacing function pointer parameters with references to InterleavedLoaderHeapConfig for stub code page generation.
src/coreclr/utilcode/interleavedloaderheap.cppUpdated allocation paths to support template-based thunk allocation and proper configuration initialization.
src/coreclr/inc/loaderheap.hAdded and updated the configuration structure and its usage in loader heap initialization.
Other filesAdjustments in assembly and executable allocator files to integrate template-based thunk allocation.
Comments suppressed due to low confidence (3)

src/coreclr/utilcode/interleavedloaderheap.cpp:542

  • The integration of the new InterleavedLoaderHeapConfig and its initialization via CreateTemplate appears correct. Please ensure that the template-based allocation paths are covered by adequate tests to validate the behavior under both standard and template-enabled environments.
void InitializeLoaderHeapConfig(InterleavedLoaderHeapConfig *pConfig, size_t stubSize, void* templateInImage, void (*codePageGenerator)(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size))

src/coreclr/vm/precode.h:228

  • Changing function signatures from BYTE* and SIZE_T to uint8_t* and size_t improves type clarity and portability. Please ensure that all related pointer arithmetic and casting remain consistent across the codebase.
static void GenerateCodePage(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size);

src/coreclr/vm/loaderallocator.cpp:1211

  • Replacing the original code page generator function pointer with a reference to the global configuration ensures a centralized management approach. Verify that all caller sites of the loader heap allocation have been updated to work with the new configuration structure.
&s_stubPrecodeHeapConfig

@thaystg

Copy link
Copy Markdown
Member

I think we need to merge and release dbgshim, then bump it everywhere and then merge here. What do you think @tommcdon@davidwrighton ?

@thaystg

Copy link
Copy Markdown
Member

Ah okay, we should enable on Mac after doing what I asked :)

Comment threadsrc/coreclr/clrdefinitions.cmake Outdated

@tommcdontommcdon left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Left a minor comment change for your review

Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@davidwrighton

Copy link
Copy Markdown
MemberAuthor

/ba-g The build break is unrelated and has already been fixed by #115767

@davidwrighton
davidwrighton merged commit 35514ca into dotnet:mainMay 20, 2025
SimaTian pushed a commit that referenced this pull request May 27, 2025
* Reapply "Create a single copy of stub templates (#114462)" (#115665)
This reverts commit f7fc178.
* Disable feature on Apple platforms for now
Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 20, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@davidwrighton@thaystg@tommcdon
, '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

Reapply "Create a single copy of stub templates - #115749

Merged
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert
May 20, 2025
Merged

Reapply "Create a single copy of stub templates#115749
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert

Conversation

@davidwrighton

@davidwrightondavidwrighton commented May 19, 2025

Copy link
Copy Markdown
Member

Revert PR #115665 which reverted #114462

@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @mangod9
See info in area-owners.md if you want to be subscribed.

@davidwrighton
davidwrighton marked this pull request as ready for review May 19, 2025 23:25
CopilotAI review requested due to automatic review settings May 19, 2025 23:25

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 reverts previous changes that affected the creation of a single copy of stub templates and disables the feature on Apple platforms pending resolution of dotnet/diagnostics#5487.

  • Reintroduces changes to use standard integer types (uint8_t and size_t) in function signatures.
  • Integrates a new configuration structure (InterleavedLoaderHeapConfig) for loader heap initialization and code page generation.
  • Disables the template mapping feature on Apple platforms and adds related conditional logic.

Reviewed Changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated no comments.

Show a summary per file
FileDescription
src/coreclr/vm/precode.h / precode.cppUpdated function signatures to use uint8_t* and size_t for improved clarity and consistency.
src/coreclr/vm/loaderallocator.cppReplacing function pointer parameters with references to InterleavedLoaderHeapConfig for stub code page generation.
src/coreclr/utilcode/interleavedloaderheap.cppUpdated allocation paths to support template-based thunk allocation and proper configuration initialization.
src/coreclr/inc/loaderheap.hAdded and updated the configuration structure and its usage in loader heap initialization.
Other filesAdjustments in assembly and executable allocator files to integrate template-based thunk allocation.
Comments suppressed due to low confidence (3)

src/coreclr/utilcode/interleavedloaderheap.cpp:542

  • The integration of the new InterleavedLoaderHeapConfig and its initialization via CreateTemplate appears correct. Please ensure that the template-based allocation paths are covered by adequate tests to validate the behavior under both standard and template-enabled environments.
void InitializeLoaderHeapConfig(InterleavedLoaderHeapConfig *pConfig, size_t stubSize, void* templateInImage, void (*codePageGenerator)(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size))

src/coreclr/vm/precode.h:228

  • Changing function signatures from BYTE* and SIZE_T to uint8_t* and size_t improves type clarity and portability. Please ensure that all related pointer arithmetic and casting remain consistent across the codebase.
static void GenerateCodePage(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size);

src/coreclr/vm/loaderallocator.cpp:1211

  • Replacing the original code page generator function pointer with a reference to the global configuration ensures a centralized management approach. Verify that all caller sites of the loader heap allocation have been updated to work with the new configuration structure.
&s_stubPrecodeHeapConfig

@thaystg

Copy link
Copy Markdown
Member

I think we need to merge and release dbgshim, then bump it everywhere and then merge here. What do you think @tommcdon@davidwrighton ?

@thaystg

Copy link
Copy Markdown
Member

Ah okay, we should enable on Mac after doing what I asked :)

Comment threadsrc/coreclr/clrdefinitions.cmake Outdated

@tommcdontommcdon left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Left a minor comment change for your review

Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@davidwrighton

Copy link
Copy Markdown
MemberAuthor

/ba-g The build break is unrelated and has already been fixed by #115767

@davidwrighton
davidwrighton merged commit 35514ca into dotnet:mainMay 20, 2025
SimaTian pushed a commit that referenced this pull request May 27, 2025
* Reapply "Create a single copy of stub templates (#114462)" (#115665)
This reverts commit f7fc178.
* Disable feature on Apple platforms for now
Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 20, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@davidwrighton@thaystg@tommcdon
, '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 > 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

Reapply "Create a single copy of stub templates - #115749

Merged
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert
May 20, 2025
Merged

Reapply "Create a single copy of stub templates#115749
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert

Conversation

@davidwrighton

@davidwrightondavidwrighton commented May 19, 2025

Copy link
Copy Markdown
Member

Revert PR #115665 which reverted #114462

@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @mangod9
See info in area-owners.md if you want to be subscribed.

@davidwrighton
davidwrighton marked this pull request as ready for review May 19, 2025 23:25
CopilotAI review requested due to automatic review settings May 19, 2025 23:25

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 reverts previous changes that affected the creation of a single copy of stub templates and disables the feature on Apple platforms pending resolution of dotnet/diagnostics#5487.

  • Reintroduces changes to use standard integer types (uint8_t and size_t) in function signatures.
  • Integrates a new configuration structure (InterleavedLoaderHeapConfig) for loader heap initialization and code page generation.
  • Disables the template mapping feature on Apple platforms and adds related conditional logic.

Reviewed Changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated no comments.

Show a summary per file
FileDescription
src/coreclr/vm/precode.h / precode.cppUpdated function signatures to use uint8_t* and size_t for improved clarity and consistency.
src/coreclr/vm/loaderallocator.cppReplacing function pointer parameters with references to InterleavedLoaderHeapConfig for stub code page generation.
src/coreclr/utilcode/interleavedloaderheap.cppUpdated allocation paths to support template-based thunk allocation and proper configuration initialization.
src/coreclr/inc/loaderheap.hAdded and updated the configuration structure and its usage in loader heap initialization.
Other filesAdjustments in assembly and executable allocator files to integrate template-based thunk allocation.
Comments suppressed due to low confidence (3)

src/coreclr/utilcode/interleavedloaderheap.cpp:542

  • The integration of the new InterleavedLoaderHeapConfig and its initialization via CreateTemplate appears correct. Please ensure that the template-based allocation paths are covered by adequate tests to validate the behavior under both standard and template-enabled environments.
void InitializeLoaderHeapConfig(InterleavedLoaderHeapConfig *pConfig, size_t stubSize, void* templateInImage, void (*codePageGenerator)(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size))

src/coreclr/vm/precode.h:228

  • Changing function signatures from BYTE* and SIZE_T to uint8_t* and size_t improves type clarity and portability. Please ensure that all related pointer arithmetic and casting remain consistent across the codebase.
static void GenerateCodePage(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size);

src/coreclr/vm/loaderallocator.cpp:1211

  • Replacing the original code page generator function pointer with a reference to the global configuration ensures a centralized management approach. Verify that all caller sites of the loader heap allocation have been updated to work with the new configuration structure.
&s_stubPrecodeHeapConfig

@thaystg

Copy link
Copy Markdown
Member

I think we need to merge and release dbgshim, then bump it everywhere and then merge here. What do you think @tommcdon@davidwrighton ?

@thaystg

Copy link
Copy Markdown
Member

Ah okay, we should enable on Mac after doing what I asked :)

Comment threadsrc/coreclr/clrdefinitions.cmake Outdated

@tommcdontommcdon left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Left a minor comment change for your review

Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@davidwrighton

Copy link
Copy Markdown
MemberAuthor

/ba-g The build break is unrelated and has already been fixed by #115767

@davidwrighton
davidwrighton merged commit 35514ca into dotnet:mainMay 20, 2025
SimaTian pushed a commit that referenced this pull request May 27, 2025
* Reapply "Create a single copy of stub templates (#114462)" (#115665)
This reverts commit f7fc178.
* Disable feature on Apple platforms for now
Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 20, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@davidwrighton@thaystg@tommcdon
, '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

Reapply "Create a single copy of stub templates - #115749

Merged
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert
May 20, 2025
Merged

Reapply "Create a single copy of stub templates#115749
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert

Conversation

@davidwrighton

@davidwrightondavidwrighton commented May 19, 2025

Copy link
Copy Markdown
Member

Revert PR #115665 which reverted #114462

@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @mangod9
See info in area-owners.md if you want to be subscribed.

@davidwrighton
davidwrighton marked this pull request as ready for review May 19, 2025 23:25
CopilotAI review requested due to automatic review settings May 19, 2025 23:25

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 reverts previous changes that affected the creation of a single copy of stub templates and disables the feature on Apple platforms pending resolution of dotnet/diagnostics#5487.

  • Reintroduces changes to use standard integer types (uint8_t and size_t) in function signatures.
  • Integrates a new configuration structure (InterleavedLoaderHeapConfig) for loader heap initialization and code page generation.
  • Disables the template mapping feature on Apple platforms and adds related conditional logic.

Reviewed Changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated no comments.

Show a summary per file
FileDescription
src/coreclr/vm/precode.h / precode.cppUpdated function signatures to use uint8_t* and size_t for improved clarity and consistency.
src/coreclr/vm/loaderallocator.cppReplacing function pointer parameters with references to InterleavedLoaderHeapConfig for stub code page generation.
src/coreclr/utilcode/interleavedloaderheap.cppUpdated allocation paths to support template-based thunk allocation and proper configuration initialization.
src/coreclr/inc/loaderheap.hAdded and updated the configuration structure and its usage in loader heap initialization.
Other filesAdjustments in assembly and executable allocator files to integrate template-based thunk allocation.
Comments suppressed due to low confidence (3)

src/coreclr/utilcode/interleavedloaderheap.cpp:542

  • The integration of the new InterleavedLoaderHeapConfig and its initialization via CreateTemplate appears correct. Please ensure that the template-based allocation paths are covered by adequate tests to validate the behavior under both standard and template-enabled environments.
void InitializeLoaderHeapConfig(InterleavedLoaderHeapConfig *pConfig, size_t stubSize, void* templateInImage, void (*codePageGenerator)(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size))

src/coreclr/vm/precode.h:228

  • Changing function signatures from BYTE* and SIZE_T to uint8_t* and size_t improves type clarity and portability. Please ensure that all related pointer arithmetic and casting remain consistent across the codebase.
static void GenerateCodePage(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size);

src/coreclr/vm/loaderallocator.cpp:1211

  • Replacing the original code page generator function pointer with a reference to the global configuration ensures a centralized management approach. Verify that all caller sites of the loader heap allocation have been updated to work with the new configuration structure.
&s_stubPrecodeHeapConfig

@thaystg

Copy link
Copy Markdown
Member

I think we need to merge and release dbgshim, then bump it everywhere and then merge here. What do you think @tommcdon@davidwrighton ?

@thaystg

Copy link
Copy Markdown
Member

Ah okay, we should enable on Mac after doing what I asked :)

Comment threadsrc/coreclr/clrdefinitions.cmake Outdated

@tommcdontommcdon left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Left a minor comment change for your review

Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@davidwrighton

Copy link
Copy Markdown
MemberAuthor

/ba-g The build break is unrelated and has already been fixed by #115767

@davidwrighton
davidwrighton merged commit 35514ca into dotnet:mainMay 20, 2025
SimaTian pushed a commit that referenced this pull request May 27, 2025
* Reapply "Create a single copy of stub templates (#114462)" (#115665)
This reverts commit f7fc178.
* Disable feature on Apple platforms for now
Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 20, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@davidwrighton@thaystg@tommcdon
, '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

Reapply "Create a single copy of stub templates - #115749

Merged
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert
May 20, 2025
Merged

Reapply "Create a single copy of stub templates#115749
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert

Conversation

@davidwrighton

@davidwrightondavidwrighton commented May 19, 2025

Copy link
Copy Markdown
Member

Revert PR #115665 which reverted #114462

@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @mangod9
See info in area-owners.md if you want to be subscribed.

@davidwrighton
davidwrighton marked this pull request as ready for review May 19, 2025 23:25
CopilotAI review requested due to automatic review settings May 19, 2025 23:25

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 reverts previous changes that affected the creation of a single copy of stub templates and disables the feature on Apple platforms pending resolution of dotnet/diagnostics#5487.

  • Reintroduces changes to use standard integer types (uint8_t and size_t) in function signatures.
  • Integrates a new configuration structure (InterleavedLoaderHeapConfig) for loader heap initialization and code page generation.
  • Disables the template mapping feature on Apple platforms and adds related conditional logic.

Reviewed Changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated no comments.

Show a summary per file
FileDescription
src/coreclr/vm/precode.h / precode.cppUpdated function signatures to use uint8_t* and size_t for improved clarity and consistency.
src/coreclr/vm/loaderallocator.cppReplacing function pointer parameters with references to InterleavedLoaderHeapConfig for stub code page generation.
src/coreclr/utilcode/interleavedloaderheap.cppUpdated allocation paths to support template-based thunk allocation and proper configuration initialization.
src/coreclr/inc/loaderheap.hAdded and updated the configuration structure and its usage in loader heap initialization.
Other filesAdjustments in assembly and executable allocator files to integrate template-based thunk allocation.
Comments suppressed due to low confidence (3)

src/coreclr/utilcode/interleavedloaderheap.cpp:542

  • The integration of the new InterleavedLoaderHeapConfig and its initialization via CreateTemplate appears correct. Please ensure that the template-based allocation paths are covered by adequate tests to validate the behavior under both standard and template-enabled environments.
void InitializeLoaderHeapConfig(InterleavedLoaderHeapConfig *pConfig, size_t stubSize, void* templateInImage, void (*codePageGenerator)(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size))

src/coreclr/vm/precode.h:228

  • Changing function signatures from BYTE* and SIZE_T to uint8_t* and size_t improves type clarity and portability. Please ensure that all related pointer arithmetic and casting remain consistent across the codebase.
static void GenerateCodePage(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size);

src/coreclr/vm/loaderallocator.cpp:1211

  • Replacing the original code page generator function pointer with a reference to the global configuration ensures a centralized management approach. Verify that all caller sites of the loader heap allocation have been updated to work with the new configuration structure.
&s_stubPrecodeHeapConfig

@thaystg

Copy link
Copy Markdown
Member

I think we need to merge and release dbgshim, then bump it everywhere and then merge here. What do you think @tommcdon@davidwrighton ?

@thaystg

Copy link
Copy Markdown
Member

Ah okay, we should enable on Mac after doing what I asked :)

Comment threadsrc/coreclr/clrdefinitions.cmake Outdated

@tommcdontommcdon left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Left a minor comment change for your review

Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@davidwrighton

Copy link
Copy Markdown
MemberAuthor

/ba-g The build break is unrelated and has already been fixed by #115767

@davidwrighton
davidwrighton merged commit 35514ca into dotnet:mainMay 20, 2025
SimaTian pushed a commit that referenced this pull request May 27, 2025
* Reapply "Create a single copy of stub templates (#114462)" (#115665)
This reverts commit f7fc178.
* Disable feature on Apple platforms for now
Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 20, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@davidwrighton@thaystg@tommcdon
, '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

Reapply "Create a single copy of stub templates - #115749

Merged
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert
May 20, 2025
Merged

Reapply "Create a single copy of stub templates#115749
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert

Conversation

@davidwrighton

@davidwrightondavidwrighton commented May 19, 2025

Copy link
Copy Markdown
Member

Revert PR #115665 which reverted #114462

@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @mangod9
See info in area-owners.md if you want to be subscribed.

@davidwrighton
davidwrighton marked this pull request as ready for review May 19, 2025 23:25
CopilotAI review requested due to automatic review settings May 19, 2025 23:25

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 reverts previous changes that affected the creation of a single copy of stub templates and disables the feature on Apple platforms pending resolution of dotnet/diagnostics#5487.

  • Reintroduces changes to use standard integer types (uint8_t and size_t) in function signatures.
  • Integrates a new configuration structure (InterleavedLoaderHeapConfig) for loader heap initialization and code page generation.
  • Disables the template mapping feature on Apple platforms and adds related conditional logic.

Reviewed Changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated no comments.

Show a summary per file
FileDescription
src/coreclr/vm/precode.h / precode.cppUpdated function signatures to use uint8_t* and size_t for improved clarity and consistency.
src/coreclr/vm/loaderallocator.cppReplacing function pointer parameters with references to InterleavedLoaderHeapConfig for stub code page generation.
src/coreclr/utilcode/interleavedloaderheap.cppUpdated allocation paths to support template-based thunk allocation and proper configuration initialization.
src/coreclr/inc/loaderheap.hAdded and updated the configuration structure and its usage in loader heap initialization.
Other filesAdjustments in assembly and executable allocator files to integrate template-based thunk allocation.
Comments suppressed due to low confidence (3)

src/coreclr/utilcode/interleavedloaderheap.cpp:542

  • The integration of the new InterleavedLoaderHeapConfig and its initialization via CreateTemplate appears correct. Please ensure that the template-based allocation paths are covered by adequate tests to validate the behavior under both standard and template-enabled environments.
void InitializeLoaderHeapConfig(InterleavedLoaderHeapConfig *pConfig, size_t stubSize, void* templateInImage, void (*codePageGenerator)(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size))

src/coreclr/vm/precode.h:228

  • Changing function signatures from BYTE* and SIZE_T to uint8_t* and size_t improves type clarity and portability. Please ensure that all related pointer arithmetic and casting remain consistent across the codebase.
static void GenerateCodePage(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size);

src/coreclr/vm/loaderallocator.cpp:1211

  • Replacing the original code page generator function pointer with a reference to the global configuration ensures a centralized management approach. Verify that all caller sites of the loader heap allocation have been updated to work with the new configuration structure.
&s_stubPrecodeHeapConfig

@thaystg

Copy link
Copy Markdown
Member

I think we need to merge and release dbgshim, then bump it everywhere and then merge here. What do you think @tommcdon@davidwrighton ?

@thaystg

Copy link
Copy Markdown
Member

Ah okay, we should enable on Mac after doing what I asked :)

Comment threadsrc/coreclr/clrdefinitions.cmake Outdated

@tommcdontommcdon left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Left a minor comment change for your review

Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@davidwrighton

Copy link
Copy Markdown
MemberAuthor

/ba-g The build break is unrelated and has already been fixed by #115767

@davidwrighton
davidwrighton merged commit 35514ca into dotnet:mainMay 20, 2025
SimaTian pushed a commit that referenced this pull request May 27, 2025
* Reapply "Create a single copy of stub templates (#114462)" (#115665)
This reverts commit f7fc178.
* Disable feature on Apple platforms for now
Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 20, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@davidwrighton@thaystg@tommcdon
, '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

Reapply "Create a single copy of stub templates - #115749

Merged
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert
May 20, 2025
Merged

Reapply "Create a single copy of stub templates#115749
davidwrighton merged 3 commits into
dotnet:mainfrom
davidwrighton:revert_revert

Conversation

@davidwrighton

@davidwrightondavidwrighton commented May 19, 2025

Copy link
Copy Markdown
Member

Revert PR #115665 which reverted #114462

@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @mangod9
See info in area-owners.md if you want to be subscribed.

@davidwrighton
davidwrighton marked this pull request as ready for review May 19, 2025 23:25
CopilotAI review requested due to automatic review settings May 19, 2025 23:25

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 reverts previous changes that affected the creation of a single copy of stub templates and disables the feature on Apple platforms pending resolution of dotnet/diagnostics#5487.

  • Reintroduces changes to use standard integer types (uint8_t and size_t) in function signatures.
  • Integrates a new configuration structure (InterleavedLoaderHeapConfig) for loader heap initialization and code page generation.
  • Disables the template mapping feature on Apple platforms and adds related conditional logic.

Reviewed Changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated no comments.

Show a summary per file
FileDescription
src/coreclr/vm/precode.h / precode.cppUpdated function signatures to use uint8_t* and size_t for improved clarity and consistency.
src/coreclr/vm/loaderallocator.cppReplacing function pointer parameters with references to InterleavedLoaderHeapConfig for stub code page generation.
src/coreclr/utilcode/interleavedloaderheap.cppUpdated allocation paths to support template-based thunk allocation and proper configuration initialization.
src/coreclr/inc/loaderheap.hAdded and updated the configuration structure and its usage in loader heap initialization.
Other filesAdjustments in assembly and executable allocator files to integrate template-based thunk allocation.
Comments suppressed due to low confidence (3)

src/coreclr/utilcode/interleavedloaderheap.cpp:542

  • The integration of the new InterleavedLoaderHeapConfig and its initialization via CreateTemplate appears correct. Please ensure that the template-based allocation paths are covered by adequate tests to validate the behavior under both standard and template-enabled environments.
void InitializeLoaderHeapConfig(InterleavedLoaderHeapConfig *pConfig, size_t stubSize, void* templateInImage, void (*codePageGenerator)(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size))

src/coreclr/vm/precode.h:228

  • Changing function signatures from BYTE* and SIZE_T to uint8_t* and size_t improves type clarity and portability. Please ensure that all related pointer arithmetic and casting remain consistent across the codebase.
static void GenerateCodePage(uint8_t* pageBase, uint8_t* pageBaseRX, size_t size);

src/coreclr/vm/loaderallocator.cpp:1211

  • Replacing the original code page generator function pointer with a reference to the global configuration ensures a centralized management approach. Verify that all caller sites of the loader heap allocation have been updated to work with the new configuration structure.
&s_stubPrecodeHeapConfig

@thaystg

Copy link
Copy Markdown
Member

I think we need to merge and release dbgshim, then bump it everywhere and then merge here. What do you think @tommcdon@davidwrighton ?

@thaystg

Copy link
Copy Markdown
Member

Ah okay, we should enable on Mac after doing what I asked :)

Comment threadsrc/coreclr/clrdefinitions.cmake Outdated

@tommcdontommcdon left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Left a minor comment change for your review

Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@davidwrighton

Copy link
Copy Markdown
MemberAuthor

/ba-g The build break is unrelated and has already been fixed by #115767

@davidwrighton
davidwrighton merged commit 35514ca into dotnet:mainMay 20, 2025
SimaTian pushed a commit that referenced this pull request May 27, 2025
* Reapply "Create a single copy of stub templates (#114462)" (#115665)
This reverts commit f7fc178.
* Disable feature on Apple platforms for now
Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 20, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@davidwrighton@thaystg@tommcdon