Extend type preinitialization support - #114374

Merged
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit
Apr 9, 2025
Merged

Extend type preinitialization support#114374
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit

Conversation

@MichalStrehovsky

Copy link
Copy Markdown
Member

Extends preinitialization support to cover scenario in #114354 (comment).

  • We only supported ldsflda instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added TestByRefFieldAddressEquality test tests things that go wrong if we don't do interning.
  • We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
  • We had limitations around ldobj that is used when dereferencing pointers. This lifts some of the restrictions and we can now ldobj many valuetypes, including the special vtable ones.

Cc @dotnet/ilc-contrib @Sergio0694

Extends preinitialization support to cover scenario in dotnet#114354 (comment).
* We only supported `ldsflda` instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added `TestByRefFieldAddressEquality` test tests things that go wrong if we don't do interning.
* We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
* We had limitations around `ldobj` that is used when dereferencing pointers. This lifts some of the restrictions and we can now `ldobj` many valuetypes, including the special vtable ones.
CopilotAI review requested due to automatic review settings April 8, 2025 13:16

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.

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/tools/aot/ILCompiler.Compiler/Compiler/TypePreinit.cs Outdated
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@github-actionsgithub-actionsBot mentioned this pull request Apr 8, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-nativeaot-outerloop

@azure-pipelines

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

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

Since you're also adding a bunch more tests, here's another one we could add, just to cover more possible scenarios. This one covers COM composition scenarios with custom blittable COM object types (eg. like TerraFX and ComputeSharp work). This one I ported from ComputeSharp and has two vtables in the type, for composition:

internalunsafestructID2D1EffectImplVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,void*,void*,int>Initialize;publicdelegate* unmanaged[MemberFunction]<void*,int,int>PrepareForRender;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetGraph;}internalunsafestructID2D1DrawTransformVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,uint>GetInputCount;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,int>MapOutputRectToInputRects;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,Rectangle*,Rectangle*,int>MapInputRectsToOutputRect;publicdelegate* unmanaged[MemberFunction]<void*,uint,Rectangle,Rectangle*,int>MapInvalidRect;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetDrawInfo;}internalunsafestructCustomD2D1EffectImpl{privatestaticreadonlyID2D1EffectImplVtblID2D1EffectImplVtbl;privatestaticreadonlyID2D1DrawTransformVtblID2D1DrawTransformVtbl;staticCustomD2D1EffectImpl(){ID2D1EffectImplVtbl.QueryInterface=&ID2D1EffectImplMethods.QueryInterface;ID2D1EffectImplVtbl.AddRef=&ID2D1EffectImplMethods.AddRef;ID2D1EffectImplVtbl.Release=&ID2D1EffectImplMethods.Release;ID2D1EffectImplVtbl.Initialize=&ID2D1EffectImplMethods.Initialize;ID2D1EffectImplVtbl.PrepareForRender=&ID2D1EffectImplMethods.PrepareForRender;ID2D1EffectImplVtbl.SetGraph=&ID2D1EffectImplMethods.SetGraph;ID2D1DrawTransformVtbl.QueryInterface=&ID2D1DrawTransformMethods.QueryInterface;ID2D1DrawTransformVtbl.AddRef=&ID2D1DrawTransformMethods.AddRef;ID2D1DrawTransformVtbl.Release=&ID2D1DrawTransformMethods.Release;ID2D1DrawTransformVtbl.GetInputCount=&ID2D1DrawTransformMethods.GetInputCount;ID2D1DrawTransformVtbl.MapOutputRectToInputRects=&ID2D1DrawTransformMethods.MapOutputRectToInputRects;ID2D1DrawTransformVtbl.MapInputRectsToOutputRect=&ID2D1DrawTransformMethods.MapInputRectsToOutputRect;ID2D1DrawTransformVtbl.MapInvalidRect=&ID2D1DrawTransformMethods.MapInvalidRect;ID2D1DrawTransformVtbl.SetDrawInfo=&ID2D1DrawTransformMethods.SetDrawInfo;}privatestaticclassID2D1EffectImplMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintInitialize(void*@this,void*effectContext,void*transformGraph)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintPrepareForRender(void*@this,intchangeType)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetGraph(void*@this,void*transformGraph)=>0;}privatestaticunsafeclassID2D1DrawTransformMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintGetInputCount(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapOutputRectToInputRects(void*@this,Rectangle*outputRect,Rectangle*inputRects,uintinputRectsCount)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInputRectsToOutputRect(void*@this,Rectangle*inputRects,Rectangle*inputOpaqueSubRects,uintinputRectCount,Rectangle*outputRect,Rectangle*outputOpaqueSubRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInvalidRect(void*@this,uintinputIndex,RectangleinvalidInputRect,Rectangle*invalidOutputRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetDrawInfo(void*@this,void*drawInfo)=>0;}}

@Sergio0694

Copy link
Copy Markdown
Contributor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Sergio0694 added a commit to microsoft/CsWinRT that referenced this pull request Apr 9, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

The outerloop run looks good. Linux-x64 runs into a common OOM in LibraryImportGenerator.Tests and both the Windows legs run into the UCRT bug that I have a workaround for in #109006 (we might want to approve & merge, this is the top reliability issue in nativeaot outerloops at the moment).

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Yeah, this just works. The interpreter is pretty composable. So if type X can be preinitialized and type Y can be preinitialized and you merged the two types into one (unioning the fields and concatenating the cctors), the merged type will be preinitialized too, barring hitting the 100000 instruction count limit. I'll not add the test, we don't directly test the composability of everything.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

Thank you!

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

@Sergio0694

Copy link
Copy Markdown
Contributor

Wouldn't all these already be in a readonly section? I assumed when they get folded, they go into RVA fields? 🤔

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

It would only make a meaningful difference when data dehydration is turned off. Since we plan to turn it off by default on Windows only, it would be a Windows-only feature.

I think it should be easy enough if we say that all non-GC static fields on the type need to be read only for this to happen. If we wanted to do it field-by-field, it would be much harder.

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/ba-g the Tools_Test failure is known and was fixed in #114424

@MichalStrehovsky
MichalStrehovsky merged commit a6553ac into dotnet:mainApr 9, 2025
@MichalStrehovsky
MichalStrehovsky deleted the morepreinit branch April 9, 2025 20:48
@jkotas

Copy link
Copy Markdown
Member

it would be a Windows-only feature.
all non-GC static fields on the type need to be read only for this to happen

These limitations sound reasonable to me. It would help with security (we have other Windows-only mitigations) and private working set (separating readonly and writeable data reduces dirty pages).

@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 10, 2025
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.

4 participants

@MichalStrehovsky@Sergio0694@jkotas
, '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

Extend type preinitialization support - #114374

Merged
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit
Apr 9, 2025
Merged

Extend type preinitialization support#114374
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit

Conversation

@MichalStrehovsky

Copy link
Copy Markdown
Member

Extends preinitialization support to cover scenario in #114354 (comment).

  • We only supported ldsflda instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added TestByRefFieldAddressEquality test tests things that go wrong if we don't do interning.
  • We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
  • We had limitations around ldobj that is used when dereferencing pointers. This lifts some of the restrictions and we can now ldobj many valuetypes, including the special vtable ones.

Cc @dotnet/ilc-contrib @Sergio0694

Extends preinitialization support to cover scenario in dotnet#114354 (comment).
* We only supported `ldsflda` instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added `TestByRefFieldAddressEquality` test tests things that go wrong if we don't do interning.
* We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
* We had limitations around `ldobj` that is used when dereferencing pointers. This lifts some of the restrictions and we can now `ldobj` many valuetypes, including the special vtable ones.
CopilotAI review requested due to automatic review settings April 8, 2025 13:16

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.

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/tools/aot/ILCompiler.Compiler/Compiler/TypePreinit.cs Outdated
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@github-actionsgithub-actionsBot mentioned this pull request Apr 8, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-nativeaot-outerloop

@azure-pipelines

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

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

Since you're also adding a bunch more tests, here's another one we could add, just to cover more possible scenarios. This one covers COM composition scenarios with custom blittable COM object types (eg. like TerraFX and ComputeSharp work). This one I ported from ComputeSharp and has two vtables in the type, for composition:

internalunsafestructID2D1EffectImplVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,void*,void*,int>Initialize;publicdelegate* unmanaged[MemberFunction]<void*,int,int>PrepareForRender;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetGraph;}internalunsafestructID2D1DrawTransformVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,uint>GetInputCount;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,int>MapOutputRectToInputRects;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,Rectangle*,Rectangle*,int>MapInputRectsToOutputRect;publicdelegate* unmanaged[MemberFunction]<void*,uint,Rectangle,Rectangle*,int>MapInvalidRect;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetDrawInfo;}internalunsafestructCustomD2D1EffectImpl{privatestaticreadonlyID2D1EffectImplVtblID2D1EffectImplVtbl;privatestaticreadonlyID2D1DrawTransformVtblID2D1DrawTransformVtbl;staticCustomD2D1EffectImpl(){ID2D1EffectImplVtbl.QueryInterface=&ID2D1EffectImplMethods.QueryInterface;ID2D1EffectImplVtbl.AddRef=&ID2D1EffectImplMethods.AddRef;ID2D1EffectImplVtbl.Release=&ID2D1EffectImplMethods.Release;ID2D1EffectImplVtbl.Initialize=&ID2D1EffectImplMethods.Initialize;ID2D1EffectImplVtbl.PrepareForRender=&ID2D1EffectImplMethods.PrepareForRender;ID2D1EffectImplVtbl.SetGraph=&ID2D1EffectImplMethods.SetGraph;ID2D1DrawTransformVtbl.QueryInterface=&ID2D1DrawTransformMethods.QueryInterface;ID2D1DrawTransformVtbl.AddRef=&ID2D1DrawTransformMethods.AddRef;ID2D1DrawTransformVtbl.Release=&ID2D1DrawTransformMethods.Release;ID2D1DrawTransformVtbl.GetInputCount=&ID2D1DrawTransformMethods.GetInputCount;ID2D1DrawTransformVtbl.MapOutputRectToInputRects=&ID2D1DrawTransformMethods.MapOutputRectToInputRects;ID2D1DrawTransformVtbl.MapInputRectsToOutputRect=&ID2D1DrawTransformMethods.MapInputRectsToOutputRect;ID2D1DrawTransformVtbl.MapInvalidRect=&ID2D1DrawTransformMethods.MapInvalidRect;ID2D1DrawTransformVtbl.SetDrawInfo=&ID2D1DrawTransformMethods.SetDrawInfo;}privatestaticclassID2D1EffectImplMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintInitialize(void*@this,void*effectContext,void*transformGraph)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintPrepareForRender(void*@this,intchangeType)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetGraph(void*@this,void*transformGraph)=>0;}privatestaticunsafeclassID2D1DrawTransformMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintGetInputCount(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapOutputRectToInputRects(void*@this,Rectangle*outputRect,Rectangle*inputRects,uintinputRectsCount)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInputRectsToOutputRect(void*@this,Rectangle*inputRects,Rectangle*inputOpaqueSubRects,uintinputRectCount,Rectangle*outputRect,Rectangle*outputOpaqueSubRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInvalidRect(void*@this,uintinputIndex,RectangleinvalidInputRect,Rectangle*invalidOutputRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetDrawInfo(void*@this,void*drawInfo)=>0;}}

@Sergio0694

Copy link
Copy Markdown
Contributor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Sergio0694 added a commit to microsoft/CsWinRT that referenced this pull request Apr 9, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

The outerloop run looks good. Linux-x64 runs into a common OOM in LibraryImportGenerator.Tests and both the Windows legs run into the UCRT bug that I have a workaround for in #109006 (we might want to approve & merge, this is the top reliability issue in nativeaot outerloops at the moment).

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Yeah, this just works. The interpreter is pretty composable. So if type X can be preinitialized and type Y can be preinitialized and you merged the two types into one (unioning the fields and concatenating the cctors), the merged type will be preinitialized too, barring hitting the 100000 instruction count limit. I'll not add the test, we don't directly test the composability of everything.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

Thank you!

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

@Sergio0694

Copy link
Copy Markdown
Contributor

Wouldn't all these already be in a readonly section? I assumed when they get folded, they go into RVA fields? 🤔

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

It would only make a meaningful difference when data dehydration is turned off. Since we plan to turn it off by default on Windows only, it would be a Windows-only feature.

I think it should be easy enough if we say that all non-GC static fields on the type need to be read only for this to happen. If we wanted to do it field-by-field, it would be much harder.

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/ba-g the Tools_Test failure is known and was fixed in #114424

@MichalStrehovsky
MichalStrehovsky merged commit a6553ac into dotnet:mainApr 9, 2025
@MichalStrehovsky
MichalStrehovsky deleted the morepreinit branch April 9, 2025 20:48
@jkotas

Copy link
Copy Markdown
Member

it would be a Windows-only feature.
all non-GC static fields on the type need to be read only for this to happen

These limitations sound reasonable to me. It would help with security (we have other Windows-only mitigations) and private working set (separating readonly and writeable data reduces dirty pages).

@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 10, 2025
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.

4 participants

@MichalStrehovsky@Sergio0694@jkotas
, '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

Extend type preinitialization support - #114374

Merged
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit
Apr 9, 2025
Merged

Extend type preinitialization support#114374
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit

Conversation

@MichalStrehovsky

Copy link
Copy Markdown
Member

Extends preinitialization support to cover scenario in #114354 (comment).

  • We only supported ldsflda instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added TestByRefFieldAddressEquality test tests things that go wrong if we don't do interning.
  • We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
  • We had limitations around ldobj that is used when dereferencing pointers. This lifts some of the restrictions and we can now ldobj many valuetypes, including the special vtable ones.

Cc @dotnet/ilc-contrib @Sergio0694

Extends preinitialization support to cover scenario in dotnet#114354 (comment).
* We only supported `ldsflda` instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added `TestByRefFieldAddressEquality` test tests things that go wrong if we don't do interning.
* We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
* We had limitations around `ldobj` that is used when dereferencing pointers. This lifts some of the restrictions and we can now `ldobj` many valuetypes, including the special vtable ones.
CopilotAI review requested due to automatic review settings April 8, 2025 13:16

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.

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/tools/aot/ILCompiler.Compiler/Compiler/TypePreinit.cs Outdated
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@github-actionsgithub-actionsBot mentioned this pull request Apr 8, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-nativeaot-outerloop

@azure-pipelines

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

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

Since you're also adding a bunch more tests, here's another one we could add, just to cover more possible scenarios. This one covers COM composition scenarios with custom blittable COM object types (eg. like TerraFX and ComputeSharp work). This one I ported from ComputeSharp and has two vtables in the type, for composition:

internalunsafestructID2D1EffectImplVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,void*,void*,int>Initialize;publicdelegate* unmanaged[MemberFunction]<void*,int,int>PrepareForRender;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetGraph;}internalunsafestructID2D1DrawTransformVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,uint>GetInputCount;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,int>MapOutputRectToInputRects;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,Rectangle*,Rectangle*,int>MapInputRectsToOutputRect;publicdelegate* unmanaged[MemberFunction]<void*,uint,Rectangle,Rectangle*,int>MapInvalidRect;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetDrawInfo;}internalunsafestructCustomD2D1EffectImpl{privatestaticreadonlyID2D1EffectImplVtblID2D1EffectImplVtbl;privatestaticreadonlyID2D1DrawTransformVtblID2D1DrawTransformVtbl;staticCustomD2D1EffectImpl(){ID2D1EffectImplVtbl.QueryInterface=&ID2D1EffectImplMethods.QueryInterface;ID2D1EffectImplVtbl.AddRef=&ID2D1EffectImplMethods.AddRef;ID2D1EffectImplVtbl.Release=&ID2D1EffectImplMethods.Release;ID2D1EffectImplVtbl.Initialize=&ID2D1EffectImplMethods.Initialize;ID2D1EffectImplVtbl.PrepareForRender=&ID2D1EffectImplMethods.PrepareForRender;ID2D1EffectImplVtbl.SetGraph=&ID2D1EffectImplMethods.SetGraph;ID2D1DrawTransformVtbl.QueryInterface=&ID2D1DrawTransformMethods.QueryInterface;ID2D1DrawTransformVtbl.AddRef=&ID2D1DrawTransformMethods.AddRef;ID2D1DrawTransformVtbl.Release=&ID2D1DrawTransformMethods.Release;ID2D1DrawTransformVtbl.GetInputCount=&ID2D1DrawTransformMethods.GetInputCount;ID2D1DrawTransformVtbl.MapOutputRectToInputRects=&ID2D1DrawTransformMethods.MapOutputRectToInputRects;ID2D1DrawTransformVtbl.MapInputRectsToOutputRect=&ID2D1DrawTransformMethods.MapInputRectsToOutputRect;ID2D1DrawTransformVtbl.MapInvalidRect=&ID2D1DrawTransformMethods.MapInvalidRect;ID2D1DrawTransformVtbl.SetDrawInfo=&ID2D1DrawTransformMethods.SetDrawInfo;}privatestaticclassID2D1EffectImplMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintInitialize(void*@this,void*effectContext,void*transformGraph)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintPrepareForRender(void*@this,intchangeType)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetGraph(void*@this,void*transformGraph)=>0;}privatestaticunsafeclassID2D1DrawTransformMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintGetInputCount(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapOutputRectToInputRects(void*@this,Rectangle*outputRect,Rectangle*inputRects,uintinputRectsCount)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInputRectsToOutputRect(void*@this,Rectangle*inputRects,Rectangle*inputOpaqueSubRects,uintinputRectCount,Rectangle*outputRect,Rectangle*outputOpaqueSubRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInvalidRect(void*@this,uintinputIndex,RectangleinvalidInputRect,Rectangle*invalidOutputRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetDrawInfo(void*@this,void*drawInfo)=>0;}}

@Sergio0694

Copy link
Copy Markdown
Contributor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Sergio0694 added a commit to microsoft/CsWinRT that referenced this pull request Apr 9, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

The outerloop run looks good. Linux-x64 runs into a common OOM in LibraryImportGenerator.Tests and both the Windows legs run into the UCRT bug that I have a workaround for in #109006 (we might want to approve & merge, this is the top reliability issue in nativeaot outerloops at the moment).

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Yeah, this just works. The interpreter is pretty composable. So if type X can be preinitialized and type Y can be preinitialized and you merged the two types into one (unioning the fields and concatenating the cctors), the merged type will be preinitialized too, barring hitting the 100000 instruction count limit. I'll not add the test, we don't directly test the composability of everything.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

Thank you!

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

@Sergio0694

Copy link
Copy Markdown
Contributor

Wouldn't all these already be in a readonly section? I assumed when they get folded, they go into RVA fields? 🤔

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

It would only make a meaningful difference when data dehydration is turned off. Since we plan to turn it off by default on Windows only, it would be a Windows-only feature.

I think it should be easy enough if we say that all non-GC static fields on the type need to be read only for this to happen. If we wanted to do it field-by-field, it would be much harder.

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/ba-g the Tools_Test failure is known and was fixed in #114424

@MichalStrehovsky
MichalStrehovsky merged commit a6553ac into dotnet:mainApr 9, 2025
@MichalStrehovsky
MichalStrehovsky deleted the morepreinit branch April 9, 2025 20:48
@jkotas

Copy link
Copy Markdown
Member

it would be a Windows-only feature.
all non-GC static fields on the type need to be read only for this to happen

These limitations sound reasonable to me. It would help with security (we have other Windows-only mitigations) and private working set (separating readonly and writeable data reduces dirty pages).

@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 10, 2025
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.

4 participants

@MichalStrehovsky@Sergio0694@jkotas
, '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

Extend type preinitialization support - #114374

Merged
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit
Apr 9, 2025
Merged

Extend type preinitialization support#114374
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit

Conversation

@MichalStrehovsky

Copy link
Copy Markdown
Member

Extends preinitialization support to cover scenario in #114354 (comment).

  • We only supported ldsflda instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added TestByRefFieldAddressEquality test tests things that go wrong if we don't do interning.
  • We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
  • We had limitations around ldobj that is used when dereferencing pointers. This lifts some of the restrictions and we can now ldobj many valuetypes, including the special vtable ones.

Cc @dotnet/ilc-contrib @Sergio0694

Extends preinitialization support to cover scenario in dotnet#114354 (comment).
* We only supported `ldsflda` instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added `TestByRefFieldAddressEquality` test tests things that go wrong if we don't do interning.
* We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
* We had limitations around `ldobj` that is used when dereferencing pointers. This lifts some of the restrictions and we can now `ldobj` many valuetypes, including the special vtable ones.
CopilotAI review requested due to automatic review settings April 8, 2025 13:16

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.

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/tools/aot/ILCompiler.Compiler/Compiler/TypePreinit.cs Outdated
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@github-actionsgithub-actionsBot mentioned this pull request Apr 8, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-nativeaot-outerloop

@azure-pipelines

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

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

Since you're also adding a bunch more tests, here's another one we could add, just to cover more possible scenarios. This one covers COM composition scenarios with custom blittable COM object types (eg. like TerraFX and ComputeSharp work). This one I ported from ComputeSharp and has two vtables in the type, for composition:

internalunsafestructID2D1EffectImplVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,void*,void*,int>Initialize;publicdelegate* unmanaged[MemberFunction]<void*,int,int>PrepareForRender;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetGraph;}internalunsafestructID2D1DrawTransformVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,uint>GetInputCount;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,int>MapOutputRectToInputRects;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,Rectangle*,Rectangle*,int>MapInputRectsToOutputRect;publicdelegate* unmanaged[MemberFunction]<void*,uint,Rectangle,Rectangle*,int>MapInvalidRect;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetDrawInfo;}internalunsafestructCustomD2D1EffectImpl{privatestaticreadonlyID2D1EffectImplVtblID2D1EffectImplVtbl;privatestaticreadonlyID2D1DrawTransformVtblID2D1DrawTransformVtbl;staticCustomD2D1EffectImpl(){ID2D1EffectImplVtbl.QueryInterface=&ID2D1EffectImplMethods.QueryInterface;ID2D1EffectImplVtbl.AddRef=&ID2D1EffectImplMethods.AddRef;ID2D1EffectImplVtbl.Release=&ID2D1EffectImplMethods.Release;ID2D1EffectImplVtbl.Initialize=&ID2D1EffectImplMethods.Initialize;ID2D1EffectImplVtbl.PrepareForRender=&ID2D1EffectImplMethods.PrepareForRender;ID2D1EffectImplVtbl.SetGraph=&ID2D1EffectImplMethods.SetGraph;ID2D1DrawTransformVtbl.QueryInterface=&ID2D1DrawTransformMethods.QueryInterface;ID2D1DrawTransformVtbl.AddRef=&ID2D1DrawTransformMethods.AddRef;ID2D1DrawTransformVtbl.Release=&ID2D1DrawTransformMethods.Release;ID2D1DrawTransformVtbl.GetInputCount=&ID2D1DrawTransformMethods.GetInputCount;ID2D1DrawTransformVtbl.MapOutputRectToInputRects=&ID2D1DrawTransformMethods.MapOutputRectToInputRects;ID2D1DrawTransformVtbl.MapInputRectsToOutputRect=&ID2D1DrawTransformMethods.MapInputRectsToOutputRect;ID2D1DrawTransformVtbl.MapInvalidRect=&ID2D1DrawTransformMethods.MapInvalidRect;ID2D1DrawTransformVtbl.SetDrawInfo=&ID2D1DrawTransformMethods.SetDrawInfo;}privatestaticclassID2D1EffectImplMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintInitialize(void*@this,void*effectContext,void*transformGraph)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintPrepareForRender(void*@this,intchangeType)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetGraph(void*@this,void*transformGraph)=>0;}privatestaticunsafeclassID2D1DrawTransformMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintGetInputCount(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapOutputRectToInputRects(void*@this,Rectangle*outputRect,Rectangle*inputRects,uintinputRectsCount)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInputRectsToOutputRect(void*@this,Rectangle*inputRects,Rectangle*inputOpaqueSubRects,uintinputRectCount,Rectangle*outputRect,Rectangle*outputOpaqueSubRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInvalidRect(void*@this,uintinputIndex,RectangleinvalidInputRect,Rectangle*invalidOutputRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetDrawInfo(void*@this,void*drawInfo)=>0;}}

@Sergio0694

Copy link
Copy Markdown
Contributor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Sergio0694 added a commit to microsoft/CsWinRT that referenced this pull request Apr 9, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

The outerloop run looks good. Linux-x64 runs into a common OOM in LibraryImportGenerator.Tests and both the Windows legs run into the UCRT bug that I have a workaround for in #109006 (we might want to approve & merge, this is the top reliability issue in nativeaot outerloops at the moment).

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Yeah, this just works. The interpreter is pretty composable. So if type X can be preinitialized and type Y can be preinitialized and you merged the two types into one (unioning the fields and concatenating the cctors), the merged type will be preinitialized too, barring hitting the 100000 instruction count limit. I'll not add the test, we don't directly test the composability of everything.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

Thank you!

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

@Sergio0694

Copy link
Copy Markdown
Contributor

Wouldn't all these already be in a readonly section? I assumed when they get folded, they go into RVA fields? 🤔

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

It would only make a meaningful difference when data dehydration is turned off. Since we plan to turn it off by default on Windows only, it would be a Windows-only feature.

I think it should be easy enough if we say that all non-GC static fields on the type need to be read only for this to happen. If we wanted to do it field-by-field, it would be much harder.

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/ba-g the Tools_Test failure is known and was fixed in #114424

@MichalStrehovsky
MichalStrehovsky merged commit a6553ac into dotnet:mainApr 9, 2025
@MichalStrehovsky
MichalStrehovsky deleted the morepreinit branch April 9, 2025 20:48
@jkotas

Copy link
Copy Markdown
Member

it would be a Windows-only feature.
all non-GC static fields on the type need to be read only for this to happen

These limitations sound reasonable to me. It would help with security (we have other Windows-only mitigations) and private working set (separating readonly and writeable data reduces dirty pages).

@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 10, 2025
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.

4 participants

@MichalStrehovsky@Sergio0694@jkotas
, '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

Extend type preinitialization support - #114374

Merged
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit
Apr 9, 2025
Merged

Extend type preinitialization support#114374
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit

Conversation

@MichalStrehovsky

Copy link
Copy Markdown
Member

Extends preinitialization support to cover scenario in #114354 (comment).

  • We only supported ldsflda instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added TestByRefFieldAddressEquality test tests things that go wrong if we don't do interning.
  • We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
  • We had limitations around ldobj that is used when dereferencing pointers. This lifts some of the restrictions and we can now ldobj many valuetypes, including the special vtable ones.

Cc @dotnet/ilc-contrib @Sergio0694

Extends preinitialization support to cover scenario in dotnet#114354 (comment).
* We only supported `ldsflda` instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added `TestByRefFieldAddressEquality` test tests things that go wrong if we don't do interning.
* We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
* We had limitations around `ldobj` that is used when dereferencing pointers. This lifts some of the restrictions and we can now `ldobj` many valuetypes, including the special vtable ones.
CopilotAI review requested due to automatic review settings April 8, 2025 13:16

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.

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/tools/aot/ILCompiler.Compiler/Compiler/TypePreinit.cs Outdated
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@github-actionsgithub-actionsBot mentioned this pull request Apr 8, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-nativeaot-outerloop

@azure-pipelines

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

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

Since you're also adding a bunch more tests, here's another one we could add, just to cover more possible scenarios. This one covers COM composition scenarios with custom blittable COM object types (eg. like TerraFX and ComputeSharp work). This one I ported from ComputeSharp and has two vtables in the type, for composition:

internalunsafestructID2D1EffectImplVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,void*,void*,int>Initialize;publicdelegate* unmanaged[MemberFunction]<void*,int,int>PrepareForRender;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetGraph;}internalunsafestructID2D1DrawTransformVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,uint>GetInputCount;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,int>MapOutputRectToInputRects;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,Rectangle*,Rectangle*,int>MapInputRectsToOutputRect;publicdelegate* unmanaged[MemberFunction]<void*,uint,Rectangle,Rectangle*,int>MapInvalidRect;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetDrawInfo;}internalunsafestructCustomD2D1EffectImpl{privatestaticreadonlyID2D1EffectImplVtblID2D1EffectImplVtbl;privatestaticreadonlyID2D1DrawTransformVtblID2D1DrawTransformVtbl;staticCustomD2D1EffectImpl(){ID2D1EffectImplVtbl.QueryInterface=&ID2D1EffectImplMethods.QueryInterface;ID2D1EffectImplVtbl.AddRef=&ID2D1EffectImplMethods.AddRef;ID2D1EffectImplVtbl.Release=&ID2D1EffectImplMethods.Release;ID2D1EffectImplVtbl.Initialize=&ID2D1EffectImplMethods.Initialize;ID2D1EffectImplVtbl.PrepareForRender=&ID2D1EffectImplMethods.PrepareForRender;ID2D1EffectImplVtbl.SetGraph=&ID2D1EffectImplMethods.SetGraph;ID2D1DrawTransformVtbl.QueryInterface=&ID2D1DrawTransformMethods.QueryInterface;ID2D1DrawTransformVtbl.AddRef=&ID2D1DrawTransformMethods.AddRef;ID2D1DrawTransformVtbl.Release=&ID2D1DrawTransformMethods.Release;ID2D1DrawTransformVtbl.GetInputCount=&ID2D1DrawTransformMethods.GetInputCount;ID2D1DrawTransformVtbl.MapOutputRectToInputRects=&ID2D1DrawTransformMethods.MapOutputRectToInputRects;ID2D1DrawTransformVtbl.MapInputRectsToOutputRect=&ID2D1DrawTransformMethods.MapInputRectsToOutputRect;ID2D1DrawTransformVtbl.MapInvalidRect=&ID2D1DrawTransformMethods.MapInvalidRect;ID2D1DrawTransformVtbl.SetDrawInfo=&ID2D1DrawTransformMethods.SetDrawInfo;}privatestaticclassID2D1EffectImplMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintInitialize(void*@this,void*effectContext,void*transformGraph)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintPrepareForRender(void*@this,intchangeType)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetGraph(void*@this,void*transformGraph)=>0;}privatestaticunsafeclassID2D1DrawTransformMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintGetInputCount(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapOutputRectToInputRects(void*@this,Rectangle*outputRect,Rectangle*inputRects,uintinputRectsCount)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInputRectsToOutputRect(void*@this,Rectangle*inputRects,Rectangle*inputOpaqueSubRects,uintinputRectCount,Rectangle*outputRect,Rectangle*outputOpaqueSubRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInvalidRect(void*@this,uintinputIndex,RectangleinvalidInputRect,Rectangle*invalidOutputRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetDrawInfo(void*@this,void*drawInfo)=>0;}}

@Sergio0694

Copy link
Copy Markdown
Contributor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Sergio0694 added a commit to microsoft/CsWinRT that referenced this pull request Apr 9, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

The outerloop run looks good. Linux-x64 runs into a common OOM in LibraryImportGenerator.Tests and both the Windows legs run into the UCRT bug that I have a workaround for in #109006 (we might want to approve & merge, this is the top reliability issue in nativeaot outerloops at the moment).

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Yeah, this just works. The interpreter is pretty composable. So if type X can be preinitialized and type Y can be preinitialized and you merged the two types into one (unioning the fields and concatenating the cctors), the merged type will be preinitialized too, barring hitting the 100000 instruction count limit. I'll not add the test, we don't directly test the composability of everything.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

Thank you!

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

@Sergio0694

Copy link
Copy Markdown
Contributor

Wouldn't all these already be in a readonly section? I assumed when they get folded, they go into RVA fields? 🤔

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

It would only make a meaningful difference when data dehydration is turned off. Since we plan to turn it off by default on Windows only, it would be a Windows-only feature.

I think it should be easy enough if we say that all non-GC static fields on the type need to be read only for this to happen. If we wanted to do it field-by-field, it would be much harder.

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/ba-g the Tools_Test failure is known and was fixed in #114424

@MichalStrehovsky
MichalStrehovsky merged commit a6553ac into dotnet:mainApr 9, 2025
@MichalStrehovsky
MichalStrehovsky deleted the morepreinit branch April 9, 2025 20:48
@jkotas

Copy link
Copy Markdown
Member

it would be a Windows-only feature.
all non-GC static fields on the type need to be read only for this to happen

These limitations sound reasonable to me. It would help with security (we have other Windows-only mitigations) and private working set (separating readonly and writeable data reduces dirty pages).

@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 10, 2025
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.

4 participants

@MichalStrehovsky@Sergio0694@jkotas
, '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

Extend type preinitialization support - #114374

Merged
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit
Apr 9, 2025
Merged

Extend type preinitialization support#114374
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit

Conversation

@MichalStrehovsky

Copy link
Copy Markdown
Member

Extends preinitialization support to cover scenario in #114354 (comment).

  • We only supported ldsflda instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added TestByRefFieldAddressEquality test tests things that go wrong if we don't do interning.
  • We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
  • We had limitations around ldobj that is used when dereferencing pointers. This lifts some of the restrictions and we can now ldobj many valuetypes, including the special vtable ones.

Cc @dotnet/ilc-contrib @Sergio0694

Extends preinitialization support to cover scenario in dotnet#114354 (comment).
* We only supported `ldsflda` instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added `TestByRefFieldAddressEquality` test tests things that go wrong if we don't do interning.
* We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
* We had limitations around `ldobj` that is used when dereferencing pointers. This lifts some of the restrictions and we can now `ldobj` many valuetypes, including the special vtable ones.
CopilotAI review requested due to automatic review settings April 8, 2025 13:16

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.

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/tools/aot/ILCompiler.Compiler/Compiler/TypePreinit.cs Outdated
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@github-actionsgithub-actionsBot mentioned this pull request Apr 8, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-nativeaot-outerloop

@azure-pipelines

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

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

Since you're also adding a bunch more tests, here's another one we could add, just to cover more possible scenarios. This one covers COM composition scenarios with custom blittable COM object types (eg. like TerraFX and ComputeSharp work). This one I ported from ComputeSharp and has two vtables in the type, for composition:

internalunsafestructID2D1EffectImplVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,void*,void*,int>Initialize;publicdelegate* unmanaged[MemberFunction]<void*,int,int>PrepareForRender;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetGraph;}internalunsafestructID2D1DrawTransformVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,uint>GetInputCount;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,int>MapOutputRectToInputRects;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,Rectangle*,Rectangle*,int>MapInputRectsToOutputRect;publicdelegate* unmanaged[MemberFunction]<void*,uint,Rectangle,Rectangle*,int>MapInvalidRect;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetDrawInfo;}internalunsafestructCustomD2D1EffectImpl{privatestaticreadonlyID2D1EffectImplVtblID2D1EffectImplVtbl;privatestaticreadonlyID2D1DrawTransformVtblID2D1DrawTransformVtbl;staticCustomD2D1EffectImpl(){ID2D1EffectImplVtbl.QueryInterface=&ID2D1EffectImplMethods.QueryInterface;ID2D1EffectImplVtbl.AddRef=&ID2D1EffectImplMethods.AddRef;ID2D1EffectImplVtbl.Release=&ID2D1EffectImplMethods.Release;ID2D1EffectImplVtbl.Initialize=&ID2D1EffectImplMethods.Initialize;ID2D1EffectImplVtbl.PrepareForRender=&ID2D1EffectImplMethods.PrepareForRender;ID2D1EffectImplVtbl.SetGraph=&ID2D1EffectImplMethods.SetGraph;ID2D1DrawTransformVtbl.QueryInterface=&ID2D1DrawTransformMethods.QueryInterface;ID2D1DrawTransformVtbl.AddRef=&ID2D1DrawTransformMethods.AddRef;ID2D1DrawTransformVtbl.Release=&ID2D1DrawTransformMethods.Release;ID2D1DrawTransformVtbl.GetInputCount=&ID2D1DrawTransformMethods.GetInputCount;ID2D1DrawTransformVtbl.MapOutputRectToInputRects=&ID2D1DrawTransformMethods.MapOutputRectToInputRects;ID2D1DrawTransformVtbl.MapInputRectsToOutputRect=&ID2D1DrawTransformMethods.MapInputRectsToOutputRect;ID2D1DrawTransformVtbl.MapInvalidRect=&ID2D1DrawTransformMethods.MapInvalidRect;ID2D1DrawTransformVtbl.SetDrawInfo=&ID2D1DrawTransformMethods.SetDrawInfo;}privatestaticclassID2D1EffectImplMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintInitialize(void*@this,void*effectContext,void*transformGraph)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintPrepareForRender(void*@this,intchangeType)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetGraph(void*@this,void*transformGraph)=>0;}privatestaticunsafeclassID2D1DrawTransformMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintGetInputCount(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapOutputRectToInputRects(void*@this,Rectangle*outputRect,Rectangle*inputRects,uintinputRectsCount)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInputRectsToOutputRect(void*@this,Rectangle*inputRects,Rectangle*inputOpaqueSubRects,uintinputRectCount,Rectangle*outputRect,Rectangle*outputOpaqueSubRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInvalidRect(void*@this,uintinputIndex,RectangleinvalidInputRect,Rectangle*invalidOutputRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetDrawInfo(void*@this,void*drawInfo)=>0;}}

@Sergio0694

Copy link
Copy Markdown
Contributor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Sergio0694 added a commit to microsoft/CsWinRT that referenced this pull request Apr 9, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

The outerloop run looks good. Linux-x64 runs into a common OOM in LibraryImportGenerator.Tests and both the Windows legs run into the UCRT bug that I have a workaround for in #109006 (we might want to approve & merge, this is the top reliability issue in nativeaot outerloops at the moment).

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Yeah, this just works. The interpreter is pretty composable. So if type X can be preinitialized and type Y can be preinitialized and you merged the two types into one (unioning the fields and concatenating the cctors), the merged type will be preinitialized too, barring hitting the 100000 instruction count limit. I'll not add the test, we don't directly test the composability of everything.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

Thank you!

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

@Sergio0694

Copy link
Copy Markdown
Contributor

Wouldn't all these already be in a readonly section? I assumed when they get folded, they go into RVA fields? 🤔

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

It would only make a meaningful difference when data dehydration is turned off. Since we plan to turn it off by default on Windows only, it would be a Windows-only feature.

I think it should be easy enough if we say that all non-GC static fields on the type need to be read only for this to happen. If we wanted to do it field-by-field, it would be much harder.

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/ba-g the Tools_Test failure is known and was fixed in #114424

@MichalStrehovsky
MichalStrehovsky merged commit a6553ac into dotnet:mainApr 9, 2025
@MichalStrehovsky
MichalStrehovsky deleted the morepreinit branch April 9, 2025 20:48
@jkotas

Copy link
Copy Markdown
Member

it would be a Windows-only feature.
all non-GC static fields on the type need to be read only for this to happen

These limitations sound reasonable to me. It would help with security (we have other Windows-only mitigations) and private working set (separating readonly and writeable data reduces dirty pages).

@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 10, 2025
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.

4 participants

@MichalStrehovsky@Sergio0694@jkotas
, '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

Extend type preinitialization support - #114374

Merged
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit
Apr 9, 2025
Merged

Extend type preinitialization support#114374
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit

Conversation

@MichalStrehovsky

Copy link
Copy Markdown
Member

Extends preinitialization support to cover scenario in #114354 (comment).

  • We only supported ldsflda instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added TestByRefFieldAddressEquality test tests things that go wrong if we don't do interning.
  • We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
  • We had limitations around ldobj that is used when dereferencing pointers. This lifts some of the restrictions and we can now ldobj many valuetypes, including the special vtable ones.

Cc @dotnet/ilc-contrib @Sergio0694

Extends preinitialization support to cover scenario in dotnet#114354 (comment).
* We only supported `ldsflda` instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added `TestByRefFieldAddressEquality` test tests things that go wrong if we don't do interning.
* We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
* We had limitations around `ldobj` that is used when dereferencing pointers. This lifts some of the restrictions and we can now `ldobj` many valuetypes, including the special vtable ones.
CopilotAI review requested due to automatic review settings April 8, 2025 13:16

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.

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/tools/aot/ILCompiler.Compiler/Compiler/TypePreinit.cs Outdated
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@github-actionsgithub-actionsBot mentioned this pull request Apr 8, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-nativeaot-outerloop

@azure-pipelines

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

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

Since you're also adding a bunch more tests, here's another one we could add, just to cover more possible scenarios. This one covers COM composition scenarios with custom blittable COM object types (eg. like TerraFX and ComputeSharp work). This one I ported from ComputeSharp and has two vtables in the type, for composition:

internalunsafestructID2D1EffectImplVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,void*,void*,int>Initialize;publicdelegate* unmanaged[MemberFunction]<void*,int,int>PrepareForRender;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetGraph;}internalunsafestructID2D1DrawTransformVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,uint>GetInputCount;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,int>MapOutputRectToInputRects;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,Rectangle*,Rectangle*,int>MapInputRectsToOutputRect;publicdelegate* unmanaged[MemberFunction]<void*,uint,Rectangle,Rectangle*,int>MapInvalidRect;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetDrawInfo;}internalunsafestructCustomD2D1EffectImpl{privatestaticreadonlyID2D1EffectImplVtblID2D1EffectImplVtbl;privatestaticreadonlyID2D1DrawTransformVtblID2D1DrawTransformVtbl;staticCustomD2D1EffectImpl(){ID2D1EffectImplVtbl.QueryInterface=&ID2D1EffectImplMethods.QueryInterface;ID2D1EffectImplVtbl.AddRef=&ID2D1EffectImplMethods.AddRef;ID2D1EffectImplVtbl.Release=&ID2D1EffectImplMethods.Release;ID2D1EffectImplVtbl.Initialize=&ID2D1EffectImplMethods.Initialize;ID2D1EffectImplVtbl.PrepareForRender=&ID2D1EffectImplMethods.PrepareForRender;ID2D1EffectImplVtbl.SetGraph=&ID2D1EffectImplMethods.SetGraph;ID2D1DrawTransformVtbl.QueryInterface=&ID2D1DrawTransformMethods.QueryInterface;ID2D1DrawTransformVtbl.AddRef=&ID2D1DrawTransformMethods.AddRef;ID2D1DrawTransformVtbl.Release=&ID2D1DrawTransformMethods.Release;ID2D1DrawTransformVtbl.GetInputCount=&ID2D1DrawTransformMethods.GetInputCount;ID2D1DrawTransformVtbl.MapOutputRectToInputRects=&ID2D1DrawTransformMethods.MapOutputRectToInputRects;ID2D1DrawTransformVtbl.MapInputRectsToOutputRect=&ID2D1DrawTransformMethods.MapInputRectsToOutputRect;ID2D1DrawTransformVtbl.MapInvalidRect=&ID2D1DrawTransformMethods.MapInvalidRect;ID2D1DrawTransformVtbl.SetDrawInfo=&ID2D1DrawTransformMethods.SetDrawInfo;}privatestaticclassID2D1EffectImplMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintInitialize(void*@this,void*effectContext,void*transformGraph)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintPrepareForRender(void*@this,intchangeType)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetGraph(void*@this,void*transformGraph)=>0;}privatestaticunsafeclassID2D1DrawTransformMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintGetInputCount(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapOutputRectToInputRects(void*@this,Rectangle*outputRect,Rectangle*inputRects,uintinputRectsCount)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInputRectsToOutputRect(void*@this,Rectangle*inputRects,Rectangle*inputOpaqueSubRects,uintinputRectCount,Rectangle*outputRect,Rectangle*outputOpaqueSubRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInvalidRect(void*@this,uintinputIndex,RectangleinvalidInputRect,Rectangle*invalidOutputRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetDrawInfo(void*@this,void*drawInfo)=>0;}}

@Sergio0694

Copy link
Copy Markdown
Contributor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Sergio0694 added a commit to microsoft/CsWinRT that referenced this pull request Apr 9, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

The outerloop run looks good. Linux-x64 runs into a common OOM in LibraryImportGenerator.Tests and both the Windows legs run into the UCRT bug that I have a workaround for in #109006 (we might want to approve & merge, this is the top reliability issue in nativeaot outerloops at the moment).

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Yeah, this just works. The interpreter is pretty composable. So if type X can be preinitialized and type Y can be preinitialized and you merged the two types into one (unioning the fields and concatenating the cctors), the merged type will be preinitialized too, barring hitting the 100000 instruction count limit. I'll not add the test, we don't directly test the composability of everything.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

Thank you!

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

@Sergio0694

Copy link
Copy Markdown
Contributor

Wouldn't all these already be in a readonly section? I assumed when they get folded, they go into RVA fields? 🤔

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

It would only make a meaningful difference when data dehydration is turned off. Since we plan to turn it off by default on Windows only, it would be a Windows-only feature.

I think it should be easy enough if we say that all non-GC static fields on the type need to be read only for this to happen. If we wanted to do it field-by-field, it would be much harder.

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/ba-g the Tools_Test failure is known and was fixed in #114424

@MichalStrehovsky
MichalStrehovsky merged commit a6553ac into dotnet:mainApr 9, 2025
@MichalStrehovsky
MichalStrehovsky deleted the morepreinit branch April 9, 2025 20:48
@jkotas

Copy link
Copy Markdown
Member

it would be a Windows-only feature.
all non-GC static fields on the type need to be read only for this to happen

These limitations sound reasonable to me. It would help with security (we have other Windows-only mitigations) and private working set (separating readonly and writeable data reduces dirty pages).

@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 10, 2025
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.

4 participants

@MichalStrehovsky@Sergio0694@jkotas
, '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

Extend type preinitialization support - #114374

Merged
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit
Apr 9, 2025
Merged

Extend type preinitialization support#114374
MichalStrehovsky merged 2 commits into
dotnet:mainfrom
MichalStrehovsky:morepreinit

Conversation

@MichalStrehovsky

Copy link
Copy Markdown
Member

Extends preinitialization support to cover scenario in #114354 (comment).

  • We only supported ldsflda instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added TestByRefFieldAddressEquality test tests things that go wrong if we don't do interning.
  • We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
  • We had limitations around ldobj that is used when dereferencing pointers. This lifts some of the restrictions and we can now ldobj many valuetypes, including the special vtable ones.

Cc @dotnet/ilc-contrib @Sergio0694

Extends preinitialization support to cover scenario in dotnet#114354 (comment).
* We only supported `ldsflda` instruction if the field was on the same type as we're preinitializing. This lifts the restriction to support loading addresses of readonly fields on other types, even if they have a static constructor, provided the cctor can be interpreted. One complication here is that this exposes us to correctness issues when address of the same field is loaded multiple times. We need to make sure nested preinit results are interned. The newly added `TestByRefFieldAddressEquality` test tests things that go wrong if we don't do interning.
* We didn't support calling methods on types that have a static constructor. This lifts the restriction if the static constructor is side effect free (approximated by "can be interpreted").
* We had limitations around `ldobj` that is used when dereferencing pointers. This lifts some of the restrictions and we can now `ldobj` many valuetypes, including the special vtable ones.
CopilotAI review requested due to automatic review settings April 8, 2025 13:16

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.

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/tools/aot/ILCompiler.Compiler/Compiler/TypePreinit.cs Outdated
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@github-actionsgithub-actionsBot mentioned this pull request Apr 8, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-nativeaot-outerloop

@azure-pipelines

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

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

Since you're also adding a bunch more tests, here's another one we could add, just to cover more possible scenarios. This one covers COM composition scenarios with custom blittable COM object types (eg. like TerraFX and ComputeSharp work). This one I ported from ComputeSharp and has two vtables in the type, for composition:

internalunsafestructID2D1EffectImplVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,void*,void*,int>Initialize;publicdelegate* unmanaged[MemberFunction]<void*,int,int>PrepareForRender;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetGraph;}internalunsafestructID2D1DrawTransformVtbl{publicdelegate* unmanaged[MemberFunction]<void*,Guid*,void**,int>QueryInterface;publicdelegate* unmanaged[MemberFunction]<void*,uint>AddRef;publicdelegate* unmanaged[MemberFunction]<void*,uint>Release;publicdelegate* unmanaged[MemberFunction]<void*,uint>GetInputCount;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,int>MapOutputRectToInputRects;publicdelegate* unmanaged[MemberFunction]<void*,Rectangle*,Rectangle*,uint,Rectangle*,Rectangle*,int>MapInputRectsToOutputRect;publicdelegate* unmanaged[MemberFunction]<void*,uint,Rectangle,Rectangle*,int>MapInvalidRect;publicdelegate* unmanaged[MemberFunction]<void*,void*,int>SetDrawInfo;}internalunsafestructCustomD2D1EffectImpl{privatestaticreadonlyID2D1EffectImplVtblID2D1EffectImplVtbl;privatestaticreadonlyID2D1DrawTransformVtblID2D1DrawTransformVtbl;staticCustomD2D1EffectImpl(){ID2D1EffectImplVtbl.QueryInterface=&ID2D1EffectImplMethods.QueryInterface;ID2D1EffectImplVtbl.AddRef=&ID2D1EffectImplMethods.AddRef;ID2D1EffectImplVtbl.Release=&ID2D1EffectImplMethods.Release;ID2D1EffectImplVtbl.Initialize=&ID2D1EffectImplMethods.Initialize;ID2D1EffectImplVtbl.PrepareForRender=&ID2D1EffectImplMethods.PrepareForRender;ID2D1EffectImplVtbl.SetGraph=&ID2D1EffectImplMethods.SetGraph;ID2D1DrawTransformVtbl.QueryInterface=&ID2D1DrawTransformMethods.QueryInterface;ID2D1DrawTransformVtbl.AddRef=&ID2D1DrawTransformMethods.AddRef;ID2D1DrawTransformVtbl.Release=&ID2D1DrawTransformMethods.Release;ID2D1DrawTransformVtbl.GetInputCount=&ID2D1DrawTransformMethods.GetInputCount;ID2D1DrawTransformVtbl.MapOutputRectToInputRects=&ID2D1DrawTransformMethods.MapOutputRectToInputRects;ID2D1DrawTransformVtbl.MapInputRectsToOutputRect=&ID2D1DrawTransformMethods.MapInputRectsToOutputRect;ID2D1DrawTransformVtbl.MapInvalidRect=&ID2D1DrawTransformMethods.MapInvalidRect;ID2D1DrawTransformVtbl.SetDrawInfo=&ID2D1DrawTransformMethods.SetDrawInfo;}privatestaticclassID2D1EffectImplMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintInitialize(void*@this,void*effectContext,void*transformGraph)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintPrepareForRender(void*@this,intchangeType)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetGraph(void*@this,void*transformGraph)=>0;}privatestaticunsafeclassID2D1DrawTransformMethods{[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintQueryInterface(void*@this,Guid*riid,void**ppvObject)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintAddRef(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintRelease(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticuintGetInputCount(void*@this)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapOutputRectToInputRects(void*@this,Rectangle*outputRect,Rectangle*inputRects,uintinputRectsCount)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInputRectsToOutputRect(void*@this,Rectangle*inputRects,Rectangle*inputOpaqueSubRects,uintinputRectCount,Rectangle*outputRect,Rectangle*outputOpaqueSubRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintMapInvalidRect(void*@this,uintinputIndex,RectangleinvalidInputRect,Rectangle*invalidOutputRect)=>0;[UnmanagedCallersOnly(CallConvs=[typeof(CallConvMemberFunction)])]publicstaticintSetDrawInfo(void*@this,void*drawInfo)=>0;}}

@Sergio0694

Copy link
Copy Markdown
Contributor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Sergio0694 added a commit to microsoft/CsWinRT that referenced this pull request Apr 9, 2025
@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

The outerloop run looks good. Linux-x64 runs into a common OOM in LibraryImportGenerator.Tests and both the Windows legs run into the UCRT bug that I have a workaround for in #109006 (we might want to approve & merge, this is the top reliability issue in nativeaot outerloops at the moment).

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

@MichalStrehovsky not entirely sure if these changes are also meant to potentially support preinitializing more than a single field in a type. If so and this snippet should just work, feel free to include the test, if you want to get more coverage. If this would instead require more work, feel free to ignore it, not a priority (and in case the "one field per cctor" restriction is a thing, we can just adapt on our side and just split vtables out into separate types in that case). Up to you 🙂

Yeah, this just works. The interpreter is pretty composable. So if type X can be preinitialized and type Y can be preinitialized and you merged the two types into one (unioning the fields and concatenating the cctors), the merged type will be preinitialized too, barring hitting the 100000 instruction count limit. I'll not add the test, we don't directly test the composability of everything.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

Thank you!

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

@Sergio0694

Copy link
Copy Markdown
Contributor

Wouldn't all these already be in a readonly section? I assumed when they get folded, they go into RVA fields? 🤔

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

I forgot to ask on the previous PR: What would it take to place the readonly static vtable fields (or readonly static fields in general) into a read only section in the binary?

It would only make a meaningful difference when data dehydration is turned off. Since we plan to turn it off by default on Windows only, it would be a Windows-only feature.

I think it should be easy enough if we say that all non-GC static fields on the type need to be read only for this to happen. If we wanted to do it field-by-field, it would be much harder.

@MichalStrehovsky

Copy link
Copy Markdown
MemberAuthor

/ba-g the Tools_Test failure is known and was fixed in #114424

@MichalStrehovsky
MichalStrehovsky merged commit a6553ac into dotnet:mainApr 9, 2025
@MichalStrehovsky
MichalStrehovsky deleted the morepreinit branch April 9, 2025 20:48
@jkotas

Copy link
Copy Markdown
Member

it would be a Windows-only feature.
all non-GC static fields on the type need to be read only for this to happen

These limitations sound reasonable to me. It would help with security (we have other Windows-only mitigations) and private working set (separating readonly and writeable data reduces dirty pages).

@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 10, 2025
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.

4 participants

@MichalStrehovsky@Sergio0694@jkotas