Add a JniObjectReferenceControlBlock to JavaException

Author: jonpryor

src/Java.Interop/Java.Interop/JavaException.cs

@@ -18,13 +18,7 @@ unsafe public class JavaException : Exception, IJavaPeerable
 		JniObjectReference  reference;
 #endif  // FEATURE_JNIOBJECTREFERENCE_SAFEHANDLES
 #if FEATURE_JNIOBJECTREFERENCE_INTPTRS
-		IntPtr                  handle;
-		JniObjectReferenceType  handle_type;
-	#pragma warning disable 0169
-		// Used by JavaInteropGCBridge
-		IntPtr                  weak_handle;
-		int                     refs_added;
-	#pragma warning restore 0169
+		unsafe  JniObjectReferenceControlBlock* jniObjectReferenceControlBlock;
 #endif  // FEATURE_JNIOBJECTREFERENCE_INTPTRS
 
 		protected   static  readonly    JniObjectReference*     InvalidJniObjectReference = null;
@@ -106,7 +100,11 @@ public          JniObjectReference          PeerReference {
 				return reference;
 #endif  // FEATURE_JNIOBJECTREFERENCE_SAFEHANDLES
 #if FEATURE_JNIOBJECTREFERENCE_INTPTRS
-				return new JniObjectReference (handle, handle_type);
+				var c = jniObjectReferenceControlBlock;
+				if (c == null) {
+					return default;
+				}
+				return new JniObjectReference (c->handle, (JniObjectReferenceType) c->handle_type);
 #endif  // FEATURE_JNIOBJECTREFERENCE_INTPTRS
 			}
 		}
@@ -137,8 +135,13 @@ protected void SetPeerReference (ref JniObjectReference reference, JniObjectRefe
 			this.reference      = reference;
 #endif  // FEATURE_JNIOBJECTREFERENCE_SAFEHANDLES
 #if FEATURE_JNIOBJECTREFERENCE_INTPTRS
-			this.handle         = reference.Handle;
-			this.handle_type    = reference.Type;
+			var c   = jniObjectReferenceControlBlock;
+			if (c == null) {
+				c   = jniObjectReferenceControlBlock    =
+					Java.Interop.JniObjectReferenceControlBlock.Alloc ();
+			}
+			c->handle       = reference.Handle;
+			c->handle_type  = (int) reference.Type;
 #endif  // FEATURE_JNIOBJECTREFERENCE_INTPTRS
 
 			JniObjectReference.Dispose (ref reference, options);
@@ -167,6 +170,9 @@ protected virtual void Dispose (bool disposing)
 			if (inner != null) {
 				inner.Dispose ();
 			}
+#if FEATURE_JNIOBJECTREFERENCE_INTPTRS
+			Java.Interop.JniObjectReferenceControlBlock.Free (ref jniObjectReferenceControlBlock);
+#endif  // FEATURE_JNIOBJECTREFERENCE_INTPTRS
 		}
 
 		public override bool Equals (object? obj)
@@ -282,6 +288,9 @@ void IJavaPeerable.SetPeerReference (JniObjectReference reference)
 		{
 			SetPeerReference (ref reference, JniObjectReferenceOptions.Copy);
 		}
+
+		IntPtr IJavaPeerable.JniObjectReferenceControlBlock =>
+			(IntPtr) jniObjectReferenceControlBlock;
 	}
 }
 

src/Java.Interop/Java.Interop/JavaObject.cs

@@ -25,9 +25,7 @@ unsafe public class JavaObject : IJavaPeerable
 		[NonSerialized] JniObjectReference  reference;
 #endif  // FEATURE_JNIOBJECTREFERENCE_SAFEHANDLES
 #if FEATURE_JNIOBJECTREFERENCE_INTPTRS
-		IntPtr  jniObjectReferenceControlBlock;
-		unsafe  JniObjectReferenceControlBlock* JniObjectReferenceControlBlock =>
-			(JniObjectReferenceControlBlock*) jniObjectReferenceControlBlock;
+		unsafe  JniObjectReferenceControlBlock* jniObjectReferenceControlBlock;
 #endif  // FEATURE_JNIOBJECTREFERENCE_INTPTRS
 
 		protected   static  readonly    JniObjectReference*     InvalidJniObjectReference  = null;
@@ -43,7 +41,7 @@ public  unsafe  JniObjectReference          PeerReference {
 				return reference;
 #endif  // FEATURE_JNIOBJECTREFERENCE_SAFEHANDLES
 #if FEATURE_JNIOBJECTREFERENCE_INTPTRS
-				var c = JniObjectReferenceControlBlock;
+				var c = jniObjectReferenceControlBlock;
 				if (c == null) {
 					return default;
 				}
@@ -91,11 +89,10 @@ protected void SetPeerReference (ref JniObjectReference reference, JniObjectRefe
 			this.reference      = reference;
 #endif  // FEATURE_JNIOBJECTREFERENCE_SAFEHANDLES
 #if FEATURE_JNIOBJECTREFERENCE_INTPTRS
-			var c   = JniObjectReferenceControlBlock;
+			var c   = jniObjectReferenceControlBlock;
 			if (c == null) {
-				jniObjectReferenceControlBlock    =
+				c   = jniObjectReferenceControlBlock    =
 					Java.Interop.JniObjectReferenceControlBlock.Alloc ();
-				c   = JniObjectReferenceControlBlock;
 			}
 			c->handle       = reference.Handle;
 			c->handle_type  = (int) reference.Type;
@@ -180,7 +177,7 @@ void IJavaPeerable.SetPeerReference (JniObjectReference reference)
 		}
 
 		IntPtr IJavaPeerable.JniObjectReferenceControlBlock =>
-			jniObjectReferenceControlBlock;
+			(IntPtr) jniObjectReferenceControlBlock;
 	}
 }
 

src/Java.Interop/Java.Interop/JniObjectReferenceControlBlock.cs

@@ -11,15 +11,17 @@ internal struct JniObjectReferenceControlBlock {
 
 	public  static  readonly    int Size    = Marshal.SizeOf<JniObjectReferenceControlBlock>();
 
-	public  static  unsafe  IntPtr Alloc () =>
-		(IntPtr) NativeMemory.AllocZeroed (1, (uint) Size);
+	public static unsafe JniObjectReferenceControlBlock* Alloc ()
+	{
+		return (JniObjectReferenceControlBlock*)NativeMemory.AllocZeroed (1, (uint) Size);
+	}
 
-	public  static  unsafe  void Free (ref IntPtr value)
+	public static unsafe void Free (ref JniObjectReferenceControlBlock* value)
 	{
-		if (value == 0) {
+		if (value == null) {
 			return;
 		}
-		NativeMemory.Free ((void*) value);
-		value   = IntPtr.Zero;
+		NativeMemory.Free (value);
+		value   = null;
 	}
 }