') + ')', '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('^' + ".*" + ', '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" + ', '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('^' + ".*" + ', '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); } })(); })(); [release/6.0-staging] define UNW_AARCH64 aliases conditionally by VSadov · Pull Request #84873 · dotnet/runtime · GitHub
Skip to content

[release/6.0-staging] define UNW_AARCH64 aliases conditionally - #84873

Merged
VSadov merged 1 commit into
dotnet:release/6.0-stagingfrom
VSadov:6.0-staging_osxBuild
May 3, 2023
Merged

[release/6.0-staging] define UNW_AARCH64 aliases conditionally#84873
VSadov merged 1 commit into
dotnet:release/6.0-stagingfrom
VSadov:6.0-staging_osxBuild

Conversation

@VSadov

@VSadovVSadov commented Apr 15, 2023•
edited
Loading

Copy link
Copy Markdown
Member

backport of: #84591

Customer Impact

Fixes a build break with the new macOS SDK.

The libunwind.h that comes with the new MacOS SDK now has the enum for things like UNW_AARCH64_X19, so the workaround for not having those constants now causes build failures due to duplicate definition.

runtime/src/coreclr/pal/src/exception/seh-unwind.cpp

Line 58 in 4ece8f0

// MacOS uses ARM64 instead of AARCH64 to describe these registers

Without taking build dependency on the newest SDK, we need to apply the workaround conditionally.
Since this is an enum (not a define), we can't do simple #ifndef and need to do a configure test.

Testing

Risk

@ghostghost added the area-PAL-coreclr only for closed issues label Apr 15, 2023
@ghostghost assigned VSadovApr 15, 2023
@VSadov
VSadov requested review from agocke and janvorliApril 15, 2023 02:37
janvorli
janvorli approved these changes Apr 17, 2023
View reviewed changes

@janvorlijanvorli left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thank you!

@VSadovVSadov added the Servicing-consider Issue for next servicing release review label Apr 27, 2023
jeffschwMSFT
jeffschwMSFT approved these changes May 2, 2023
View reviewed changes

@jeffschwMSFTjeffschwMSFT left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

approved. we will take for consideration in 6.0.x

@rbhandarbhanda added Servicing-approved Approved for servicing release and removed Servicing-consider Issue for next servicing release review labels May 2, 2023
@rbhandarbhanda added this to the 6.0.18 milestone May 2, 2023
@VSadov

VSadov commented May 3, 2023

Copy link
Copy Markdown
MemberAuthor

Thanks!

@VSadov
VSadov merged commit 832c3f2 into dotnet:release/6.0-stagingMay 3, 2023
@VSadov
VSadov deleted the 6.0-staging_osxBuild branch May 3, 2023 00:03
@ghostghost locked as resolved and limited conversation to collaborators Jun 2, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jeffschwMSFTjeffschwMSFTjeffschwMSFT approved these changes
@janvorlijanvorlijanvorli approved these changes
@agockeagockeAwaiting requested review from agocke

Assignees

@VSadovVSadov

Labels

area-PAL-coreclronly for closed issuesServicing-approvedApproved for servicing release

Projects

None yet

Milestone

6.0.18

Development

Successfully merging this pull request may close these issues.

4 participants

@VSadov@jeffschwMSFT@janvorli@rbhanda