Skip to content

[NativeAOT] Move GC bridge processing from C++ to C# #10748

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.

Sign up for GitHub

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

Draft
Copilot wants to merge 8 commits into
base: main
Choose a base branch
from
+539 −698
Draft

[NativeAOT] Move GC bridge processing from C++ to C# #10748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
332a9ca
Initial plan
Copilot Jan 30, 2026
10f0b0e
Move GC bridge processing from C++ to C#
Copilot Jan 30, 2026
6ea79d5
Remove C++ bridge-processing files - processing now done in C#
Copilot Jan 30, 2026
5703ac9
Code review and security checks completed
Copilot Jan 30, 2026
c8e4465
Remove temporary codeql symlink
Copilot Jan 30, 2026
c1eab3b
Simplify gc-bridge.cc by removing unused callback mode
Copilot Jan 31, 2026
27f2faf
Add clarifying comment to initialize_for_managed_processing
Copilot Jan 31, 2026
838dbaf
Regenerate pinvoke-tables.include after removing clr_initialize_gc_br…
Copilot Feb 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/Mono.Android/Android.Runtime/RuntimeNativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,24 @@ internal unsafe static class RuntimeNativeMethods
[DllImport (RuntimeConstants.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
internal static extern bool clr_typemap_java_to_managed (string java_type_name, out IntPtr managed_assembly_name, out uint managed_type_token_id);

/// <summary>
/// Initialize GC bridge for managed processing mode (no native background thread).
/// Returns the mark_cross_references function pointer to pass to JavaMarshal.Initialize.
/// </summary>
[DllImport (RuntimeConstants.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
internal static extern delegate* unmanaged<MarkCrossReferencesArgs*, void> clr_initialize_gc_bridge (
delegate* unmanaged<MarkCrossReferencesArgs*, void> bridge_processing_started_callback,
delegate* unmanaged<MarkCrossReferencesArgs*, void> bridge_processing_finished_callback);
internal static extern delegate* unmanaged<MarkCrossReferencesArgs*, void> clr_gc_bridge_initialize_for_managed_processing ();

/// <summary>
/// Wait for the next set of cross references to process. Blocks until mark_cross_references is called by the GC.
/// </summary>
[DllImport (RuntimeConstants.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
internal static extern MarkCrossReferencesArgs* clr_gc_bridge_wait_for_processing ();

/// <summary>
/// Trigger Java garbage collection.
/// </summary>
[DllImport (RuntimeConstants.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
internal static extern void clr_gc_bridge_trigger_java_gc ();

[MethodImplAttribute(MethodImplOptions.InternalCall)]
internal static extern void monodroid_unhandled_exception (Exception javaException);
Expand Down
Loading