Throw exception trying to add a reflected object after the hashset is cleared

Frawak · Frawak · commit c99cdf3efef2 · 2024-07-08T14:51:32.000+02:00
diff --git a/src/runtime/Runtime.cs b/src/runtime/Runtime.cs
@@ -158,6 +158,7 @@ internal static void Initialize(bool initSigs = false)
             ClassManager.Reset();
             ClassDerivedObject.Reset();
             TypeManager.Initialize();
+            CLRObject.creationBlocked = false;
             _typesInitialized = true;
 
             // Initialize modules that depend on the runtime class.
@@ -356,6 +357,7 @@ static bool TryCollectingGarbage(int runs, bool forceBreakLoops,
                 {
                     NullGCHandles(CLRObject.reflectedObjects);
                     CLRObject.reflectedObjects.Clear();
+                    CLRObject.creationBlocked = true;
                 }
             }
             return false;
diff --git a/src/runtime/Types/ClrObject.cs b/src/runtime/Types/ClrObject.cs
@@ -11,10 +11,15 @@ internal sealed class CLRObject : ManagedType
     {
         internal readonly object inst;
 
+        internal static bool creationBlocked = false;
+
         // "borrowed" references
         internal static readonly HashSet<IntPtr> reflectedObjects = new();
         static NewReference Create(object ob, BorrowedReference tp)
         {
+            if (creationBlocked)
+                throw new InvalidOperationException("Reflected objects should not be created anymore.");
+
             Debug.Assert(tp != null);
             var py = Runtime.PyType_GenericAlloc(tp, 0);
 
@@ -61,6 +66,9 @@ internal static void Restore(object ob, BorrowedReference pyHandle, Dictionary<s
 
         protected override void OnLoad(BorrowedReference ob, Dictionary<string, object?>? context)
         {
+            if (creationBlocked)
+                throw new InvalidOperationException("Reflected objects should not be loaded anymore.");
+
             base.OnLoad(ob, context);
             GCHandle gc = GCHandle.Alloc(this);
             SetGCHandle(ob, gc);

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ internal static void Initialize(bool initSigs = false)`
`158`	`158`	`ClassManager.Reset();`
`159`	`159`	`ClassDerivedObject.Reset();`
`160`	`160`	`TypeManager.Initialize();`
	`161`	`+ CLRObject.creationBlocked = false;`
`161`	`162`	`_typesInitialized = true;`
`162`	`163`
`163`	`164`	`// Initialize modules that depend on the runtime class.`
`@@ -356,6 +357,7 @@ static bool TryCollectingGarbage(int runs, bool forceBreakLoops,`
`356`	`357`	`{`
`357`	`358`	`NullGCHandles(CLRObject.reflectedObjects);`
`358`	`359`	`CLRObject.reflectedObjects.Clear();`
	`360`	`+ CLRObject.creationBlocked = true;`
`359`	`361`	`}`
`360`	`362`	`}`
`361`	`363`	`return false;`