Skip to content

Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android" - #128828

Closed
MichalStrehovsky wants to merge 1 commit into
mainfrom
revert-128667-libunwind-ifdef
Closed

Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android"#128828
MichalStrehovsky wants to merge 1 commit into
mainfrom
revert-128667-libunwind-ifdef

Conversation

@MichalStrehovsky

@MichalStrehovskyMichalStrehovsky commented Jun 1, 2026

Copy link
Copy Markdown
Member

Reverts #128667

Seeing crashes on ARM32 in libunwind code, suspect range is d1b43a3...a73aedb so this is a prime suspect.

CopilotAI review requested due to automatic review settings June 1, 2026 02:15
@MichalStrehovskyMichalStrehovsky added NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) NO-REVIEW Experimental/testing PR, do NOT review it labels Jun 1, 2026
@dotnet-policy-service

dotnet-policy-serviceBot commented Jun 1, 2026

Copy link
Copy Markdown
Contributor

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

@MichalStrehovsky

MichalStrehovsky commented Jun 1, 2026

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-nativeaot-outerloop

@azure-pipelines

azure-pipelinesBot commented Jun 1, 2026

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@github-actions

github-actionsBot commented Jun 1, 2026

Copy link
Copy Markdown
Contributor

🤖 Copilot Code Review — PR #128828

Holistic Assessment

Motivation: Justified. ARM32 crashes in libunwind code are traced to the commit range that includes #128667. Reverting the prime suspect is the correct first response to a runtime crash.

Approach: This is a clean, mechanical revert of #128667. The approach is appropriate — revert to restore stability, then re-investigate the Android symbol conflict fix (#121172) with an approach that doesn't break ARM32.

Summary: ✅ LGTM. This is a faithful revert of all 7 files changed in #128667. The diff is the exact inverse of the original PR. No new code, no partial reverts, no manual edits — just a clean undo. The labels (NO-MERGE, NO-REVIEW, draft) indicate the author is running outerloop CI to confirm this fixes the ARM32 crashes before merging.

Detailed Findings

✅ Revert Completeness — All changes from #128667 are fully reverted

Verified that all 7 files modified in #128667 are reverted:

  • CMakeLists.txt: _LIBUNWIND_NATIVEAOT → back to _LIBUNWIND_DISABLE_ZERO_COST_APIS
  • UnixNativeCodeManager.cpp: UnwindHelpers::FindUnwindSections() → back to LocalAddressSpace::sThisAddressSpace.findUnwindSections()
  • UnwindHelpers.cpp: Removes the added FindUnwindSections wrapper
  • UnwindHelpers.h: Removes the added declaration
  • llvm-libunwind-version.txt: Removes the patch tracking entry
  • Unwind-EHABI.cpp: Removes _LIBUNWIND_NATIVEAOT guards around C++ exception dispatch functions
  • libunwind.cpp: Removes _LIBUNWIND_NATIVEAOT guards around the public API

Additions (3) + deletions (26) match the inverse of #128667's additions (26) + deletions (3).

✅ No Collateral Changes — Revert is isolated

No unrelated modifications, no style changes, no additional fixes bundled in.

💡 Follow-up: Android NDK r29 symbol conflict (#121172) will need a new fix

The original PR was fixing real symbol conflicts on Android NDK r29. After this revert lands, the issue will resurface. The next attempt should ensure ARM32 EHABI paths remain functional — the original approach of guarding out the C++ exception dispatch functions in Unwind-EHABI.cpp likely broke ARM32 unwinding since those __aeabi_unwind_cpp_pr* personality routines may be needed even when NativeAOT doesn't use the public unw_* API directly.

Generated by Code Review for issue #128828 · ● 2M · ◷

CopilotAI reviewed Jun 1, 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.

Pull request overview

This PR reverts #128667, which had guarded out llvm-libunwind public symbols for NativeAOT via a _LIBUNWIND_NATIVEAOT define. The revert is motivated by ARM32 crashes observed in libunwind code, suspected to originate from the guarded build.

Changes:

  • Removes _LIBUNWIND_NATIVEAOT conditional guards from libunwind.cpp and Unwind-EHABI.cpp, restoring the public unw_*/_Unwind_* APIs and EHABI personality routines.
  • Restores the previous CMake definition _LIBUNWIND_DISABLE_ZERO_COST_APIS=1 in place of _LIBUNWIND_NATIVEAOT=1.
  • Removes the UnwindHelpers::FindUnwindSections wrapper and reverts the call site to use LocalAddressSpace::sThisAddressSpace.findUnwindSections directly; updates llvm-libunwind-version.txt.

Reviewed changes

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

Show a summary per file
FileDescription
src/native/external/llvm-libunwind/src/Unwind-EHABI.cppRemoves _LIBUNWIND_NATIVEAOT guard around EHABI personality and _Unwind_* APIs.
src/native/external/llvm-libunwind/src/libunwind.cppRemoves _LIBUNWIND_NATIVEAOT guard around public unw_* API and LocalAddressSpace.
src/native/external/llvm-libunwind-version.txtDrops the entry for the reverted local patch commit.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.hRemoves FindUnwindSections declaration.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cppRemoves FindUnwindSections implementation.
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cppReverts to calling LocalAddressSpace::sThisAddressSpace.findUnwindSections directly.
src/coreclr/nativeaot/Runtime/CMakeLists.txtReplaces _LIBUNWIND_NATIVEAOT=1 define with _LIBUNWIND_DISABLE_ZERO_COST_APIS=1.

@MichalStrehovsky

MichalStrehovsky commented Jun 1, 2026

Copy link
Copy Markdown
MemberAuthor

arm32 is green here, so this is confirmed.

@MichalStrehovsky
MichalStrehovsky deleted the revert-128667-libunwind-ifdef branch June 1, 2026 05:59
This was referenced Jun 1, 2026
Closed
Open
Closed
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jul 1, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

Assignees

@MichalStrehovskyMichalStrehovsky

Labels

area-NativeAOT-coreclrNO-MERGEThe PR is not ready for merge yet (see discussion for detailed reasons)NO-REVIEWExperimental/testing PR, do NOT review it

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@MichalStrehovsky
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android" by MichalStrehovsky · Pull Request #128828 · dotnet/runtime · GitHub
Skip to content
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android" - #128828
Closed
MichalStrehovsky wants to merge 1 commit into
mainfrom 
revert-128667-libunwind-ifdef
Closed
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android"#128828
MichalStrehovsky wants to merge 1 commit into
mainfrom 
revert-128667-libunwind-ifdef
Conversation
@MichalStrehovsky
@MichalStrehovskyMichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

Member
Reverts #128667
Seeing crashes on ARM32 in libunwind code, suspect range is d1b43a3...a73aedb so this is a prime suspect.
CopilotAI
review requested due to automatic review settings
June 1, 2026 02:15
@MichalStrehovskyMichalStrehovsky
added

NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
NO-REVIEW
Experimental/testing PR, do NOT review it
labels
Jun 1, 2026
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke, @dotnet/ilc-contrib

See info in area-owners.md if you want to be subscribed.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-nativeaot-outerloop
@azure-pipelines
azure-pipelinesBot
commented
Jun 1, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@github-actions
github-actionsBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
🤖 Copilot Code Review — PR #128828
Holistic Assessment
Motivation: Justified. ARM32 crashes in libunwind code are traced to the commit range that includes #128667. Reverting the prime suspect is the correct first response to a runtime crash.
Approach: This is a clean, mechanical revert of #128667. The approach is appropriate — revert to restore stability, then re-investigate the Android symbol conflict fix (#121172) with an approach that doesn't break ARM32.
Summary: ✅ LGTM. This is a faithful revert of all 7 files changed in #128667. The diff is the exact inverse of the original PR. No new code, no partial reverts, no manual edits — just a clean undo. The labels (NO-MERGE, NO-REVIEW, draft) indicate the author is running outerloop CI to confirm this fixes the ARM32 crashes before merging.
Detailed Findings
✅ Revert Completeness — All changes from #128667 are fully reverted
Verified that all 7 files modified in #128667 are reverted:
  • CMakeLists.txt: _LIBUNWIND_NATIVEAOT → back to _LIBUNWIND_DISABLE_ZERO_COST_APIS
  • UnixNativeCodeManager.cpp: UnwindHelpers::FindUnwindSections() → back to LocalAddressSpace::sThisAddressSpace.findUnwindSections()
  • UnwindHelpers.cpp: Removes the added FindUnwindSections wrapper
  • UnwindHelpers.h: Removes the added declaration
  • llvm-libunwind-version.txt: Removes the patch tracking entry
  • Unwind-EHABI.cpp: Removes _LIBUNWIND_NATIVEAOT guards around C++ exception dispatch functions
  • libunwind.cpp: Removes _LIBUNWIND_NATIVEAOT guards around the public API
Additions (3) + deletions (26) match the inverse of #128667's additions (26) + deletions (3).
✅ No Collateral Changes — Revert is isolated
No unrelated modifications, no style changes, no additional fixes bundled in.
💡 Follow-up: Android NDK r29 symbol conflict (#121172) will need a new fix
The original PR was fixing real symbol conflicts on Android NDK r29. After this revert lands, the issue will resurface. The next attempt should ensure ARM32 EHABI paths remain functional — the original approach of guarding out the C++ exception dispatch functions in Unwind-EHABI.cpp likely broke ARM32 unwinding since those __aeabi_unwind_cpp_pr* personality routines may be needed even when NativeAOT doesn't use the public unw_* API directly.
Generated by Code Review for issue #128828 · ● 2M · ◷
CopilotAI
reviewed
Jun 1, 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.

Pull request overview
This PR reverts #128667, which had guarded out llvm-libunwind public symbols for NativeAOT via a _LIBUNWIND_NATIVEAOT define. The revert is motivated by ARM32 crashes observed in libunwind code, suspected to originate from the guarded build.
Changes:
  • Removes _LIBUNWIND_NATIVEAOT conditional guards from libunwind.cpp and Unwind-EHABI.cpp, restoring the public unw_*/_Unwind_* APIs and EHABI personality routines.
  • Restores the previous CMake definition _LIBUNWIND_DISABLE_ZERO_COST_APIS=1 in place of _LIBUNWIND_NATIVEAOT=1.
  • Removes the UnwindHelpers::FindUnwindSections wrapper and reverts the call site to use LocalAddressSpace::sThisAddressSpace.findUnwindSections directly; updates llvm-libunwind-version.txt.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
FileDescription
src/native/external/llvm-libunwind/src/Unwind-EHABI.cppRemoves _LIBUNWIND_NATIVEAOT guard around EHABI personality and _Unwind_* APIs.
src/native/external/llvm-libunwind/src/libunwind.cppRemoves _LIBUNWIND_NATIVEAOT guard around public unw_* API and LocalAddressSpace.
src/native/external/llvm-libunwind-version.txtDrops the entry for the reverted local patch commit.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.hRemoves FindUnwindSections declaration.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cppRemoves FindUnwindSections implementation.
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cppReverts to calling LocalAddressSpace::sThisAddressSpace.findUnwindSections directly.
src/coreclr/nativeaot/Runtime/CMakeLists.txtReplaces _LIBUNWIND_NATIVEAOT=1 define with _LIBUNWIND_DISABLE_ZERO_COST_APIS=1.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
arm32 is green here, so this is confirmed.
@MichalStrehovsky
MichalStrehovsky
deleted the

revert-128667-libunwind-ifdef

branch
June 1, 2026 05:59

This was referenced Jun 1, 2026

Closed


Open


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 1, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

Assignees

@MichalStrehovskyMichalStrehovsky

Labels

area-NativeAOT-coreclrNO-MERGEThe PR is not ready for merge yet (see discussion for detailed reasons)NO-REVIEWExperimental/testing PR, do NOT review it

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@MichalStrehovsky

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android" by MichalStrehovsky · Pull Request #128828 · dotnet/runtime · GitHub
Skip to content
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android" - #128828
Closed
MichalStrehovsky wants to merge 1 commit into
mainfrom 
revert-128667-libunwind-ifdef
Closed
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android"#128828
MichalStrehovsky wants to merge 1 commit into
mainfrom 
revert-128667-libunwind-ifdef
Conversation
@MichalStrehovsky
@MichalStrehovskyMichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

Member
Reverts #128667
Seeing crashes on ARM32 in libunwind code, suspect range is d1b43a3...a73aedb so this is a prime suspect.
CopilotAI
review requested due to automatic review settings
June 1, 2026 02:15
@MichalStrehovskyMichalStrehovsky
added

NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
NO-REVIEW
Experimental/testing PR, do NOT review it
labels
Jun 1, 2026
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke, @dotnet/ilc-contrib

See info in area-owners.md if you want to be subscribed.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-nativeaot-outerloop
@azure-pipelines
azure-pipelinesBot
commented
Jun 1, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@github-actions
github-actionsBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
🤖 Copilot Code Review — PR #128828
Holistic Assessment
Motivation: Justified. ARM32 crashes in libunwind code are traced to the commit range that includes #128667. Reverting the prime suspect is the correct first response to a runtime crash.
Approach: This is a clean, mechanical revert of #128667. The approach is appropriate — revert to restore stability, then re-investigate the Android symbol conflict fix (#121172) with an approach that doesn't break ARM32.
Summary: ✅ LGTM. This is a faithful revert of all 7 files changed in #128667. The diff is the exact inverse of the original PR. No new code, no partial reverts, no manual edits — just a clean undo. The labels (NO-MERGE, NO-REVIEW, draft) indicate the author is running outerloop CI to confirm this fixes the ARM32 crashes before merging.
Detailed Findings
✅ Revert Completeness — All changes from #128667 are fully reverted
Verified that all 7 files modified in #128667 are reverted:
  • CMakeLists.txt: _LIBUNWIND_NATIVEAOT → back to _LIBUNWIND_DISABLE_ZERO_COST_APIS
  • UnixNativeCodeManager.cpp: UnwindHelpers::FindUnwindSections() → back to LocalAddressSpace::sThisAddressSpace.findUnwindSections()
  • UnwindHelpers.cpp: Removes the added FindUnwindSections wrapper
  • UnwindHelpers.h: Removes the added declaration
  • llvm-libunwind-version.txt: Removes the patch tracking entry
  • Unwind-EHABI.cpp: Removes _LIBUNWIND_NATIVEAOT guards around C++ exception dispatch functions
  • libunwind.cpp: Removes _LIBUNWIND_NATIVEAOT guards around the public API
Additions (3) + deletions (26) match the inverse of #128667's additions (26) + deletions (3).
✅ No Collateral Changes — Revert is isolated
No unrelated modifications, no style changes, no additional fixes bundled in.
💡 Follow-up: Android NDK r29 symbol conflict (#121172) will need a new fix
The original PR was fixing real symbol conflicts on Android NDK r29. After this revert lands, the issue will resurface. The next attempt should ensure ARM32 EHABI paths remain functional — the original approach of guarding out the C++ exception dispatch functions in Unwind-EHABI.cpp likely broke ARM32 unwinding since those __aeabi_unwind_cpp_pr* personality routines may be needed even when NativeAOT doesn't use the public unw_* API directly.
Generated by Code Review for issue #128828 · ● 2M · ◷
CopilotAI
reviewed
Jun 1, 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.

Pull request overview
This PR reverts #128667, which had guarded out llvm-libunwind public symbols for NativeAOT via a _LIBUNWIND_NATIVEAOT define. The revert is motivated by ARM32 crashes observed in libunwind code, suspected to originate from the guarded build.
Changes:
  • Removes _LIBUNWIND_NATIVEAOT conditional guards from libunwind.cpp and Unwind-EHABI.cpp, restoring the public unw_*/_Unwind_* APIs and EHABI personality routines.
  • Restores the previous CMake definition _LIBUNWIND_DISABLE_ZERO_COST_APIS=1 in place of _LIBUNWIND_NATIVEAOT=1.
  • Removes the UnwindHelpers::FindUnwindSections wrapper and reverts the call site to use LocalAddressSpace::sThisAddressSpace.findUnwindSections directly; updates llvm-libunwind-version.txt.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
FileDescription
src/native/external/llvm-libunwind/src/Unwind-EHABI.cppRemoves _LIBUNWIND_NATIVEAOT guard around EHABI personality and _Unwind_* APIs.
src/native/external/llvm-libunwind/src/libunwind.cppRemoves _LIBUNWIND_NATIVEAOT guard around public unw_* API and LocalAddressSpace.
src/native/external/llvm-libunwind-version.txtDrops the entry for the reverted local patch commit.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.hRemoves FindUnwindSections declaration.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cppRemoves FindUnwindSections implementation.
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cppReverts to calling LocalAddressSpace::sThisAddressSpace.findUnwindSections directly.
src/coreclr/nativeaot/Runtime/CMakeLists.txtReplaces _LIBUNWIND_NATIVEAOT=1 define with _LIBUNWIND_DISABLE_ZERO_COST_APIS=1.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
arm32 is green here, so this is confirmed.
@MichalStrehovsky
MichalStrehovsky
deleted the

revert-128667-libunwind-ifdef

branch
June 1, 2026 05:59

This was referenced Jun 1, 2026

Closed


Open


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 1, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

Assignees

@MichalStrehovskyMichalStrehovsky

Labels

area-NativeAOT-coreclrNO-MERGEThe PR is not ready for merge yet (see discussion for detailed reasons)NO-REVIEWExperimental/testing PR, do NOT review it

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@MichalStrehovsky

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android" by MichalStrehovsky · Pull Request #128828 · dotnet/runtime · GitHub
Skip to content
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android" - #128828
Closed
MichalStrehovsky wants to merge 1 commit into
mainfrom 
revert-128667-libunwind-ifdef
Closed
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android"#128828
MichalStrehovsky wants to merge 1 commit into
mainfrom 
revert-128667-libunwind-ifdef
Conversation
@MichalStrehovsky
@MichalStrehovskyMichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

Member
Reverts #128667
Seeing crashes on ARM32 in libunwind code, suspect range is d1b43a3...a73aedb so this is a prime suspect.
CopilotAI
review requested due to automatic review settings
June 1, 2026 02:15
@MichalStrehovskyMichalStrehovsky
added

NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
NO-REVIEW
Experimental/testing PR, do NOT review it
labels
Jun 1, 2026
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke, @dotnet/ilc-contrib

See info in area-owners.md if you want to be subscribed.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-nativeaot-outerloop
@azure-pipelines
azure-pipelinesBot
commented
Jun 1, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@github-actions
github-actionsBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
🤖 Copilot Code Review — PR #128828
Holistic Assessment
Motivation: Justified. ARM32 crashes in libunwind code are traced to the commit range that includes #128667. Reverting the prime suspect is the correct first response to a runtime crash.
Approach: This is a clean, mechanical revert of #128667. The approach is appropriate — revert to restore stability, then re-investigate the Android symbol conflict fix (#121172) with an approach that doesn't break ARM32.
Summary: ✅ LGTM. This is a faithful revert of all 7 files changed in #128667. The diff is the exact inverse of the original PR. No new code, no partial reverts, no manual edits — just a clean undo. The labels (NO-MERGE, NO-REVIEW, draft) indicate the author is running outerloop CI to confirm this fixes the ARM32 crashes before merging.
Detailed Findings
✅ Revert Completeness — All changes from #128667 are fully reverted
Verified that all 7 files modified in #128667 are reverted:
  • CMakeLists.txt: _LIBUNWIND_NATIVEAOT → back to _LIBUNWIND_DISABLE_ZERO_COST_APIS
  • UnixNativeCodeManager.cpp: UnwindHelpers::FindUnwindSections() → back to LocalAddressSpace::sThisAddressSpace.findUnwindSections()
  • UnwindHelpers.cpp: Removes the added FindUnwindSections wrapper
  • UnwindHelpers.h: Removes the added declaration
  • llvm-libunwind-version.txt: Removes the patch tracking entry
  • Unwind-EHABI.cpp: Removes _LIBUNWIND_NATIVEAOT guards around C++ exception dispatch functions
  • libunwind.cpp: Removes _LIBUNWIND_NATIVEAOT guards around the public API
Additions (3) + deletions (26) match the inverse of #128667's additions (26) + deletions (3).
✅ No Collateral Changes — Revert is isolated
No unrelated modifications, no style changes, no additional fixes bundled in.
💡 Follow-up: Android NDK r29 symbol conflict (#121172) will need a new fix
The original PR was fixing real symbol conflicts on Android NDK r29. After this revert lands, the issue will resurface. The next attempt should ensure ARM32 EHABI paths remain functional — the original approach of guarding out the C++ exception dispatch functions in Unwind-EHABI.cpp likely broke ARM32 unwinding since those __aeabi_unwind_cpp_pr* personality routines may be needed even when NativeAOT doesn't use the public unw_* API directly.
Generated by Code Review for issue #128828 · ● 2M · ◷
CopilotAI
reviewed
Jun 1, 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.

Pull request overview
This PR reverts #128667, which had guarded out llvm-libunwind public symbols for NativeAOT via a _LIBUNWIND_NATIVEAOT define. The revert is motivated by ARM32 crashes observed in libunwind code, suspected to originate from the guarded build.
Changes:
  • Removes _LIBUNWIND_NATIVEAOT conditional guards from libunwind.cpp and Unwind-EHABI.cpp, restoring the public unw_*/_Unwind_* APIs and EHABI personality routines.
  • Restores the previous CMake definition _LIBUNWIND_DISABLE_ZERO_COST_APIS=1 in place of _LIBUNWIND_NATIVEAOT=1.
  • Removes the UnwindHelpers::FindUnwindSections wrapper and reverts the call site to use LocalAddressSpace::sThisAddressSpace.findUnwindSections directly; updates llvm-libunwind-version.txt.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
FileDescription
src/native/external/llvm-libunwind/src/Unwind-EHABI.cppRemoves _LIBUNWIND_NATIVEAOT guard around EHABI personality and _Unwind_* APIs.
src/native/external/llvm-libunwind/src/libunwind.cppRemoves _LIBUNWIND_NATIVEAOT guard around public unw_* API and LocalAddressSpace.
src/native/external/llvm-libunwind-version.txtDrops the entry for the reverted local patch commit.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.hRemoves FindUnwindSections declaration.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cppRemoves FindUnwindSections implementation.
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cppReverts to calling LocalAddressSpace::sThisAddressSpace.findUnwindSections directly.
src/coreclr/nativeaot/Runtime/CMakeLists.txtReplaces _LIBUNWIND_NATIVEAOT=1 define with _LIBUNWIND_DISABLE_ZERO_COST_APIS=1.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
arm32 is green here, so this is confirmed.
@MichalStrehovsky
MichalStrehovsky
deleted the

revert-128667-libunwind-ifdef

branch
June 1, 2026 05:59

This was referenced Jun 1, 2026

Closed


Open


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 1, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

Assignees

@MichalStrehovskyMichalStrehovsky

Labels

area-NativeAOT-coreclrNO-MERGEThe PR is not ready for merge yet (see discussion for detailed reasons)NO-REVIEWExperimental/testing PR, do NOT review it

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@MichalStrehovsky

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android" by MichalStrehovsky · Pull Request #128828 · dotnet/runtime · GitHub
Skip to content
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android" - #128828
Closed
MichalStrehovsky wants to merge 1 commit into
mainfrom 
revert-128667-libunwind-ifdef
Closed
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android"#128828
MichalStrehovsky wants to merge 1 commit into
mainfrom 
revert-128667-libunwind-ifdef
Conversation
@MichalStrehovsky
@MichalStrehovskyMichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

Member
Reverts #128667
Seeing crashes on ARM32 in libunwind code, suspect range is d1b43a3...a73aedb so this is a prime suspect.
CopilotAI
review requested due to automatic review settings
June 1, 2026 02:15
@MichalStrehovskyMichalStrehovsky
added

NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
NO-REVIEW
Experimental/testing PR, do NOT review it
labels
Jun 1, 2026
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke, @dotnet/ilc-contrib

See info in area-owners.md if you want to be subscribed.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-nativeaot-outerloop
@azure-pipelines
azure-pipelinesBot
commented
Jun 1, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@github-actions
github-actionsBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
🤖 Copilot Code Review — PR #128828
Holistic Assessment
Motivation: Justified. ARM32 crashes in libunwind code are traced to the commit range that includes #128667. Reverting the prime suspect is the correct first response to a runtime crash.
Approach: This is a clean, mechanical revert of #128667. The approach is appropriate — revert to restore stability, then re-investigate the Android symbol conflict fix (#121172) with an approach that doesn't break ARM32.
Summary: ✅ LGTM. This is a faithful revert of all 7 files changed in #128667. The diff is the exact inverse of the original PR. No new code, no partial reverts, no manual edits — just a clean undo. The labels (NO-MERGE, NO-REVIEW, draft) indicate the author is running outerloop CI to confirm this fixes the ARM32 crashes before merging.
Detailed Findings
✅ Revert Completeness — All changes from #128667 are fully reverted
Verified that all 7 files modified in #128667 are reverted:
  • CMakeLists.txt: _LIBUNWIND_NATIVEAOT → back to _LIBUNWIND_DISABLE_ZERO_COST_APIS
  • UnixNativeCodeManager.cpp: UnwindHelpers::FindUnwindSections() → back to LocalAddressSpace::sThisAddressSpace.findUnwindSections()
  • UnwindHelpers.cpp: Removes the added FindUnwindSections wrapper
  • UnwindHelpers.h: Removes the added declaration
  • llvm-libunwind-version.txt: Removes the patch tracking entry
  • Unwind-EHABI.cpp: Removes _LIBUNWIND_NATIVEAOT guards around C++ exception dispatch functions
  • libunwind.cpp: Removes _LIBUNWIND_NATIVEAOT guards around the public API
Additions (3) + deletions (26) match the inverse of #128667's additions (26) + deletions (3).
✅ No Collateral Changes — Revert is isolated
No unrelated modifications, no style changes, no additional fixes bundled in.
💡 Follow-up: Android NDK r29 symbol conflict (#121172) will need a new fix
The original PR was fixing real symbol conflicts on Android NDK r29. After this revert lands, the issue will resurface. The next attempt should ensure ARM32 EHABI paths remain functional — the original approach of guarding out the C++ exception dispatch functions in Unwind-EHABI.cpp likely broke ARM32 unwinding since those __aeabi_unwind_cpp_pr* personality routines may be needed even when NativeAOT doesn't use the public unw_* API directly.
Generated by Code Review for issue #128828 · ● 2M · ◷
CopilotAI
reviewed
Jun 1, 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.

Pull request overview
This PR reverts #128667, which had guarded out llvm-libunwind public symbols for NativeAOT via a _LIBUNWIND_NATIVEAOT define. The revert is motivated by ARM32 crashes observed in libunwind code, suspected to originate from the guarded build.
Changes:
  • Removes _LIBUNWIND_NATIVEAOT conditional guards from libunwind.cpp and Unwind-EHABI.cpp, restoring the public unw_*/_Unwind_* APIs and EHABI personality routines.
  • Restores the previous CMake definition _LIBUNWIND_DISABLE_ZERO_COST_APIS=1 in place of _LIBUNWIND_NATIVEAOT=1.
  • Removes the UnwindHelpers::FindUnwindSections wrapper and reverts the call site to use LocalAddressSpace::sThisAddressSpace.findUnwindSections directly; updates llvm-libunwind-version.txt.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
FileDescription
src/native/external/llvm-libunwind/src/Unwind-EHABI.cppRemoves _LIBUNWIND_NATIVEAOT guard around EHABI personality and _Unwind_* APIs.
src/native/external/llvm-libunwind/src/libunwind.cppRemoves _LIBUNWIND_NATIVEAOT guard around public unw_* API and LocalAddressSpace.
src/native/external/llvm-libunwind-version.txtDrops the entry for the reverted local patch commit.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.hRemoves FindUnwindSections declaration.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cppRemoves FindUnwindSections implementation.
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cppReverts to calling LocalAddressSpace::sThisAddressSpace.findUnwindSections directly.
src/coreclr/nativeaot/Runtime/CMakeLists.txtReplaces _LIBUNWIND_NATIVEAOT=1 define with _LIBUNWIND_DISABLE_ZERO_COST_APIS=1.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
arm32 is green here, so this is confirmed.
@MichalStrehovsky
MichalStrehovsky
deleted the

revert-128667-libunwind-ifdef

branch
June 1, 2026 05:59

This was referenced Jun 1, 2026

Closed


Open


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 1, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

Assignees

@MichalStrehovskyMichalStrehovsky

Labels

area-NativeAOT-coreclrNO-MERGEThe PR is not ready for merge yet (see discussion for detailed reasons)NO-REVIEWExperimental/testing PR, do NOT review it

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@MichalStrehovsky

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android" by MichalStrehovsky · Pull Request #128828 · dotnet/runtime · GitHub
Skip to content
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android" - #128828
Closed
MichalStrehovsky wants to merge 1 commit into
mainfrom 
revert-128667-libunwind-ifdef
Closed
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android"#128828
MichalStrehovsky wants to merge 1 commit into
mainfrom 
revert-128667-libunwind-ifdef
Conversation
@MichalStrehovsky
@MichalStrehovskyMichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

Member
Reverts #128667
Seeing crashes on ARM32 in libunwind code, suspect range is d1b43a3...a73aedb so this is a prime suspect.
CopilotAI
review requested due to automatic review settings
June 1, 2026 02:15
@MichalStrehovskyMichalStrehovsky
added

NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
NO-REVIEW
Experimental/testing PR, do NOT review it
labels
Jun 1, 2026
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke, @dotnet/ilc-contrib

See info in area-owners.md if you want to be subscribed.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-nativeaot-outerloop
@azure-pipelines
azure-pipelinesBot
commented
Jun 1, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@github-actions
github-actionsBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
🤖 Copilot Code Review — PR #128828
Holistic Assessment
Motivation: Justified. ARM32 crashes in libunwind code are traced to the commit range that includes #128667. Reverting the prime suspect is the correct first response to a runtime crash.
Approach: This is a clean, mechanical revert of #128667. The approach is appropriate — revert to restore stability, then re-investigate the Android symbol conflict fix (#121172) with an approach that doesn't break ARM32.
Summary: ✅ LGTM. This is a faithful revert of all 7 files changed in #128667. The diff is the exact inverse of the original PR. No new code, no partial reverts, no manual edits — just a clean undo. The labels (NO-MERGE, NO-REVIEW, draft) indicate the author is running outerloop CI to confirm this fixes the ARM32 crashes before merging.
Detailed Findings
✅ Revert Completeness — All changes from #128667 are fully reverted
Verified that all 7 files modified in #128667 are reverted:
  • CMakeLists.txt: _LIBUNWIND_NATIVEAOT → back to _LIBUNWIND_DISABLE_ZERO_COST_APIS
  • UnixNativeCodeManager.cpp: UnwindHelpers::FindUnwindSections() → back to LocalAddressSpace::sThisAddressSpace.findUnwindSections()
  • UnwindHelpers.cpp: Removes the added FindUnwindSections wrapper
  • UnwindHelpers.h: Removes the added declaration
  • llvm-libunwind-version.txt: Removes the patch tracking entry
  • Unwind-EHABI.cpp: Removes _LIBUNWIND_NATIVEAOT guards around C++ exception dispatch functions
  • libunwind.cpp: Removes _LIBUNWIND_NATIVEAOT guards around the public API
Additions (3) + deletions (26) match the inverse of #128667's additions (26) + deletions (3).
✅ No Collateral Changes — Revert is isolated
No unrelated modifications, no style changes, no additional fixes bundled in.
💡 Follow-up: Android NDK r29 symbol conflict (#121172) will need a new fix
The original PR was fixing real symbol conflicts on Android NDK r29. After this revert lands, the issue will resurface. The next attempt should ensure ARM32 EHABI paths remain functional — the original approach of guarding out the C++ exception dispatch functions in Unwind-EHABI.cpp likely broke ARM32 unwinding since those __aeabi_unwind_cpp_pr* personality routines may be needed even when NativeAOT doesn't use the public unw_* API directly.
Generated by Code Review for issue #128828 · ● 2M · ◷
CopilotAI
reviewed
Jun 1, 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.

Pull request overview
This PR reverts #128667, which had guarded out llvm-libunwind public symbols for NativeAOT via a _LIBUNWIND_NATIVEAOT define. The revert is motivated by ARM32 crashes observed in libunwind code, suspected to originate from the guarded build.
Changes:
  • Removes _LIBUNWIND_NATIVEAOT conditional guards from libunwind.cpp and Unwind-EHABI.cpp, restoring the public unw_*/_Unwind_* APIs and EHABI personality routines.
  • Restores the previous CMake definition _LIBUNWIND_DISABLE_ZERO_COST_APIS=1 in place of _LIBUNWIND_NATIVEAOT=1.
  • Removes the UnwindHelpers::FindUnwindSections wrapper and reverts the call site to use LocalAddressSpace::sThisAddressSpace.findUnwindSections directly; updates llvm-libunwind-version.txt.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
FileDescription
src/native/external/llvm-libunwind/src/Unwind-EHABI.cppRemoves _LIBUNWIND_NATIVEAOT guard around EHABI personality and _Unwind_* APIs.
src/native/external/llvm-libunwind/src/libunwind.cppRemoves _LIBUNWIND_NATIVEAOT guard around public unw_* API and LocalAddressSpace.
src/native/external/llvm-libunwind-version.txtDrops the entry for the reverted local patch commit.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.hRemoves FindUnwindSections declaration.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cppRemoves FindUnwindSections implementation.
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cppReverts to calling LocalAddressSpace::sThisAddressSpace.findUnwindSections directly.
src/coreclr/nativeaot/Runtime/CMakeLists.txtReplaces _LIBUNWIND_NATIVEAOT=1 define with _LIBUNWIND_DISABLE_ZERO_COST_APIS=1.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
arm32 is green here, so this is confirmed.
@MichalStrehovsky
MichalStrehovsky
deleted the

revert-128667-libunwind-ifdef

branch
June 1, 2026 05:59

This was referenced Jun 1, 2026

Closed


Open


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 1, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

Assignees

@MichalStrehovskyMichalStrehovsky

Labels

area-NativeAOT-coreclrNO-MERGEThe PR is not ready for merge yet (see discussion for detailed reasons)NO-REVIEWExperimental/testing PR, do NOT review it

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@MichalStrehovsky

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android" by MichalStrehovsky · Pull Request #128828 · dotnet/runtime · GitHub
Skip to content
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android" - #128828
Closed
MichalStrehovsky wants to merge 1 commit into
mainfrom 
revert-128667-libunwind-ifdef
Closed
Revert "Guard unused llvm-libunwind symbols to avoid duplicates on Android"#128828
MichalStrehovsky wants to merge 1 commit into
mainfrom 
revert-128667-libunwind-ifdef
Conversation
@MichalStrehovsky
@MichalStrehovskyMichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

Member
Reverts #128667
Seeing crashes on ARM32 in libunwind code, suspect range is d1b43a3...a73aedb so this is a prime suspect.
CopilotAI
review requested due to automatic review settings
June 1, 2026 02:15
@MichalStrehovskyMichalStrehovsky
added

NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
NO-REVIEW
Experimental/testing PR, do NOT review it
labels
Jun 1, 2026
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke, @dotnet/ilc-contrib

See info in area-owners.md if you want to be subscribed.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-nativeaot-outerloop
@azure-pipelines
azure-pipelinesBot
commented
Jun 1, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@github-actions
github-actionsBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
🤖 Copilot Code Review — PR #128828
Holistic Assessment
Motivation: Justified. ARM32 crashes in libunwind code are traced to the commit range that includes #128667. Reverting the prime suspect is the correct first response to a runtime crash.
Approach: This is a clean, mechanical revert of #128667. The approach is appropriate — revert to restore stability, then re-investigate the Android symbol conflict fix (#121172) with an approach that doesn't break ARM32.
Summary: ✅ LGTM. This is a faithful revert of all 7 files changed in #128667. The diff is the exact inverse of the original PR. No new code, no partial reverts, no manual edits — just a clean undo. The labels (NO-MERGE, NO-REVIEW, draft) indicate the author is running outerloop CI to confirm this fixes the ARM32 crashes before merging.
Detailed Findings
✅ Revert Completeness — All changes from #128667 are fully reverted
Verified that all 7 files modified in #128667 are reverted:
  • CMakeLists.txt: _LIBUNWIND_NATIVEAOT → back to _LIBUNWIND_DISABLE_ZERO_COST_APIS
  • UnixNativeCodeManager.cpp: UnwindHelpers::FindUnwindSections() → back to LocalAddressSpace::sThisAddressSpace.findUnwindSections()
  • UnwindHelpers.cpp: Removes the added FindUnwindSections wrapper
  • UnwindHelpers.h: Removes the added declaration
  • llvm-libunwind-version.txt: Removes the patch tracking entry
  • Unwind-EHABI.cpp: Removes _LIBUNWIND_NATIVEAOT guards around C++ exception dispatch functions
  • libunwind.cpp: Removes _LIBUNWIND_NATIVEAOT guards around the public API
Additions (3) + deletions (26) match the inverse of #128667's additions (26) + deletions (3).
✅ No Collateral Changes — Revert is isolated
No unrelated modifications, no style changes, no additional fixes bundled in.
💡 Follow-up: Android NDK r29 symbol conflict (#121172) will need a new fix
The original PR was fixing real symbol conflicts on Android NDK r29. After this revert lands, the issue will resurface. The next attempt should ensure ARM32 EHABI paths remain functional — the original approach of guarding out the C++ exception dispatch functions in Unwind-EHABI.cpp likely broke ARM32 unwinding since those __aeabi_unwind_cpp_pr* personality routines may be needed even when NativeAOT doesn't use the public unw_* API directly.
Generated by Code Review for issue #128828 · ● 2M · ◷
CopilotAI
reviewed
Jun 1, 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.

Pull request overview
This PR reverts #128667, which had guarded out llvm-libunwind public symbols for NativeAOT via a _LIBUNWIND_NATIVEAOT define. The revert is motivated by ARM32 crashes observed in libunwind code, suspected to originate from the guarded build.
Changes:
  • Removes _LIBUNWIND_NATIVEAOT conditional guards from libunwind.cpp and Unwind-EHABI.cpp, restoring the public unw_*/_Unwind_* APIs and EHABI personality routines.
  • Restores the previous CMake definition _LIBUNWIND_DISABLE_ZERO_COST_APIS=1 in place of _LIBUNWIND_NATIVEAOT=1.
  • Removes the UnwindHelpers::FindUnwindSections wrapper and reverts the call site to use LocalAddressSpace::sThisAddressSpace.findUnwindSections directly; updates llvm-libunwind-version.txt.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
FileDescription
src/native/external/llvm-libunwind/src/Unwind-EHABI.cppRemoves _LIBUNWIND_NATIVEAOT guard around EHABI personality and _Unwind_* APIs.
src/native/external/llvm-libunwind/src/libunwind.cppRemoves _LIBUNWIND_NATIVEAOT guard around public unw_* API and LocalAddressSpace.
src/native/external/llvm-libunwind-version.txtDrops the entry for the reverted local patch commit.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.hRemoves FindUnwindSections declaration.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cppRemoves FindUnwindSections implementation.
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cppReverts to calling LocalAddressSpace::sThisAddressSpace.findUnwindSections directly.
src/coreclr/nativeaot/Runtime/CMakeLists.txtReplaces _LIBUNWIND_NATIVEAOT=1 define with _LIBUNWIND_DISABLE_ZERO_COST_APIS=1.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
arm32 is green here, so this is confirmed.
@MichalStrehovsky
MichalStrehovsky
deleted the

revert-128667-libunwind-ifdef

branch
June 1, 2026 05:59

This was referenced Jun 1, 2026

Closed


Open


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 1, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

Assignees

@MichalStrehovskyMichalStrehovsky

Labels

area-NativeAOT-coreclrNO-MERGEThe PR is not ready for merge yet (see discussion for detailed reasons)NO-REVIEWExperimental/testing PR, do NOT review it

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@MichalStrehovsky

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

Copy link


Copy Markdown

Member
Reverts #128667
Seeing crashes on ARM32 in libunwind code, suspect range is d1b43a3...a73aedb so this is a prime suspect.
CopilotAI
review requested due to automatic review settings
June 1, 2026 02:15
@MichalStrehovskyMichalStrehovsky
added

NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
NO-REVIEW
Experimental/testing PR, do NOT review it
labels
Jun 1, 2026
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @agocke, @dotnet/ilc-contrib

See info in area-owners.md if you want to be subscribed.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-nativeaot-outerloop
@azure-pipelines
azure-pipelinesBot
commented
Jun 1, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@github-actions
github-actionsBot
commented
Jun 1, 2026

Copy link


Copy Markdown

Contributor
🤖 Copilot Code Review — PR #128828
Holistic Assessment
Motivation: Justified. ARM32 crashes in libunwind code are traced to the commit range that includes #128667. Reverting the prime suspect is the correct first response to a runtime crash.
Approach: This is a clean, mechanical revert of #128667. The approach is appropriate — revert to restore stability, then re-investigate the Android symbol conflict fix (#121172) with an approach that doesn't break ARM32.
Summary: ✅ LGTM. This is a faithful revert of all 7 files changed in #128667. The diff is the exact inverse of the original PR. No new code, no partial reverts, no manual edits — just a clean undo. The labels (NO-MERGE, NO-REVIEW, draft) indicate the author is running outerloop CI to confirm this fixes the ARM32 crashes before merging.
Detailed Findings
✅ Revert Completeness — All changes from #128667 are fully reverted
Verified that all 7 files modified in #128667 are reverted:
  • CMakeLists.txt: _LIBUNWIND_NATIVEAOT → back to _LIBUNWIND_DISABLE_ZERO_COST_APIS
  • UnixNativeCodeManager.cpp: UnwindHelpers::FindUnwindSections() → back to LocalAddressSpace::sThisAddressSpace.findUnwindSections()
  • UnwindHelpers.cpp: Removes the added FindUnwindSections wrapper
  • UnwindHelpers.h: Removes the added declaration
  • llvm-libunwind-version.txt: Removes the patch tracking entry
  • Unwind-EHABI.cpp: Removes _LIBUNWIND_NATIVEAOT guards around C++ exception dispatch functions
  • libunwind.cpp: Removes _LIBUNWIND_NATIVEAOT guards around the public API
Additions (3) + deletions (26) match the inverse of #128667's additions (26) + deletions (3).
✅ No Collateral Changes — Revert is isolated
No unrelated modifications, no style changes, no additional fixes bundled in.
💡 Follow-up: Android NDK r29 symbol conflict (#121172) will need a new fix
The original PR was fixing real symbol conflicts on Android NDK r29. After this revert lands, the issue will resurface. The next attempt should ensure ARM32 EHABI paths remain functional — the original approach of guarding out the C++ exception dispatch functions in Unwind-EHABI.cpp likely broke ARM32 unwinding since those __aeabi_unwind_cpp_pr* personality routines may be needed even when NativeAOT doesn't use the public unw_* API directly.
Generated by Code Review for issue #128828 · ● 2M · ◷
CopilotAI
reviewed
Jun 1, 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.

Pull request overview
This PR reverts #128667, which had guarded out llvm-libunwind public symbols for NativeAOT via a _LIBUNWIND_NATIVEAOT define. The revert is motivated by ARM32 crashes observed in libunwind code, suspected to originate from the guarded build.
Changes:
  • Removes _LIBUNWIND_NATIVEAOT conditional guards from libunwind.cpp and Unwind-EHABI.cpp, restoring the public unw_*/_Unwind_* APIs and EHABI personality routines.
  • Restores the previous CMake definition _LIBUNWIND_DISABLE_ZERO_COST_APIS=1 in place of _LIBUNWIND_NATIVEAOT=1.
  • Removes the UnwindHelpers::FindUnwindSections wrapper and reverts the call site to use LocalAddressSpace::sThisAddressSpace.findUnwindSections directly; updates llvm-libunwind-version.txt.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
FileDescription
src/native/external/llvm-libunwind/src/Unwind-EHABI.cppRemoves _LIBUNWIND_NATIVEAOT guard around EHABI personality and _Unwind_* APIs.
src/native/external/llvm-libunwind/src/libunwind.cppRemoves _LIBUNWIND_NATIVEAOT guard around public unw_* API and LocalAddressSpace.
src/native/external/llvm-libunwind-version.txtDrops the entry for the reverted local patch commit.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.hRemoves FindUnwindSections declaration.
src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cppRemoves FindUnwindSections implementation.
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cppReverts to calling LocalAddressSpace::sThisAddressSpace.findUnwindSections directly.
src/coreclr/nativeaot/Runtime/CMakeLists.txtReplaces _LIBUNWIND_NATIVEAOT=1 define with _LIBUNWIND_DISABLE_ZERO_COST_APIS=1.
@MichalStrehovsky
MichalStrehovsky
commented
Jun 1, 2026

Copy link


Copy Markdown

MemberAuthor
arm32 is green here, so this is confirmed.
@MichalStrehovsky
MichalStrehovsky
deleted the

revert-128667-libunwind-ifdef

branch
June 1, 2026 05:59

This was referenced Jun 1, 2026

Closed


Open


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 1, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

Assignees

@MichalStrehovskyMichalStrehovsky

Labels

area-NativeAOT-coreclrNO-MERGEThe PR is not ready for merge yet (see discussion for detailed reasons)NO-REVIEWExperimental/testing PR, do NOT review it

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@MichalStrehovsky