Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures - #131013

Closed
jkotas with Copilot wants to merge 2 commits into
mainfrom
copilot/coreclr-x86-fix-copycontext-error
Closed

Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures#131013
jkotas with Copilot wants to merge 2 commits into
mainfrom
copilot/coreclr-x86-fix-copycontext-error

Conversation

CopilotAI commented Jul 18, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

The x86-only RestoreContextSimulated / RtlRestoreContextFallback code paths — which simulated RtlRestoreContext via SEH on pre-Vista Windows — were never removed when Windows 7 support was dropped. These paths are the root cause of the reported fatal crash. The fix removes them entirely and calls RtlRestoreContext directly on x86, matching the existing AMD64/ARM/ARM64 behavior.

Changes

CoreCLR VM (src/coreclr/vm/)

  • ceemain.cpp, vars.hpp: Remove g_pfnRtlRestoreContext global and the GetProcAddress(ntdll, "RtlRestoreContext") dynamic lookup
  • threads.h: Remove RestoreContextSimulated declaration
  • threadsuspend.cpp: Remove RedirectedHandledJITCaseExceptionFilter and RestoreContextSimulated implementations; replace the x86/non-x86 conditional call with a single direct RtlRestoreContext(pCtx, NULL)

NativeAOT (src/coreclr/nativeaot/Runtime/windows/PalMinWin.cpp)

  • Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter, and the local SEH helpers (GetCurrentSEHRecord, SetCurrentSEHRecord, PopSEHRecords) that existed only to support the fallback
  • Remove pfnRtlRestoreContext function pointer and its GetProcAddress initialization
  • Simplify PalRestoreContext to call RtlRestoreContext directly (dropping the x86 conditional)

CopilotAI review requested due to automatic review settings July 18, 2026 11:41
CopilotAI reviewed Jul 18, 2026
View reviewed changes

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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.

@azure-pipelines

azure-pipelinesBot commented Jul 18, 2026

Copy link
Copy Markdown
Azure Pipelines:
16 pipeline(s) were filtered out due to trigger conditions.
There may be pipelines that require an authorized user to comment /azp run to run.

CopilotAI linked an issue Jul 18, 2026 that may be closed by this pull request
CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error #131010
Closed
CopilotAItemporarily deployed to copilot-pat-pool July 18, 2026 11:46 Inactive
CopilotAItemporarily deployed to copilot-pat-pool July 18, 2026 11:47 Inactive
@dotnet-policy-service

dotnet-policy-serviceBot commented Jul 18, 2026

Copy link
Copy Markdown
Contributor

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

@jkotas
Remove RtlRestoreContext fallback paths for legacy x86 Windows
889d22c
Remove RestoreContextSimulated and RtlRestoreContextFallback fallback
paths that were used to simulate RtlRestoreContext on legacy x86 Windows
OSes (pre-Vista). These OSes are no longer supported.
- Remove g_pfnRtlRestoreContext global and GetProcAddress lookup from
ceemain.cpp and vars.hpp
- Remove RestoreContextSimulated declaration from threads.h
- Remove RedirectedHandledJITCaseExceptionFilter and
RestoreContextSimulated implementation from threadsuspend.cpp
- Replace g_pfnRtlRestoreContext conditional call with direct
RtlRestoreContext call (matching AMD64/ARM/ARM64 path)
- Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter,
and associated SEH helpers from NativeAOT PalMinWin.cpp
- Remove pfnRtlRestoreContext function pointer and GetProcAddress lookup
from PalMinWin.cpp
- Simplify PalRestoreContext to call RtlRestoreContext directly
Fixes#131010
Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 18, 2026 12:14
CopilotAI reviewed Jul 18, 2026
View reviewed changes

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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.

CopilotAI changed the title [WIP] Fix CopyContext failure in RestoreContextSimulated path on Windows 7Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architecturesJul 18, 2026
CopilotAI requested a review from jkotasJuly 18, 2026 12:14
@jkotas

jkotas commented Jul 18, 2026

Copy link
Copy Markdown
Member

RtlRestoreContext is only available since Windows 10 21H2 (Ferrum). We still support older versions than that https://github.com/dotnet/core/blob/main/release-notes/11.0/supported-os.md#windows , so this cannot be deleted yet.

@jkotasjkotas closed this Jul 18, 2026
@jkotasjkotas mentioned this pull request Jul 18, 2026
Closed
@jkotas
jkotas deleted the copilot/coreclr-x86-fix-copycontext-error branch August 24, 2026 05:14
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@jkotasjkotasAwaiting requested review from jkotas
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky will be requested when the pull request is marked ready for reviewMichalStrehovsky is a code owner

Assignees

@jkotasjkotas

Copilot code reviewCopilot

Labels

area-VM-coreclr

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error

3 participants

@jkotas
, '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
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures - #131013
Closed
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Closed
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures#131013
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Conversation
CopilotAI
commented
Jul 18, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
The x86-only RestoreContextSimulated / RtlRestoreContextFallback code paths — which simulated RtlRestoreContext via SEH on pre-Vista Windows — were never removed when Windows 7 support was dropped. These paths are the root cause of the reported fatal crash. The fix removes them entirely and calls RtlRestoreContext directly on x86, matching the existing AMD64/ARM/ARM64 behavior.
Changes
CoreCLR VM (src/coreclr/vm/)
  • ceemain.cpp, vars.hpp: Remove g_pfnRtlRestoreContext global and the GetProcAddress(ntdll, "RtlRestoreContext") dynamic lookup
  • threads.h: Remove RestoreContextSimulated declaration
  • threadsuspend.cpp: Remove RedirectedHandledJITCaseExceptionFilter and RestoreContextSimulated implementations; replace the x86/non-x86 conditional call with a single direct RtlRestoreContext(pCtx, NULL)
NativeAOT (src/coreclr/nativeaot/Runtime/windows/PalMinWin.cpp)
  • Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter, and the local SEH helpers (GetCurrentSEHRecord, SetCurrentSEHRecord, PopSEHRecords) that existed only to support the fallback
  • Remove pfnRtlRestoreContext function pointer and its GetProcAddress initialization
  • Simplify PalRestoreContext to call RtlRestoreContext directly (dropping the x86 conditional)
CopilotAI
review requested due to automatic review settings
July 18, 2026 11:41
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
@azure-pipelines
azure-pipelinesBot
commented
Jul 18, 2026

Copy link


Copy Markdown


Azure Pipelines:

16 pipeline(s) were filtered out due to trigger conditions.

There may be pipelines that require an authorized user to comment /azp run to run.
CopilotAI
linked an issue
Jul 18, 2026
that may be
closed
by this pull request


CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error
#131010

Closed

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:46
Inactive

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:47
Inactive

@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 18, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke

See info in area-owners.md if you want to be subscribed.
@jkotas
Remove RtlRestoreContext fallback paths for legacy x86 Windows
889d22c
Remove RestoreContextSimulated and RtlRestoreContextFallback fallback
paths that were used to simulate RtlRestoreContext on legacy x86 Windows
OSes (pre-Vista). These OSes are no longer supported.
- Remove g_pfnRtlRestoreContext global and GetProcAddress lookup from
ceemain.cpp and vars.hpp
- Remove RestoreContextSimulated declaration from threads.h
- Remove RedirectedHandledJITCaseExceptionFilter and
RestoreContextSimulated implementation from threadsuspend.cpp
- Replace g_pfnRtlRestoreContext conditional call with direct
RtlRestoreContext call (matching AMD64/ARM/ARM64 path)
- Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter,
and associated SEH helpers from NativeAOT PalMinWin.cpp
- Remove pfnRtlRestoreContext function pointer and GetProcAddress lookup
from PalMinWin.cpp
- Simplify PalRestoreContext to call RtlRestoreContext directly
Fixes#131010
Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com>
CopilotAI
review requested due to automatic review settings
July 18, 2026 12:14
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
CopilotAI
changed the title
[WIP] Fix CopyContext failure in RestoreContextSimulated path on Windows 7Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architecturesJul 18, 2026
CopilotAI
requested a review
from jkotasJuly 18, 2026 12:14
@jkotas
jkotas
commented
Jul 18, 2026

Copy link


Copy Markdown

Member
RtlRestoreContext is only available since Windows 10 21H2 (Ferrum). We still support older versions than that https://github.com/dotnet/core/blob/main/release-notes/11.0/supported-os.md#windows , so this cannot be deleted yet.
@jkotasjkotas
closed this
Jul 18, 2026
@jkotasjkotas
mentioned this pull request
Jul 18, 2026

Closed

@jkotas
jkotas
deleted the

copilot/coreclr-x86-fix-copycontext-error

branch
August 24, 2026 05:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@jkotasjkotasAwaiting requested review from jkotas
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky will be requested when the pull request is marked ready for reviewMichalStrehovsky is a code owner

Assignees

@jkotasjkotas
Copilot code reviewCopilot

Labels

area-VM-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error


3 participants

@jkotas

, '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
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures - #131013
Closed
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Closed
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures#131013
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Conversation
CopilotAI
commented
Jul 18, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
The x86-only RestoreContextSimulated / RtlRestoreContextFallback code paths — which simulated RtlRestoreContext via SEH on pre-Vista Windows — were never removed when Windows 7 support was dropped. These paths are the root cause of the reported fatal crash. The fix removes them entirely and calls RtlRestoreContext directly on x86, matching the existing AMD64/ARM/ARM64 behavior.
Changes
CoreCLR VM (src/coreclr/vm/)
  • ceemain.cpp, vars.hpp: Remove g_pfnRtlRestoreContext global and the GetProcAddress(ntdll, "RtlRestoreContext") dynamic lookup
  • threads.h: Remove RestoreContextSimulated declaration
  • threadsuspend.cpp: Remove RedirectedHandledJITCaseExceptionFilter and RestoreContextSimulated implementations; replace the x86/non-x86 conditional call with a single direct RtlRestoreContext(pCtx, NULL)
NativeAOT (src/coreclr/nativeaot/Runtime/windows/PalMinWin.cpp)
  • Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter, and the local SEH helpers (GetCurrentSEHRecord, SetCurrentSEHRecord, PopSEHRecords) that existed only to support the fallback
  • Remove pfnRtlRestoreContext function pointer and its GetProcAddress initialization
  • Simplify PalRestoreContext to call RtlRestoreContext directly (dropping the x86 conditional)
CopilotAI
review requested due to automatic review settings
July 18, 2026 11:41
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
@azure-pipelines
azure-pipelinesBot
commented
Jul 18, 2026

Copy link


Copy Markdown


Azure Pipelines:

16 pipeline(s) were filtered out due to trigger conditions.

There may be pipelines that require an authorized user to comment /azp run to run.
CopilotAI
linked an issue
Jul 18, 2026
that may be
closed
by this pull request


CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error
#131010

Closed

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:46
Inactive

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:47
Inactive

@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 18, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke

See info in area-owners.md if you want to be subscribed.
@jkotas
Remove RtlRestoreContext fallback paths for legacy x86 Windows
889d22c
Remove RestoreContextSimulated and RtlRestoreContextFallback fallback
paths that were used to simulate RtlRestoreContext on legacy x86 Windows
OSes (pre-Vista). These OSes are no longer supported.
- Remove g_pfnRtlRestoreContext global and GetProcAddress lookup from
ceemain.cpp and vars.hpp
- Remove RestoreContextSimulated declaration from threads.h
- Remove RedirectedHandledJITCaseExceptionFilter and
RestoreContextSimulated implementation from threadsuspend.cpp
- Replace g_pfnRtlRestoreContext conditional call with direct
RtlRestoreContext call (matching AMD64/ARM/ARM64 path)
- Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter,
and associated SEH helpers from NativeAOT PalMinWin.cpp
- Remove pfnRtlRestoreContext function pointer and GetProcAddress lookup
from PalMinWin.cpp
- Simplify PalRestoreContext to call RtlRestoreContext directly
Fixes#131010
Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com>
CopilotAI
review requested due to automatic review settings
July 18, 2026 12:14
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
CopilotAI
changed the title
[WIP] Fix CopyContext failure in RestoreContextSimulated path on Windows 7Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architecturesJul 18, 2026
CopilotAI
requested a review
from jkotasJuly 18, 2026 12:14
@jkotas
jkotas
commented
Jul 18, 2026

Copy link


Copy Markdown

Member
RtlRestoreContext is only available since Windows 10 21H2 (Ferrum). We still support older versions than that https://github.com/dotnet/core/blob/main/release-notes/11.0/supported-os.md#windows , so this cannot be deleted yet.
@jkotasjkotas
closed this
Jul 18, 2026
@jkotasjkotas
mentioned this pull request
Jul 18, 2026

Closed

@jkotas
jkotas
deleted the

copilot/coreclr-x86-fix-copycontext-error

branch
August 24, 2026 05:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@jkotasjkotasAwaiting requested review from jkotas
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky will be requested when the pull request is marked ready for reviewMichalStrehovsky is a code owner

Assignees

@jkotasjkotas
Copilot code reviewCopilot

Labels

area-VM-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error


3 participants

@jkotas

, '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
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures - #131013
Closed
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Closed
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures#131013
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Conversation
CopilotAI
commented
Jul 18, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
The x86-only RestoreContextSimulated / RtlRestoreContextFallback code paths — which simulated RtlRestoreContext via SEH on pre-Vista Windows — were never removed when Windows 7 support was dropped. These paths are the root cause of the reported fatal crash. The fix removes them entirely and calls RtlRestoreContext directly on x86, matching the existing AMD64/ARM/ARM64 behavior.
Changes
CoreCLR VM (src/coreclr/vm/)
  • ceemain.cpp, vars.hpp: Remove g_pfnRtlRestoreContext global and the GetProcAddress(ntdll, "RtlRestoreContext") dynamic lookup
  • threads.h: Remove RestoreContextSimulated declaration
  • threadsuspend.cpp: Remove RedirectedHandledJITCaseExceptionFilter and RestoreContextSimulated implementations; replace the x86/non-x86 conditional call with a single direct RtlRestoreContext(pCtx, NULL)
NativeAOT (src/coreclr/nativeaot/Runtime/windows/PalMinWin.cpp)
  • Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter, and the local SEH helpers (GetCurrentSEHRecord, SetCurrentSEHRecord, PopSEHRecords) that existed only to support the fallback
  • Remove pfnRtlRestoreContext function pointer and its GetProcAddress initialization
  • Simplify PalRestoreContext to call RtlRestoreContext directly (dropping the x86 conditional)
CopilotAI
review requested due to automatic review settings
July 18, 2026 11:41
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
@azure-pipelines
azure-pipelinesBot
commented
Jul 18, 2026

Copy link


Copy Markdown


Azure Pipelines:

16 pipeline(s) were filtered out due to trigger conditions.

There may be pipelines that require an authorized user to comment /azp run to run.
CopilotAI
linked an issue
Jul 18, 2026
that may be
closed
by this pull request


CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error
#131010

Closed

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:46
Inactive

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:47
Inactive

@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 18, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke

See info in area-owners.md if you want to be subscribed.
@jkotas
Remove RtlRestoreContext fallback paths for legacy x86 Windows
889d22c
Remove RestoreContextSimulated and RtlRestoreContextFallback fallback
paths that were used to simulate RtlRestoreContext on legacy x86 Windows
OSes (pre-Vista). These OSes are no longer supported.
- Remove g_pfnRtlRestoreContext global and GetProcAddress lookup from
ceemain.cpp and vars.hpp
- Remove RestoreContextSimulated declaration from threads.h
- Remove RedirectedHandledJITCaseExceptionFilter and
RestoreContextSimulated implementation from threadsuspend.cpp
- Replace g_pfnRtlRestoreContext conditional call with direct
RtlRestoreContext call (matching AMD64/ARM/ARM64 path)
- Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter,
and associated SEH helpers from NativeAOT PalMinWin.cpp
- Remove pfnRtlRestoreContext function pointer and GetProcAddress lookup
from PalMinWin.cpp
- Simplify PalRestoreContext to call RtlRestoreContext directly
Fixes#131010
Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com>
CopilotAI
review requested due to automatic review settings
July 18, 2026 12:14
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
CopilotAI
changed the title
[WIP] Fix CopyContext failure in RestoreContextSimulated path on Windows 7Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architecturesJul 18, 2026
CopilotAI
requested a review
from jkotasJuly 18, 2026 12:14
@jkotas
jkotas
commented
Jul 18, 2026

Copy link


Copy Markdown

Member
RtlRestoreContext is only available since Windows 10 21H2 (Ferrum). We still support older versions than that https://github.com/dotnet/core/blob/main/release-notes/11.0/supported-os.md#windows , so this cannot be deleted yet.
@jkotasjkotas
closed this
Jul 18, 2026
@jkotasjkotas
mentioned this pull request
Jul 18, 2026

Closed

@jkotas
jkotas
deleted the

copilot/coreclr-x86-fix-copycontext-error

branch
August 24, 2026 05:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@jkotasjkotasAwaiting requested review from jkotas
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky will be requested when the pull request is marked ready for reviewMichalStrehovsky is a code owner

Assignees

@jkotasjkotas
Copilot code reviewCopilot

Labels

area-VM-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error


3 participants

@jkotas

, '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
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures - #131013
Closed
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Closed
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures#131013
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Conversation
CopilotAI
commented
Jul 18, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
The x86-only RestoreContextSimulated / RtlRestoreContextFallback code paths — which simulated RtlRestoreContext via SEH on pre-Vista Windows — were never removed when Windows 7 support was dropped. These paths are the root cause of the reported fatal crash. The fix removes them entirely and calls RtlRestoreContext directly on x86, matching the existing AMD64/ARM/ARM64 behavior.
Changes
CoreCLR VM (src/coreclr/vm/)
  • ceemain.cpp, vars.hpp: Remove g_pfnRtlRestoreContext global and the GetProcAddress(ntdll, "RtlRestoreContext") dynamic lookup
  • threads.h: Remove RestoreContextSimulated declaration
  • threadsuspend.cpp: Remove RedirectedHandledJITCaseExceptionFilter and RestoreContextSimulated implementations; replace the x86/non-x86 conditional call with a single direct RtlRestoreContext(pCtx, NULL)
NativeAOT (src/coreclr/nativeaot/Runtime/windows/PalMinWin.cpp)
  • Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter, and the local SEH helpers (GetCurrentSEHRecord, SetCurrentSEHRecord, PopSEHRecords) that existed only to support the fallback
  • Remove pfnRtlRestoreContext function pointer and its GetProcAddress initialization
  • Simplify PalRestoreContext to call RtlRestoreContext directly (dropping the x86 conditional)
CopilotAI
review requested due to automatic review settings
July 18, 2026 11:41
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
@azure-pipelines
azure-pipelinesBot
commented
Jul 18, 2026

Copy link


Copy Markdown


Azure Pipelines:

16 pipeline(s) were filtered out due to trigger conditions.

There may be pipelines that require an authorized user to comment /azp run to run.
CopilotAI
linked an issue
Jul 18, 2026
that may be
closed
by this pull request


CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error
#131010

Closed

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:46
Inactive

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:47
Inactive

@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 18, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke

See info in area-owners.md if you want to be subscribed.
@jkotas
Remove RtlRestoreContext fallback paths for legacy x86 Windows
889d22c
Remove RestoreContextSimulated and RtlRestoreContextFallback fallback
paths that were used to simulate RtlRestoreContext on legacy x86 Windows
OSes (pre-Vista). These OSes are no longer supported.
- Remove g_pfnRtlRestoreContext global and GetProcAddress lookup from
ceemain.cpp and vars.hpp
- Remove RestoreContextSimulated declaration from threads.h
- Remove RedirectedHandledJITCaseExceptionFilter and
RestoreContextSimulated implementation from threadsuspend.cpp
- Replace g_pfnRtlRestoreContext conditional call with direct
RtlRestoreContext call (matching AMD64/ARM/ARM64 path)
- Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter,
and associated SEH helpers from NativeAOT PalMinWin.cpp
- Remove pfnRtlRestoreContext function pointer and GetProcAddress lookup
from PalMinWin.cpp
- Simplify PalRestoreContext to call RtlRestoreContext directly
Fixes#131010
Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com>
CopilotAI
review requested due to automatic review settings
July 18, 2026 12:14
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
CopilotAI
changed the title
[WIP] Fix CopyContext failure in RestoreContextSimulated path on Windows 7Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architecturesJul 18, 2026
CopilotAI
requested a review
from jkotasJuly 18, 2026 12:14
@jkotas
jkotas
commented
Jul 18, 2026

Copy link


Copy Markdown

Member
RtlRestoreContext is only available since Windows 10 21H2 (Ferrum). We still support older versions than that https://github.com/dotnet/core/blob/main/release-notes/11.0/supported-os.md#windows , so this cannot be deleted yet.
@jkotasjkotas
closed this
Jul 18, 2026
@jkotasjkotas
mentioned this pull request
Jul 18, 2026

Closed

@jkotas
jkotas
deleted the

copilot/coreclr-x86-fix-copycontext-error

branch
August 24, 2026 05:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@jkotasjkotasAwaiting requested review from jkotas
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky will be requested when the pull request is marked ready for reviewMichalStrehovsky is a code owner

Assignees

@jkotasjkotas
Copilot code reviewCopilot

Labels

area-VM-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error


3 participants

@jkotas

, '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
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures - #131013
Closed
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Closed
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures#131013
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Conversation
CopilotAI
commented
Jul 18, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
The x86-only RestoreContextSimulated / RtlRestoreContextFallback code paths — which simulated RtlRestoreContext via SEH on pre-Vista Windows — were never removed when Windows 7 support was dropped. These paths are the root cause of the reported fatal crash. The fix removes them entirely and calls RtlRestoreContext directly on x86, matching the existing AMD64/ARM/ARM64 behavior.
Changes
CoreCLR VM (src/coreclr/vm/)
  • ceemain.cpp, vars.hpp: Remove g_pfnRtlRestoreContext global and the GetProcAddress(ntdll, "RtlRestoreContext") dynamic lookup
  • threads.h: Remove RestoreContextSimulated declaration
  • threadsuspend.cpp: Remove RedirectedHandledJITCaseExceptionFilter and RestoreContextSimulated implementations; replace the x86/non-x86 conditional call with a single direct RtlRestoreContext(pCtx, NULL)
NativeAOT (src/coreclr/nativeaot/Runtime/windows/PalMinWin.cpp)
  • Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter, and the local SEH helpers (GetCurrentSEHRecord, SetCurrentSEHRecord, PopSEHRecords) that existed only to support the fallback
  • Remove pfnRtlRestoreContext function pointer and its GetProcAddress initialization
  • Simplify PalRestoreContext to call RtlRestoreContext directly (dropping the x86 conditional)
CopilotAI
review requested due to automatic review settings
July 18, 2026 11:41
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
@azure-pipelines
azure-pipelinesBot
commented
Jul 18, 2026

Copy link


Copy Markdown


Azure Pipelines:

16 pipeline(s) were filtered out due to trigger conditions.

There may be pipelines that require an authorized user to comment /azp run to run.
CopilotAI
linked an issue
Jul 18, 2026
that may be
closed
by this pull request


CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error
#131010

Closed

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:46
Inactive

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:47
Inactive

@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 18, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke

See info in area-owners.md if you want to be subscribed.
@jkotas
Remove RtlRestoreContext fallback paths for legacy x86 Windows
889d22c
Remove RestoreContextSimulated and RtlRestoreContextFallback fallback
paths that were used to simulate RtlRestoreContext on legacy x86 Windows
OSes (pre-Vista). These OSes are no longer supported.
- Remove g_pfnRtlRestoreContext global and GetProcAddress lookup from
ceemain.cpp and vars.hpp
- Remove RestoreContextSimulated declaration from threads.h
- Remove RedirectedHandledJITCaseExceptionFilter and
RestoreContextSimulated implementation from threadsuspend.cpp
- Replace g_pfnRtlRestoreContext conditional call with direct
RtlRestoreContext call (matching AMD64/ARM/ARM64 path)
- Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter,
and associated SEH helpers from NativeAOT PalMinWin.cpp
- Remove pfnRtlRestoreContext function pointer and GetProcAddress lookup
from PalMinWin.cpp
- Simplify PalRestoreContext to call RtlRestoreContext directly
Fixes#131010
Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com>
CopilotAI
review requested due to automatic review settings
July 18, 2026 12:14
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
CopilotAI
changed the title
[WIP] Fix CopyContext failure in RestoreContextSimulated path on Windows 7Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architecturesJul 18, 2026
CopilotAI
requested a review
from jkotasJuly 18, 2026 12:14
@jkotas
jkotas
commented
Jul 18, 2026

Copy link


Copy Markdown

Member
RtlRestoreContext is only available since Windows 10 21H2 (Ferrum). We still support older versions than that https://github.com/dotnet/core/blob/main/release-notes/11.0/supported-os.md#windows , so this cannot be deleted yet.
@jkotasjkotas
closed this
Jul 18, 2026
@jkotasjkotas
mentioned this pull request
Jul 18, 2026

Closed

@jkotas
jkotas
deleted the

copilot/coreclr-x86-fix-copycontext-error

branch
August 24, 2026 05:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@jkotasjkotasAwaiting requested review from jkotas
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky will be requested when the pull request is marked ready for reviewMichalStrehovsky is a code owner

Assignees

@jkotasjkotas
Copilot code reviewCopilot

Labels

area-VM-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error


3 participants

@jkotas

, '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
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures - #131013
Closed
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Closed
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures#131013
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Conversation
CopilotAI
commented
Jul 18, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
The x86-only RestoreContextSimulated / RtlRestoreContextFallback code paths — which simulated RtlRestoreContext via SEH on pre-Vista Windows — were never removed when Windows 7 support was dropped. These paths are the root cause of the reported fatal crash. The fix removes them entirely and calls RtlRestoreContext directly on x86, matching the existing AMD64/ARM/ARM64 behavior.
Changes
CoreCLR VM (src/coreclr/vm/)
  • ceemain.cpp, vars.hpp: Remove g_pfnRtlRestoreContext global and the GetProcAddress(ntdll, "RtlRestoreContext") dynamic lookup
  • threads.h: Remove RestoreContextSimulated declaration
  • threadsuspend.cpp: Remove RedirectedHandledJITCaseExceptionFilter and RestoreContextSimulated implementations; replace the x86/non-x86 conditional call with a single direct RtlRestoreContext(pCtx, NULL)
NativeAOT (src/coreclr/nativeaot/Runtime/windows/PalMinWin.cpp)
  • Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter, and the local SEH helpers (GetCurrentSEHRecord, SetCurrentSEHRecord, PopSEHRecords) that existed only to support the fallback
  • Remove pfnRtlRestoreContext function pointer and its GetProcAddress initialization
  • Simplify PalRestoreContext to call RtlRestoreContext directly (dropping the x86 conditional)
CopilotAI
review requested due to automatic review settings
July 18, 2026 11:41
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
@azure-pipelines
azure-pipelinesBot
commented
Jul 18, 2026

Copy link


Copy Markdown


Azure Pipelines:

16 pipeline(s) were filtered out due to trigger conditions.

There may be pipelines that require an authorized user to comment /azp run to run.
CopilotAI
linked an issue
Jul 18, 2026
that may be
closed
by this pull request


CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error
#131010

Closed

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:46
Inactive

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:47
Inactive

@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 18, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke

See info in area-owners.md if you want to be subscribed.
@jkotas
Remove RtlRestoreContext fallback paths for legacy x86 Windows
889d22c
Remove RestoreContextSimulated and RtlRestoreContextFallback fallback
paths that were used to simulate RtlRestoreContext on legacy x86 Windows
OSes (pre-Vista). These OSes are no longer supported.
- Remove g_pfnRtlRestoreContext global and GetProcAddress lookup from
ceemain.cpp and vars.hpp
- Remove RestoreContextSimulated declaration from threads.h
- Remove RedirectedHandledJITCaseExceptionFilter and
RestoreContextSimulated implementation from threadsuspend.cpp
- Replace g_pfnRtlRestoreContext conditional call with direct
RtlRestoreContext call (matching AMD64/ARM/ARM64 path)
- Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter,
and associated SEH helpers from NativeAOT PalMinWin.cpp
- Remove pfnRtlRestoreContext function pointer and GetProcAddress lookup
from PalMinWin.cpp
- Simplify PalRestoreContext to call RtlRestoreContext directly
Fixes#131010
Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com>
CopilotAI
review requested due to automatic review settings
July 18, 2026 12:14
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
CopilotAI
changed the title
[WIP] Fix CopyContext failure in RestoreContextSimulated path on Windows 7Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architecturesJul 18, 2026
CopilotAI
requested a review
from jkotasJuly 18, 2026 12:14
@jkotas
jkotas
commented
Jul 18, 2026

Copy link


Copy Markdown

Member
RtlRestoreContext is only available since Windows 10 21H2 (Ferrum). We still support older versions than that https://github.com/dotnet/core/blob/main/release-notes/11.0/supported-os.md#windows , so this cannot be deleted yet.
@jkotasjkotas
closed this
Jul 18, 2026
@jkotasjkotas
mentioned this pull request
Jul 18, 2026

Closed

@jkotas
jkotas
deleted the

copilot/coreclr-x86-fix-copycontext-error

branch
August 24, 2026 05:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@jkotasjkotasAwaiting requested review from jkotas
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky will be requested when the pull request is marked ready for reviewMichalStrehovsky is a code owner

Assignees

@jkotasjkotas
Copilot code reviewCopilot

Labels

area-VM-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error


3 participants

@jkotas

, '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
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures - #131013
Closed
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Closed
Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architectures#131013
jkotas with Copilot wants to merge 2 commits into
mainfrom 
copilot/coreclr-x86-fix-copycontext-error
Conversation
CopilotAI
commented
Jul 18, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
The x86-only RestoreContextSimulated / RtlRestoreContextFallback code paths — which simulated RtlRestoreContext via SEH on pre-Vista Windows — were never removed when Windows 7 support was dropped. These paths are the root cause of the reported fatal crash. The fix removes them entirely and calls RtlRestoreContext directly on x86, matching the existing AMD64/ARM/ARM64 behavior.
Changes
CoreCLR VM (src/coreclr/vm/)
  • ceemain.cpp, vars.hpp: Remove g_pfnRtlRestoreContext global and the GetProcAddress(ntdll, "RtlRestoreContext") dynamic lookup
  • threads.h: Remove RestoreContextSimulated declaration
  • threadsuspend.cpp: Remove RedirectedHandledJITCaseExceptionFilter and RestoreContextSimulated implementations; replace the x86/non-x86 conditional call with a single direct RtlRestoreContext(pCtx, NULL)
NativeAOT (src/coreclr/nativeaot/Runtime/windows/PalMinWin.cpp)
  • Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter, and the local SEH helpers (GetCurrentSEHRecord, SetCurrentSEHRecord, PopSEHRecords) that existed only to support the fallback
  • Remove pfnRtlRestoreContext function pointer and its GetProcAddress initialization
  • Simplify PalRestoreContext to call RtlRestoreContext directly (dropping the x86 conditional)
CopilotAI
review requested due to automatic review settings
July 18, 2026 11:41
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
@azure-pipelines
azure-pipelinesBot
commented
Jul 18, 2026

Copy link


Copy Markdown


Azure Pipelines:

16 pipeline(s) were filtered out due to trigger conditions.

There may be pipelines that require an authorized user to comment /azp run to run.
CopilotAI
linked an issue
Jul 18, 2026
that may be
closed
by this pull request


CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error
#131010

Closed

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:46
Inactive

CopilotAItemporarily deployed
to
copilot-pat-pool
July 18, 2026 11:47
Inactive

@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 18, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke

See info in area-owners.md if you want to be subscribed.
@jkotas
Remove RtlRestoreContext fallback paths for legacy x86 Windows
889d22c
Remove RestoreContextSimulated and RtlRestoreContextFallback fallback
paths that were used to simulate RtlRestoreContext on legacy x86 Windows
OSes (pre-Vista). These OSes are no longer supported.
- Remove g_pfnRtlRestoreContext global and GetProcAddress lookup from
ceemain.cpp and vars.hpp
- Remove RestoreContextSimulated declaration from threads.h
- Remove RedirectedHandledJITCaseExceptionFilter and
RestoreContextSimulated implementation from threadsuspend.cpp
- Replace g_pfnRtlRestoreContext conditional call with direct
RtlRestoreContext call (matching AMD64/ARM/ARM64 path)
- Remove RtlRestoreContextFallback, RtlRestoreContextFallbackExceptionFilter,
and associated SEH helpers from NativeAOT PalMinWin.cpp
- Remove pfnRtlRestoreContext function pointer and GetProcAddress lookup
from PalMinWin.cpp
- Simplify PalRestoreContext to call RtlRestoreContext directly
Fixes#131010
Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com>
CopilotAI
review requested due to automatic review settings
July 18, 2026 12:14
CopilotAI
reviewed
Jul 18, 2026
View reviewed changes
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.

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.
CopilotAI
changed the title
[WIP] Fix CopyContext failure in RestoreContextSimulated path on Windows 7Remove RtlRestoreContext fallback paths for legacy x86 Windows; use static linking like all other architecturesJul 18, 2026
CopilotAI
requested a review
from jkotasJuly 18, 2026 12:14
@jkotas
jkotas
commented
Jul 18, 2026

Copy link


Copy Markdown

Member
RtlRestoreContext is only available since Windows 10 21H2 (Ferrum). We still support older versions than that https://github.com/dotnet/core/blob/main/release-notes/11.0/supported-os.md#windows , so this cannot be deleted yet.
@jkotasjkotas
closed this
Jul 18, 2026
@jkotasjkotas
mentioned this pull request
Jul 18, 2026

Closed

@jkotas
jkotas
deleted the

copilot/coreclr-x86-fix-copycontext-error

branch
August 24, 2026 05:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@jkotasjkotasAwaiting requested review from jkotas
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky will be requested when the pull request is marked ready for reviewMichalStrehovsky is a code owner

Assignees

@jkotasjkotas
Copilot code reviewCopilot

Labels

area-VM-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

CoreCLR x86: CopyContext fails with ERROR_INVALID_PARAMETER in RestoreContextSimulated path on Windows 7, causing fatal EE error


3 participants

@jkotas