') + ')', '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 JS optimizer fail on ES6 spread operator by pavelsavara · Pull Request #18461 · emscripten-core/emscripten · GitHub
Skip to content

fix JS optimizer fail on ES6 spread operator - #18461

Merged
kripken merged 3 commits into
emscripten-core:mainfrom
pavelsavara:optimizer_es6_spread
Jan 5, 2023
Merged

fix JS optimizer fail on ES6 spread operator#18461
kripken merged 3 commits into
emscripten-core:mainfrom
pavelsavara:optimizer_es6_spread

Conversation

@pavelsavara

Copy link
Copy Markdown
Contributor

fixes#12543

@sbc100

Copy link
Copy Markdown
Collaborator

Would be good to add a test somewhere. @kripken probably knows where the best place might be

@pavelsavara
pavelsavara marked this pull request as ready for review January 4, 2023 07:40

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

@pavelsavara

Copy link
Copy Markdown
ContributorAuthor

I don't have the tests running on my local box, so I will make test iterations on the CI. Sorry for the noise.

@kripken

Copy link
Copy Markdown
Member

Running locally, this is the diff from --rebaseline:

diff --git a/test/optimizer/JSDCE-output.js b/test/optimizer/JSDCE-output.js
index 89c4957f7..480f0396b 100644
--- a/test/optimizer/JSDCE-output.js+++ b/test/optimizer/JSDCE-output.js@@ -14,6 +14,19 @@ function g(a) {
Module["g"] = g;
+const sx = {+ a: 1+};++const sar = [ 1, 2, 3 ];++Module["spread"] = {+ b: 2,+ ...sx+};++Module["spread2"] = [ ...sar, 4, 5, 6 ];+
function h(a) {
return a + 1;
}

Comment threadtest/optimizer/JSDCE-output.js Outdated
@kripken

Copy link
Copy Markdown
Member

Committed, should pass I hope...

@kripken
kripken enabled auto-merge (squash) January 5, 2023 00:02
@kripken
kripken merged commit de13451 into emscripten-core:mainJan 5, 2023
@pavelsavara
pavelsavara deleted the optimizer_es6_spread branch April 30, 2026 15:19
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Acorn optimizer - Cannot read property 'type' of undefined

3 participants

@pavelsavara@sbc100@kripken