Cache HasClrMember and align DLR setter exception path

greateggsgreg · filmor · commit 3a0899084dfc · 2026-05-15T21:57:36.000+02:00
- Cache HasClrMember reflection per (Type, name) so tp_getattro_dlr_proxy / tp_setattro_dlr_proxy avoid repeated GetMember() calls on every attribute access of DLR-aware objects. - Mirror tp_setattro_dlr_proxy's catch arm to the getter's safer SetError(RuntimeError, e.Message) shape instead of SetError(Exception), keeping both slots re-entry-safe on live dynamic objects. Related to #2706.
diff --git a/src/runtime/TypeManager.cs b/src/runtime/TypeManager.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Dynamic;
 using System.Linq;
@@ -41,8 +42,14 @@ internal class TypeManager
 
         static readonly DynamicObjectMemberAccessor dynamicMemberAccessor = new();
 
+        // tp_getattro_dlr_proxy / tp_setattro_dlr_proxy hit HasClrMember on every
+        // attribute access; cache the reflection result per (Type, name).
+        static readonly ConcurrentDictionary<(Type, string), bool> _hasClrMemberCache = new();
+
         static bool HasClrMember(object instance, string memberName) =>
-            instance.GetType().GetMember(memberName, BindingFlags.Public | BindingFlags.Instance).Length > 0;
+            _hasClrMemberCache.GetOrAdd(
+                (instance.GetType(), memberName),
+                k => k.Item1.GetMember(k.Item2, BindingFlags.Public | BindingFlags.Instance).Length > 0);
 
         static bool IsPythonSpecialAttributeName(string memberName) =>
             memberName.Length > 4 && memberName.StartsWith("__") && memberName.EndsWith("__");
@@ -198,7 +205,9 @@ public static int tp_setattro_dlr_proxy(BorrowedReference ob, BorrowedReference
                 }
                 catch (Exception e)
                 {
-                    Exceptions.SetError(e);
+                    // Same reasoning as the getter: avoid Converter.ToPython(e) to keep this
+                    // slot re-entry-safe on live dynamic objects.
+                    Exceptions.SetError(Exceptions.RuntimeError, e.Message);
                     return -1;
                 }
 
