Skip to content

Revert "Refactor external_assembly_probe to be separate from single-file bundle probing" #113738

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 1 commit into from
Mar 20, 2025

Conversation

agocke
Copy link
Member

@agocke agocke commented Mar 20, 2025

Reverts #113356

Looks like this is causing a failure in the VMR build: dotnet/source-build#4952

@Copilot Copilot AI review requested due to automatic review settings March 20, 2025 17:17
@ghost ghost added the area-Single-File label Mar 20, 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 1 out of 21 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: @agocke, @vitek-karas, @VSadov
See info in area-owners.md if you want to be subscribed.

@agocke agocke requested a review from akoeplinger March 20, 2025 17:58
@akoeplinger
Copy link
Member

note that this change is also in preview3...

@agocke
Copy link
Member Author

agocke commented Mar 20, 2025

Should I target this to p3 first? what's our usual strategy?

@agocke agocke changed the base branch from main to release/10.0-preview3 March 20, 2025 21:37
@agocke agocke closed this Mar 20, 2025
@agocke agocke reopened this Mar 20, 2025
@agocke agocke changed the base branch from release/10.0-preview3 to main March 20, 2025 21:41
@agocke
Copy link
Member Author

agocke commented Mar 20, 2025

OK, I'm going to merge it in main and then bacport to p3 because I don't want us to have different behavior

@agocke
Copy link
Member Author

agocke commented Mar 20, 2025

/ba-g tests were already run and failures were unrelated

@agocke agocke merged commit 1511811 into main Mar 20, 2025
34 of 96 checks passed
@agocke
Copy link
Member Author

agocke commented Mar 20, 2025

/backport to release/10.0-preview3

Copy link
Contributor

Started backporting to release/10.0-preview3: https://github.com/dotnet/runtime/actions/runs/13980033827

@akoeplinger
Copy link
Member

OK, I'm going to merge it in main and then bacport to p3 because I don't want us to have different behavior

That's what we usually do yes.

@ViktorHofer ViktorHofer deleted the revert-113356-externalProbe-notBundle branch March 21, 2025 07:00
elinor-fung added a commit to elinor-fung/runtime that referenced this pull request Mar 21, 2025
elinor-fung added a commit that referenced this pull request Mar 25, 2025
…e-file bundle probing" (#113776)

Undo the revert in #113738

Fix on top of the original: 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.
@github-actions github-actions bot locked and limited conversation to collaborators Apr 20, 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.

2 participants