Skip to content

Reapply "Refactor external_assembly_probe to be separate from single-file bundle probing" #113776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 25, 2025

Conversation

elinor-fung
Copy link
Member

Undo the revert in #113738

0d3c852 is the change on top of the original that should address dotnet/source-build#4952.

Make a copy of the host contract information on initialization instead of just operating on a pointer to the struct. This should address intermittent failures on shutdown where a thread is still running after coreclr_shutdown has completed and the actual contract struct provided by a host may be cleaned up. The assumption is that any function pointers provided on the host contract at initialization should remain valid for the process lifetime.

@Copilot Copilot AI review requested due to automatic review settings March 21, 2025 23:44
@ghost ghost added the area-VM-coreclr label Mar 21, 2025
Copy link
Contributor

@Copilot Copilot AI left a comment

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 22 changed files in this pull request and generated no comments.

Files not reviewed (20)
  • src/coreclr/binder/assemblybindercommon.cpp: Language not supported
  • src/coreclr/binder/inc/assembly.hpp: Language not supported
  • src/coreclr/binder/inc/assemblybindercommon.hpp: Language not supported
  • src/coreclr/dlls/mscoree/exports.cpp: Language not supported
  • src/coreclr/inc/assemblyprobeextension.h: Language not supported
  • src/coreclr/inc/bundle.h: Language not supported
  • src/coreclr/inc/hostinformation.h: Language not supported
  • src/coreclr/vm/CMakeLists.txt: Language not supported
  • src/coreclr/vm/assemblynative.cpp: Language not supported
  • src/coreclr/vm/assemblyprobeextension.cpp: Language not supported
  • src/coreclr/vm/assemblyspec.cpp: Language not supported
  • src/coreclr/vm/bundle.cpp: Language not supported
  • src/coreclr/vm/coreassemblyspec.cpp: Language not supported
  • src/coreclr/vm/hostinformation.cpp: Language not supported
  • src/coreclr/vm/nativeimage.cpp: Language not supported
  • src/coreclr/vm/peassembly.cpp: Language not supported
  • src/coreclr/vm/peassembly.inl: Language not supported
  • src/coreclr/vm/peimage.cpp: Language not supported
  • src/coreclr/vm/peimage.h: Language not supported
  • src/coreclr/vm/peimage.inl: Language not supported

Copy link
Contributor

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

@akoeplinger
Copy link
Member

I've been running this change for the last 7 hours on the repro VM I used in dotnet/source-build#4952 (comment) and so far it hasn't failed 😄

@elinor-fung
Copy link
Member Author

Thanks, @akoeplinger! I did also run the dotnet-source-build pipeline a couple times (successfully) against the change ported to dotnet/dotnet, per your suggestion.

@elinor-fung elinor-fung merged commit fa4c14e into dotnet:main Mar 25, 2025
149 of 151 checks passed
@elinor-fung elinor-fung deleted the fixExternalProbeRefactor branch March 25, 2025 03:00
@elinor-fung elinor-fung added this to the 10.0.0 milestone Apr 15, 2025
@github-actions github-actions bot locked and limited conversation to collaborators May 16, 2025
Sign up for free to 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.

3 participants