[mono][interp] Resolve virtual method on delegates created by compiled code - #101168

Merged
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate
Apr 17, 2024
Merged

[mono][interp] Resolve virtual method on delegates created by compiled code#101168
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate

Conversation

@BrzVlad

Copy link
Copy Markdown
Member

Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.

Fixes#101074

…d code
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@simonrozsival

Copy link
Copy Markdown
Member

We should backport this fix to a .NET 8 servicing release

@simonrozsival

Copy link
Copy Markdown
Member

/cc @vitek-karas

@vitek-karas

Copy link
Copy Markdown
Member

+1 on backporting. @BrzVlad how risky is this fix for servicing?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I think it is rather low risk (but not 100% risk free as I would have considered all my previous backports in general). The main problem is that we don't have good testing for this code path.

@simonrozsival

Copy link
Copy Markdown
Member

/backport to release/8.0-staging

@github-actions

Copy link
Copy Markdown
Contributor

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

@vitek-karas

Copy link
Copy Markdown
Member

@BrzVlad Sorry for not understanding the code change, so I'm going to ask: The new behavior will kick in only for the cases which would fail otherwise, or would it also be used in some cases which already work today and this might change that behavior?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

@vitek-karas So long story short, if the delegate is created by code that doesn't handle interp related initialization (when jit inlines some delegate initialization) we hit this path in interpreter when first invoking the delegate. What this change does is when that first invoke happens and the method is virtual we resolve the virtual method on the target object. So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@simonrozsival

Copy link
Copy Markdown
Member

So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@BrzVlad so does this mean that there could be a case like

class BaseClass
{
public virtual int GetValue() => 1;
}
class DerivedClass : BaseClass
{
public override int GetValue() => 2;
}

where the developer would call a delegate for inst.GetValue and they would be getting 1 because of the bug and their code would expect this behavior, and after this change, it will break because it will start returning 2?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I wouldn't really worry about cases like that. I was rather saying that maybe in your case, the target object is a BaseClass so BaseClass.GetValue is the correct method to call, but with the fix a virtual method lookup happens on the target object, and maybe something unexpected can happen here. I can't pinpoint something specific, it is unlikely for something to break, just saying.

matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
…d code (dotnet#101168)
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Mono] App crashes with BadImageFormatException: Method has no body

5 participants

@BrzVlad@simonrozsival@vitek-karas@kotlarmilos@lewing
, '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

[mono][interp] Resolve virtual method on delegates created by compiled code - #101168

Merged
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate
Apr 17, 2024
Merged

[mono][interp] Resolve virtual method on delegates created by compiled code#101168
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate

Conversation

@BrzVlad

Copy link
Copy Markdown
Member

Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.

Fixes#101074

…d code
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@simonrozsival

Copy link
Copy Markdown
Member

We should backport this fix to a .NET 8 servicing release

@simonrozsival

Copy link
Copy Markdown
Member

/cc @vitek-karas

@vitek-karas

Copy link
Copy Markdown
Member

+1 on backporting. @BrzVlad how risky is this fix for servicing?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I think it is rather low risk (but not 100% risk free as I would have considered all my previous backports in general). The main problem is that we don't have good testing for this code path.

@simonrozsival

Copy link
Copy Markdown
Member

/backport to release/8.0-staging

@github-actions

Copy link
Copy Markdown
Contributor

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

@vitek-karas

Copy link
Copy Markdown
Member

@BrzVlad Sorry for not understanding the code change, so I'm going to ask: The new behavior will kick in only for the cases which would fail otherwise, or would it also be used in some cases which already work today and this might change that behavior?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

@vitek-karas So long story short, if the delegate is created by code that doesn't handle interp related initialization (when jit inlines some delegate initialization) we hit this path in interpreter when first invoking the delegate. What this change does is when that first invoke happens and the method is virtual we resolve the virtual method on the target object. So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@simonrozsival

Copy link
Copy Markdown
Member

So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@BrzVlad so does this mean that there could be a case like

class BaseClass
{
public virtual int GetValue() => 1;
}
class DerivedClass : BaseClass
{
public override int GetValue() => 2;
}

where the developer would call a delegate for inst.GetValue and they would be getting 1 because of the bug and their code would expect this behavior, and after this change, it will break because it will start returning 2?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I wouldn't really worry about cases like that. I was rather saying that maybe in your case, the target object is a BaseClass so BaseClass.GetValue is the correct method to call, but with the fix a virtual method lookup happens on the target object, and maybe something unexpected can happen here. I can't pinpoint something specific, it is unlikely for something to break, just saying.

matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
…d code (dotnet#101168)
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Mono] App crashes with BadImageFormatException: Method has no body

5 participants

@BrzVlad@simonrozsival@vitek-karas@kotlarmilos@lewing
, '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

[mono][interp] Resolve virtual method on delegates created by compiled code - #101168

Merged
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate
Apr 17, 2024
Merged

[mono][interp] Resolve virtual method on delegates created by compiled code#101168
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate

Conversation

@BrzVlad

Copy link
Copy Markdown
Member

Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.

Fixes#101074

…d code
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@simonrozsival

Copy link
Copy Markdown
Member

We should backport this fix to a .NET 8 servicing release

@simonrozsival

Copy link
Copy Markdown
Member

/cc @vitek-karas

@vitek-karas

Copy link
Copy Markdown
Member

+1 on backporting. @BrzVlad how risky is this fix for servicing?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I think it is rather low risk (but not 100% risk free as I would have considered all my previous backports in general). The main problem is that we don't have good testing for this code path.

@simonrozsival

Copy link
Copy Markdown
Member

/backport to release/8.0-staging

@github-actions

Copy link
Copy Markdown
Contributor

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

@vitek-karas

Copy link
Copy Markdown
Member

@BrzVlad Sorry for not understanding the code change, so I'm going to ask: The new behavior will kick in only for the cases which would fail otherwise, or would it also be used in some cases which already work today and this might change that behavior?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

@vitek-karas So long story short, if the delegate is created by code that doesn't handle interp related initialization (when jit inlines some delegate initialization) we hit this path in interpreter when first invoking the delegate. What this change does is when that first invoke happens and the method is virtual we resolve the virtual method on the target object. So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@simonrozsival

Copy link
Copy Markdown
Member

So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@BrzVlad so does this mean that there could be a case like

class BaseClass
{
public virtual int GetValue() => 1;
}
class DerivedClass : BaseClass
{
public override int GetValue() => 2;
}

where the developer would call a delegate for inst.GetValue and they would be getting 1 because of the bug and their code would expect this behavior, and after this change, it will break because it will start returning 2?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I wouldn't really worry about cases like that. I was rather saying that maybe in your case, the target object is a BaseClass so BaseClass.GetValue is the correct method to call, but with the fix a virtual method lookup happens on the target object, and maybe something unexpected can happen here. I can't pinpoint something specific, it is unlikely for something to break, just saying.

matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
…d code (dotnet#101168)
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Mono] App crashes with BadImageFormatException: Method has no body

5 participants

@BrzVlad@simonrozsival@vitek-karas@kotlarmilos@lewing
, '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

[mono][interp] Resolve virtual method on delegates created by compiled code - #101168

Merged
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate
Apr 17, 2024
Merged

[mono][interp] Resolve virtual method on delegates created by compiled code#101168
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate

Conversation

@BrzVlad

Copy link
Copy Markdown
Member

Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.

Fixes#101074

…d code
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@simonrozsival

Copy link
Copy Markdown
Member

We should backport this fix to a .NET 8 servicing release

@simonrozsival

Copy link
Copy Markdown
Member

/cc @vitek-karas

@vitek-karas

Copy link
Copy Markdown
Member

+1 on backporting. @BrzVlad how risky is this fix for servicing?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I think it is rather low risk (but not 100% risk free as I would have considered all my previous backports in general). The main problem is that we don't have good testing for this code path.

@simonrozsival

Copy link
Copy Markdown
Member

/backport to release/8.0-staging

@github-actions

Copy link
Copy Markdown
Contributor

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

@vitek-karas

Copy link
Copy Markdown
Member

@BrzVlad Sorry for not understanding the code change, so I'm going to ask: The new behavior will kick in only for the cases which would fail otherwise, or would it also be used in some cases which already work today and this might change that behavior?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

@vitek-karas So long story short, if the delegate is created by code that doesn't handle interp related initialization (when jit inlines some delegate initialization) we hit this path in interpreter when first invoking the delegate. What this change does is when that first invoke happens and the method is virtual we resolve the virtual method on the target object. So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@simonrozsival

Copy link
Copy Markdown
Member

So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@BrzVlad so does this mean that there could be a case like

class BaseClass
{
public virtual int GetValue() => 1;
}
class DerivedClass : BaseClass
{
public override int GetValue() => 2;
}

where the developer would call a delegate for inst.GetValue and they would be getting 1 because of the bug and their code would expect this behavior, and after this change, it will break because it will start returning 2?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I wouldn't really worry about cases like that. I was rather saying that maybe in your case, the target object is a BaseClass so BaseClass.GetValue is the correct method to call, but with the fix a virtual method lookup happens on the target object, and maybe something unexpected can happen here. I can't pinpoint something specific, it is unlikely for something to break, just saying.

matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
…d code (dotnet#101168)
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Mono] App crashes with BadImageFormatException: Method has no body

5 participants

@BrzVlad@simonrozsival@vitek-karas@kotlarmilos@lewing
, '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

[mono][interp] Resolve virtual method on delegates created by compiled code - #101168

Merged
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate
Apr 17, 2024
Merged

[mono][interp] Resolve virtual method on delegates created by compiled code#101168
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate

Conversation

@BrzVlad

Copy link
Copy Markdown
Member

Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.

Fixes#101074

…d code
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@simonrozsival

Copy link
Copy Markdown
Member

We should backport this fix to a .NET 8 servicing release

@simonrozsival

Copy link
Copy Markdown
Member

/cc @vitek-karas

@vitek-karas

Copy link
Copy Markdown
Member

+1 on backporting. @BrzVlad how risky is this fix for servicing?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I think it is rather low risk (but not 100% risk free as I would have considered all my previous backports in general). The main problem is that we don't have good testing for this code path.

@simonrozsival

Copy link
Copy Markdown
Member

/backport to release/8.0-staging

@github-actions

Copy link
Copy Markdown
Contributor

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

@vitek-karas

Copy link
Copy Markdown
Member

@BrzVlad Sorry for not understanding the code change, so I'm going to ask: The new behavior will kick in only for the cases which would fail otherwise, or would it also be used in some cases which already work today and this might change that behavior?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

@vitek-karas So long story short, if the delegate is created by code that doesn't handle interp related initialization (when jit inlines some delegate initialization) we hit this path in interpreter when first invoking the delegate. What this change does is when that first invoke happens and the method is virtual we resolve the virtual method on the target object. So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@simonrozsival

Copy link
Copy Markdown
Member

So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@BrzVlad so does this mean that there could be a case like

class BaseClass
{
public virtual int GetValue() => 1;
}
class DerivedClass : BaseClass
{
public override int GetValue() => 2;
}

where the developer would call a delegate for inst.GetValue and they would be getting 1 because of the bug and their code would expect this behavior, and after this change, it will break because it will start returning 2?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I wouldn't really worry about cases like that. I was rather saying that maybe in your case, the target object is a BaseClass so BaseClass.GetValue is the correct method to call, but with the fix a virtual method lookup happens on the target object, and maybe something unexpected can happen here. I can't pinpoint something specific, it is unlikely for something to break, just saying.

matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
…d code (dotnet#101168)
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Mono] App crashes with BadImageFormatException: Method has no body

5 participants

@BrzVlad@simonrozsival@vitek-karas@kotlarmilos@lewing
, '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

[mono][interp] Resolve virtual method on delegates created by compiled code - #101168

Merged
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate
Apr 17, 2024
Merged

[mono][interp] Resolve virtual method on delegates created by compiled code#101168
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate

Conversation

@BrzVlad

Copy link
Copy Markdown
Member

Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.

Fixes#101074

…d code
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@simonrozsival

Copy link
Copy Markdown
Member

We should backport this fix to a .NET 8 servicing release

@simonrozsival

Copy link
Copy Markdown
Member

/cc @vitek-karas

@vitek-karas

Copy link
Copy Markdown
Member

+1 on backporting. @BrzVlad how risky is this fix for servicing?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I think it is rather low risk (but not 100% risk free as I would have considered all my previous backports in general). The main problem is that we don't have good testing for this code path.

@simonrozsival

Copy link
Copy Markdown
Member

/backport to release/8.0-staging

@github-actions

Copy link
Copy Markdown
Contributor

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

@vitek-karas

Copy link
Copy Markdown
Member

@BrzVlad Sorry for not understanding the code change, so I'm going to ask: The new behavior will kick in only for the cases which would fail otherwise, or would it also be used in some cases which already work today and this might change that behavior?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

@vitek-karas So long story short, if the delegate is created by code that doesn't handle interp related initialization (when jit inlines some delegate initialization) we hit this path in interpreter when first invoking the delegate. What this change does is when that first invoke happens and the method is virtual we resolve the virtual method on the target object. So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@simonrozsival

Copy link
Copy Markdown
Member

So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@BrzVlad so does this mean that there could be a case like

class BaseClass
{
public virtual int GetValue() => 1;
}
class DerivedClass : BaseClass
{
public override int GetValue() => 2;
}

where the developer would call a delegate for inst.GetValue and they would be getting 1 because of the bug and their code would expect this behavior, and after this change, it will break because it will start returning 2?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I wouldn't really worry about cases like that. I was rather saying that maybe in your case, the target object is a BaseClass so BaseClass.GetValue is the correct method to call, but with the fix a virtual method lookup happens on the target object, and maybe something unexpected can happen here. I can't pinpoint something specific, it is unlikely for something to break, just saying.

matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
…d code (dotnet#101168)
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Mono] App crashes with BadImageFormatException: Method has no body

5 participants

@BrzVlad@simonrozsival@vitek-karas@kotlarmilos@lewing
, '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

[mono][interp] Resolve virtual method on delegates created by compiled code - #101168

Merged
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate
Apr 17, 2024
Merged

[mono][interp] Resolve virtual method on delegates created by compiled code#101168
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate

Conversation

@BrzVlad

Copy link
Copy Markdown
Member

Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.

Fixes#101074

…d code
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@simonrozsival

Copy link
Copy Markdown
Member

We should backport this fix to a .NET 8 servicing release

@simonrozsival

Copy link
Copy Markdown
Member

/cc @vitek-karas

@vitek-karas

Copy link
Copy Markdown
Member

+1 on backporting. @BrzVlad how risky is this fix for servicing?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I think it is rather low risk (but not 100% risk free as I would have considered all my previous backports in general). The main problem is that we don't have good testing for this code path.

@simonrozsival

Copy link
Copy Markdown
Member

/backport to release/8.0-staging

@github-actions

Copy link
Copy Markdown
Contributor

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

@vitek-karas

Copy link
Copy Markdown
Member

@BrzVlad Sorry for not understanding the code change, so I'm going to ask: The new behavior will kick in only for the cases which would fail otherwise, or would it also be used in some cases which already work today and this might change that behavior?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

@vitek-karas So long story short, if the delegate is created by code that doesn't handle interp related initialization (when jit inlines some delegate initialization) we hit this path in interpreter when first invoking the delegate. What this change does is when that first invoke happens and the method is virtual we resolve the virtual method on the target object. So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@simonrozsival

Copy link
Copy Markdown
Member

So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@BrzVlad so does this mean that there could be a case like

class BaseClass
{
public virtual int GetValue() => 1;
}
class DerivedClass : BaseClass
{
public override int GetValue() => 2;
}

where the developer would call a delegate for inst.GetValue and they would be getting 1 because of the bug and their code would expect this behavior, and after this change, it will break because it will start returning 2?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I wouldn't really worry about cases like that. I was rather saying that maybe in your case, the target object is a BaseClass so BaseClass.GetValue is the correct method to call, but with the fix a virtual method lookup happens on the target object, and maybe something unexpected can happen here. I can't pinpoint something specific, it is unlikely for something to break, just saying.

matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
…d code (dotnet#101168)
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Mono] App crashes with BadImageFormatException: Method has no body

5 participants

@BrzVlad@simonrozsival@vitek-karas@kotlarmilos@lewing
, '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

[mono][interp] Resolve virtual method on delegates created by compiled code - #101168

Merged
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate
Apr 17, 2024
Merged

[mono][interp] Resolve virtual method on delegates created by compiled code#101168
lewing merged 1 commit into
dotnet:mainfrom
BrzVlad:fix-interp-mixed-virt-delegate

Conversation

@BrzVlad

Copy link
Copy Markdown
Member

Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.

Fixes#101074

…d code
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@simonrozsival

Copy link
Copy Markdown
Member

We should backport this fix to a .NET 8 servicing release

@simonrozsival

Copy link
Copy Markdown
Member

/cc @vitek-karas

@vitek-karas

Copy link
Copy Markdown
Member

+1 on backporting. @BrzVlad how risky is this fix for servicing?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I think it is rather low risk (but not 100% risk free as I would have considered all my previous backports in general). The main problem is that we don't have good testing for this code path.

@simonrozsival

Copy link
Copy Markdown
Member

/backport to release/8.0-staging

@github-actions

Copy link
Copy Markdown
Contributor

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

@vitek-karas

Copy link
Copy Markdown
Member

@BrzVlad Sorry for not understanding the code change, so I'm going to ask: The new behavior will kick in only for the cases which would fail otherwise, or would it also be used in some cases which already work today and this might change that behavior?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

@vitek-karas So long story short, if the delegate is created by code that doesn't handle interp related initialization (when jit inlines some delegate initialization) we hit this path in interpreter when first invoking the delegate. What this change does is when that first invoke happens and the method is virtual we resolve the virtual method on the target object. So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@simonrozsival

Copy link
Copy Markdown
Member

So, in theory, there could have been cases where this code was calling the correct method by chance and after now resolving the virtual method something unexpected could happen, but I would say the chance is very low.

@BrzVlad so does this mean that there could be a case like

class BaseClass
{
public virtual int GetValue() => 1;
}
class DerivedClass : BaseClass
{
public override int GetValue() => 2;
}

where the developer would call a delegate for inst.GetValue and they would be getting 1 because of the bug and their code would expect this behavior, and after this change, it will break because it will start returning 2?

@BrzVlad

Copy link
Copy Markdown
MemberAuthor

I wouldn't really worry about cases like that. I was rather saying that maybe in your case, the target object is a BaseClass so BaseClass.GetValue is the correct method to call, but with the fix a virtual method lookup happens on the target object, and maybe something unexpected can happen here. I can't pinpoint something specific, it is unlikely for something to break, just saying.

matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
…d code (dotnet#101168)
Creating a delegate would normally end up calling into the runtime via ves_icall_mono_delegate_ctor. However, jit/aot backand have a fastpath where the delegate is not fully initialized (relying on the delegate trampoline to resolve the actual method to be called when the delegate is first called). Interp delegate initialization therefore doesn't take place. If this is the case and the delegate method is virtual, we would need to resolve it based on the target object.
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Mono] App crashes with BadImageFormatException: Method has no body

5 participants

@BrzVlad@simonrozsival@vitek-karas@kotlarmilos@lewing