Remove need for NativeAotValueManager.

dotnet · Nov 9, 2023 · 6920e6c · 6920e6c
1 parent ce850ca
commit 6920e6c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 30 deletions.
diff --git a/samples/Hello-NativeAOTFromJNI/JavaInteropRuntime.cs b/samples/Hello-NativeAOTFromJNI/JavaInteropRuntime.cs
@@ -27,8 +27,8 @@ static void init (IntPtr jnienv, IntPtr klass)
 		try {
 			var options = new JreRuntimeOptions {
 				EnvironmentPointer  = jnienv,
-				TypeManager         = new NativeAotTypeManager (),
-				ValueManager        = new NativeAotValueManager (),
+				TypeManager             = new NativeAotTypeManager (),
+				UseMarshalMemberBuilder = false,
 			};
 			runtime = options.CreateJreVM ();
 		}

diff --git a/samples/Hello-NativeAOTFromJNI/NativeAotValueManager.cs b/samples/Hello-NativeAOTFromJNI/NativeAotValueManager.cs
diff --git a/src/Java.Interop/Java.Interop/JniRuntime.JniMarshalMemberBuilder.cs b/src/Java.Interop/Java.Interop/JniRuntime.JniMarshalMemberBuilder.cs
@@ -26,6 +26,7 @@ public  JniMarshalMemberBuilder        MarshalMemberBuilder        {
 				return marshalMemberBuilder;
 			}
 		}
+		public  bool                           UseMarshalMemberBuilder  => marshalMemberBuilder != null;
 
 		[System.Diagnostics.CodeAnalysis.SuppressMessage ("Design", "CA1031:Do not catch general exception types", Justification = "the *.Export assemblies are optional, so we don't care when they cannot be loaded (they are presumably missing)")]
 #if NET

diff --git a/src/Java.Runtime.Environment/Java.Interop/JreTypeManager.cs b/src/Java.Runtime.Environment/Java.Interop/JreTypeManager.cs
@@ -23,6 +23,10 @@ public override void RegisterNativeMembers (JniType nativeClass, Type type, Read
 				return;
 			}
 
+			if (!Runtime.UseMarshalMemberBuilder) {
+				throw new NotSupportedException ("JniRuntime.MarshalMemberBuilder is required and not present.");
+			}
+
 			var toRegister  = new JniMethodMap ();
 
 			AddInterfaceMethods (toRegister, type);

diff --git a/src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs b/src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs
@@ -204,8 +204,11 @@ public override void ActivatePeer (IJavaPeerable? self, JniObjectReference refer
 			var runtime = JniEnvironment.Runtime;
 
 			try {
-				var f = runtime.MarshalMemberBuilder.CreateConstructActivationPeerFunc (cinfo);
-				f (cinfo, reference, argumentValues);
+				if (runtime.UseMarshalMemberBuilder) {
+					ActivateViaMarshalMemberBuilder (runtime.MarshalMemberBuilder, reference, cinfo, argumentValues);
+					return;
+				}
+				ActivateViaReflection (reference, cinfo, argumentValues);
 			} catch (Exception e) {
 				var m = string.Format ("Could not activate {{ PeerReference={0} IdentityHashCode=0x{1} Java.Type={2} }} for managed type '{3}'.",
 						reference,
@@ -218,6 +221,24 @@ public override void ActivatePeer (IJavaPeerable? self, JniObjectReference refer
 			}
 		}
 
+		void ActivateViaMarshalMemberBuilder (JniRuntime.JniMarshalMemberBuilder builder, JniObjectReference reference, ConstructorInfo cinfo, object?[]? argumentValues)
+		{
+			var f = builder.CreateConstructActivationPeerFunc (cinfo);
+			f (cinfo, reference, argumentValues);
+		}
+
+		void ActivateViaReflection (JniObjectReference reference, ConstructorInfo cinfo, object?[]? argumentValues)
+		{
+			var declType  = cinfo.DeclaringType ?? throw new NotSupportedException ("Do not know the type to create!");
+
+#pragma warning disable IL2072
+			var self      = (IJavaPeerable) System.Runtime.CompilerServices.RuntimeHelpers.GetUninitializedObject (declType);
+#pragma warning restore IL2072
+			self.SetPeerReference (reference);
+
+			cinfo.Invoke (self, argumentValues);
+		}
+
 		public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()
 		{
 			if (RegisteredInstances == null)