') + ')', '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); } })(); })(); Fix createdump arg parsing for signal-based exceptions by hoyosjs · Pull Request #85422 · dotnet/runtime · GitHub
Skip to content

Fix createdump arg parsing for signal-based exceptions - #85422

Merged
hoyosjs merged 1 commit into
dotnet:mainfrom
hoyosjs:juhoyosa/fix-createdump-args
Apr 27, 2023
Merged

Fix createdump arg parsing for signal-based exceptions#85422
hoyosjs merged 1 commit into
dotnet:mainfrom
hoyosjs:juhoyosa/fix-createdump-args

Conversation

@hoyosjs

@hoyosjshoyosjs commented Apr 26, 2023

Copy link
Copy Markdown
Member

No description provided.

@hoyosjshoyosjs self-assigned this Apr 26, 2023
@ghost

ghost commented Apr 26, 2023

Copy link
Copy Markdown

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

Issue Details

null

Author:hoyosjs
Assignees:hoyosjs
Labels:

area-Diagnostics-coreclr

Milestone:-

@hoyosjs

hoyosjs commented Apr 26, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to release/7.0-staging

@hoyosjs

hoyosjs commented Apr 26, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to release/6.0-staging

@github-actions

github-actionsBot commented Apr 26, 2023

Copy link
Copy Markdown
Contributor

Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/4813695249

@github-actions

github-actionsBot commented Apr 26, 2023

Copy link
Copy Markdown
Contributor

Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/4813696243

@github-actionsgithub-actionsBot mentioned this pull request Apr 26, 2023
Merged
tommcdon
tommcdon approved these changes Apr 26, 2023
View reviewed changes

@tommcdontommcdon left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@github-actions

github-actionsBot commented Apr 26, 2023

Copy link
Copy Markdown
Contributor

@hoyosjs backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix createdump arg parsing for signal-based exceptions
Using index info to reconstruct a base tree...
M	src/coreclr/debug/createdump/createdump.h
M	src/coreclr/debug/createdump/main.cpp
Falling back to patching base and 3-way merge...
Auto-merging src/coreclr/debug/createdump/main.cpp
CONFLICT (content): Merge conflict in src/coreclr/debug/createdump/main.cpp
Auto-merging src/coreclr/debug/createdump/createdump.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix createdump arg parsing for signal-based exceptions
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions

github-actionsBot commented Apr 26, 2023

Copy link
Copy Markdown
Contributor

@hoyosjs an error occurred while backporting to release/6.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@tommcdon
tommcdon requested a review from mikem8361April 26, 2023 21:55
mikem8361
mikem8361 approved these changes Apr 26, 2023
View reviewed changes

@mikem8361mikem8361 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.

Thanks!

@hoyosjshoyosjs mentioned this pull request Apr 26, 2023
Merged
This was referenced Apr 27, 2023
Closed
Closed
@hoyosjs
hoyosjs merged commit 94f2b65 into dotnet:mainApr 27, 2023
@hoyosjs
hoyosjs deleted the juhoyosa/fix-createdump-args branch April 27, 2023 22:15
@ghostghost locked as resolved and limited conversation to collaborators May 28, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@tommcdontommcdontommcdon approved these changes
+1 more reviewer
@mikem8361mikem8361mikem8361 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@hoyosjshoyosjs

Labels

area-Diagnostics-coreclr

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@hoyosjs@mikem8361@tommcdon