From 75dcfccc96a54da2efcc2f446c46d42c2cb99559 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 17 Sep 2025 14:15:05 -0500
Subject: [PATCH 1/3] [tests] run `Java.Interop-Tests` on NativeAOT

In 32fcc8bd, I enabled tests related to the "GC Bridge" on NativeAOT,
but discovered we still weren't running dotnet/java-interop's tests.
Let's enable them.

We can also remove `$(DefineConstants)` for `CORECLR` and `NATIVEAOT`
as there is nothing using these.
---
 .../Mono.Android-Tests/Mono.Android.NET-Tests.csproj         | 2 --
 .../Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs     | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
index ed78d3366ed..c7feecdd9a0 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
@@ -22,8 +22,6 @@
     <WarningsAsErrors>IL2037</WarningsAsErrors>
     <AndroidUseNegotiateAuthentication>true</AndroidUseNegotiateAuthentication>
     <AndroidNdkDirectory></AndroidNdkDirectory>
-    <DefineConstants Condition=" '$(UseMonoRuntime)' == 'false' ">$(DefineConstants);CORECLR</DefineConstants>
-    <DefineConstants Condition=" '$(PublishAot)' == 'true' ">$(DefineConstants);NATIVEAOT</DefineConstants>
     <!--
       TODO: Fix excluded tests
       For $(EnableLLVM)
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs
index d21b35e4aba..215fde081a9 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs
@@ -30,17 +30,12 @@ protected NUnitInstrumentation(IntPtr handle, JniHandleOwnership transfer)
         protected override IList<TestAssemblyInfo> GetTestAssemblies()
         {
             Assembly asm = Assembly.GetExecutingAssembly();
-            #if !NATIVEAOT // TODO: Java.Interop-Tests not passing yet
             Assembly ji  = typeof (Java.InteropTests.JavaInterop_Tests_Reference).Assembly;
-            #endif
-
 
             return new List<TestAssemblyInfo>()
             {
                 new TestAssemblyInfo (asm, asm.Location ?? String.Empty),
-                #if !NATIVEAOT
                 new TestAssemblyInfo (ji, ji.Location ?? String.Empty),
-                #endif
             };
         }
     }

From 1d6c463138f3f2fa115a446e54c389db2ab6dc0a Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Fri, 19 Sep 2025 09:18:28 +0200
Subject: [PATCH 2/3] [nativeaot] Log location of the actual p/invoke stub
 called

Context: 869b0e03937e0c17a4cf3fbc85f50d80350b2576

The `pinvoke_unreachable` function, when invoked, would log
its own source location instead of that of the call site.
That's a bit useless in diagnosing issues, so let's improve
it by logging the call site location... :)
---
 src/native/nativeaot/host/internal-pinvoke-stubs.cc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/native/nativeaot/host/internal-pinvoke-stubs.cc b/src/native/nativeaot/host/internal-pinvoke-stubs.cc
index 8cea50867b2..877ba869020 100644
--- a/src/native/nativeaot/host/internal-pinvoke-stubs.cc
+++ b/src/native/nativeaot/host/internal-pinvoke-stubs.cc
@@ -5,9 +5,14 @@ using namespace xamarin::android;
 
 namespace {
 	[[gnu::noreturn]]
-	void pinvoke_unreachable ()
+	void pinvoke_unreachable (std::source_location sloc = std::source_location::current ())
 	{
-		Helpers::abort_application (LOG_DEFAULT, "The method is not implemented. This is a stub and should not be called."sv);
+		Helpers::abort_application (
+			LOG_DEFAULT,
+			"The p/invoke is not implemented. This is a stub and should not be called."sv,
+			true, // log_location
+			sloc
+		);
 	}
 }
 

From 24a6e4fac888a0a6710d843f17e02e2db3c55d3c Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Fri, 19 Sep 2025 15:30:24 +0200
Subject: [PATCH 3/3] [nativeaot] Implement _monodroid_weak_gref_delete

Context: https://github.com/dotnet/android/pull/10496#issuecomment-3307541946
Context: 869b0e03937e0c17a4cf3fbc85f50d80350b2576

The `_monodroid_weak_gref_delete` p/invoke wasn't implemented
in 869b0e0393 as it was thought to be unused. However, the test
failure in #10496 shows that it's not true.

Bring the `_monodroid_weak_gref_delete` implementation to NativeAOT
host from the CoreCLR host.
---
 src/native/clr/host/internal-pinvokes-clr.cc        |  5 -----
 src/native/clr/host/internal-pinvokes-shared.cc     |  5 +++++
 src/native/nativeaot/host/internal-pinvoke-stubs.cc | 11 -----------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/native/clr/host/internal-pinvokes-clr.cc b/src/native/clr/host/internal-pinvokes-clr.cc
index 372196207a9..0f3fd5035af 100644
--- a/src/native/clr/host/internal-pinvokes-clr.cc
+++ b/src/native/clr/host/internal-pinvokes-clr.cc
@@ -66,11 +66,6 @@ void monodroid_timing_stop (managed_timing_sequence *sequence, const char *messa
 	timing->release_sequence (sequence);
 }
 
-void _monodroid_weak_gref_delete (jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable)
-{
-	OSBridge::_monodroid_weak_gref_delete (handle, type, threadName, threadId, from, from_writable);
-}
-
 void* _monodroid_timezone_get_default_id ()
 {
 	JNIEnv *env			 = OSBridge::ensure_jnienv ();
diff --git a/src/native/clr/host/internal-pinvokes-shared.cc b/src/native/clr/host/internal-pinvokes-shared.cc
index d8505c3e9d9..2df948d1297 100644
--- a/src/native/clr/host/internal-pinvokes-shared.cc
+++ b/src/native/clr/host/internal-pinvokes-shared.cc
@@ -29,6 +29,11 @@ void _monodroid_gref_log_delete (jobject handle, char type, const char *threadNa
 	OSBridge::_monodroid_gref_log_delete (handle, type, threadName, threadId, from, from_writable);
 }
 
+void _monodroid_weak_gref_delete (jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable)
+{
+	OSBridge::_monodroid_weak_gref_delete (handle, type, threadName, threadId, from, from_writable);
+}
+
 BridgeProcessingFtn clr_initialize_gc_bridge (
 	BridgeProcessingStartedFtn bridge_processing_started_callback,
 	BridgeProcessingFinishedFtn bridge_processing_finished_callback) noexcept
diff --git a/src/native/nativeaot/host/internal-pinvoke-stubs.cc b/src/native/nativeaot/host/internal-pinvoke-stubs.cc
index 877ba869020..8753b435d8f 100644
--- a/src/native/nativeaot/host/internal-pinvoke-stubs.cc
+++ b/src/native/nativeaot/host/internal-pinvoke-stubs.cc
@@ -56,17 +56,6 @@ void monodroid_timing_stop (
 	pinvoke_unreachable ();
 }
 
-void _monodroid_weak_gref_delete (
-	[[maybe_unused]] jobject handle,
-	[[maybe_unused]] char type,
-	[[maybe_unused]] const char *threadName,
-	[[maybe_unused]] int threadId,
-	[[maybe_unused]] const char *from,
-	[[maybe_unused]] int from_writable)
-{
-	pinvoke_unreachable ();
-}
-
 void* _monodroid_timezone_get_default_id ()
 {
 	pinvoke_unreachable ();