Return thread from LuaReference.IsAlive

Author: Quahu

src/Laylua.Tests/Tests/Marshaler/LuaMarshalerDelegateTests.cs

@@ -235,6 +235,6 @@ private void ParamsObjectMethod(params object[] args)
 
     private static bool IsReferenceAlive(LuaReference? reference)
     {
-        return (bool) typeof(LuaReference).GetMethod("IsAlive", BindingFlags.NonPublic | BindingFlags.Static)!.Invoke(null, [reference])!;
+        return (bool) typeof(LuaReference).GetMethod("IsAlive", BindingFlags.NonPublic | BindingFlags.Static)!.Invoke(null, [reference, null])!;
     }
 }

src/Laylua/Library/Entities/Reference/LuaReference.cs

@@ -23,12 +23,9 @@ internal LuaThread Thread
             ThrowIfInvalid();
             return ThreadCore;
         }
-        set
-        {
-            ThreadCore = value is Lua lua 
-                ? lua.MainThread 
-                : value.CloneReference();
-        }
+        set => ThreadCore = value is Lua lua
+            ? lua.MainThread
+            : value.CloneReference();
     }
 
     internal int Reference
@@ -53,12 +50,12 @@ private protected LuaReference()
 
     ~LuaReference()
     {
-        if (!IsAlive(this))
+        if (!IsAlive(this, out var thread))
             return;
 
         if (!LuaRegistry.IsPersistentReference(_reference))
         {
-            Lua.FromThread(Thread).PushLeakedReference(_reference);
+            Lua.FromThread(thread).PushLeakedReference(_reference);
         }
 
         if (Thread!.Marshaler.ReturnReference(this))
@@ -137,19 +134,19 @@ public bool Equals(LuaReference? other)
         if (other == null)
             return false;
 
-        if (!IsAlive(this) || !IsAlive(other))
+        if (!IsAlive(this, out var thread) || !IsAlive(other, out var otherThread))
             return false;
 
         if (_reference == other._reference)
             return true;
 
-        Thread!.Stack.EnsureFreeCapacity(2);
+        thread.Stack.EnsureFreeCapacity(2);
 
-        using (Thread.Stack.SnapshotCount())
+        using (thread.Stack.SnapshotCount())
         {
-            Thread.Stack.Push(this);
-            Thread.Stack.Push(other);
-            var L = Thread.State.L;
+            thread.Stack.Push(this);
+            thread.Stack.Push(other);
+            var L = thread.State.L;
             if (lua_rawequal(L, -2, -1))
                 return true;
         }
@@ -178,15 +175,15 @@ public sealed override int GetHashCode()
     /// </returns>
     public override string ToString()
     {
-        if (!IsAlive(this))
+        if (!IsAlive(this, out var thread))
             return $"<disposed {GetType().ToTypeString()}>";
 
-        Thread.Stack.EnsureFreeCapacity(2);
+        thread.Stack.EnsureFreeCapacity(2);
 
-        using (Thread.Stack.SnapshotCount())
+        using (thread.Stack.SnapshotCount())
         {
-            Thread.Stack.Push(this);
-            var L = Thread.State.L;
+            thread.Stack.Push(this);
+            var L = thread.State.L;
             return luaL_tostring(L, -1).ToString() ?? "<invalid>";
         }
     }
@@ -200,10 +197,10 @@ public virtual void Dispose()
         if (LuaRegistry.IsPersistentReference(_reference))
             return;
 
-        if (!IsAlive(this))
+        if (!IsAlive(this, out var thread))
             return;
 
-        var L = Thread!.State.L;
+        var L = thread.State.L;
         if (L == null)
             return;
 
@@ -215,7 +212,7 @@ public virtual void Dispose()
 
         if (this is not LuaThread)
         {
-            Thread.Dispose();
+            thread.Dispose();
         }
 
         IsDisposed = true;
@@ -252,9 +249,9 @@ internal static void ValidateOwnership(LuaThread thread, LuaReference reference)
         }
     }
 
-    internal static bool IsAlive(LuaReference reference)
+    internal static bool IsAlive(LuaReference reference, [MaybeNullWhen(false)] out LuaThread thread)
     {
-        var lua = reference.ThreadCore;
-        return lua != null && !lua.IsDisposed && !reference.IsDisposed && !lua.MainThread.IsDisposed;
+        thread = reference.ThreadCore;
+        return thread != null && !thread.IsDisposed && !reference.IsDisposed && !thread.MainThread.IsDisposed;
     }
 }