fixed circular dependency in Runtime PyMembers and InternString initialization

lostmsu · lostmsu · commit d649d6c34fd1 · 2021-10-19T17:17:22.000-07:00
diff --git a/src/runtime/intern.cs b/src/runtime/intern.cs
@@ -8,7 +8,7 @@ namespace Python.Runtime
 {
     static partial class InternString
     {
-        private static readonly Dictionary<string, PyObject> _string2interns = new();
+        private static readonly Dictionary<string, PyString> _string2interns = new();
         private static readonly Dictionary<IntPtr, string> _intern2strings = new();
         const BindingFlags PyIdentifierFieldFlags = BindingFlags.Static | BindingFlags.NonPublic;
 
@@ -37,7 +37,9 @@ public static void Initialize()
             Type type = typeof(PyIdentifier);
             foreach (string name in _builtinNames)
             {
-                var op = Runtime.PyUnicode_InternFromString(name).MoveToPyObject();
+                NewReference pyStr = Runtime.PyUnicode_InternFromString(name);
+                var op = new PyString(pyStr.StealOrThrow());
+                Debug.Assert(name == op.ToString());
                 SetIntern(name, op);
                 var field = type.GetField("f" + name, PyIdentifierFieldFlags)!;
                 field.SetValue(null, op.rawPtr);
@@ -48,8 +50,8 @@ public static void Shutdown()
         {
             foreach (var entry in _string2interns)
             {
-                entry.Value.Dispose();
                 var field = typeof(PyIdentifier).GetField("f" + entry.Value, PyIdentifierFieldFlags)!;
+                entry.Value.Dispose();
                 field.SetValue(null, IntPtr.Zero);
             }
 
@@ -72,7 +74,7 @@ public static bool TryGetInterned(BorrowedReference op, out string s)
             return _intern2strings.TryGetValue(op.DangerousGetAddress(), out s);
         }
 
-        private static void SetIntern(string s, PyObject op)
+        private static void SetIntern(string s, PyString op)
         {
             _string2interns.Add(s, op);
             _intern2strings.Add(op.rawPtr, s);
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -134,12 +134,13 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
             MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;
 
             IsFinalizing = false;
-            InternString.Initialize();
 
             InitPyMembers();
 
             ABI.Initialize(PyVersion);
 
+            InternString.Initialize();
+
             GenericUtil.Reset();
             ClassManager.Reset();
             ClassDerivedObject.Reset();
@@ -176,7 +177,7 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
 
         private static void InitPyMembers()
         {
-            using (var builtinsOwned = PyImport_Import(PyIdentifier.builtins))
+            using (var builtinsOwned = PyImport_ImportModule("builtins"))
             {
                 var builtins = builtinsOwned.Borrow();
                 SetPyMember(out PyNotImplemented, PyObject_GetAttrString(builtins, "NotImplemented").StealNullable());
@@ -197,7 +198,7 @@ private static void InitPyMembers()
                 // a wrapper_descriptor, even though dict.__setitem__ is.
                 //
                 // object.__init__ seems safe, though.
-                SetPyMemberTypeOf(out PyWrapperDescriptorType, PyObject_GetAttr(PyBaseObjectType, PyIdentifier.__init__).StealNullable());
+                SetPyMemberTypeOf(out PyWrapperDescriptorType, PyObject_GetAttrString(PyBaseObjectType, "__init__").StealNullable());
 
                 SetPyMember(out PySuper_Type, PyObject_GetAttrString(builtins, "super").StealNullable());
             }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Python.Runtime`
`8`	`8`	`{`
`9`	`9`	`static partial class InternString`
`10`	`10`	`{`
`11`		`- private static readonly Dictionary<string, PyObject> _string2interns = new();`
	`11`	`+ private static readonly Dictionary<string, PyString> _string2interns = new();`
`12`	`12`	`private static readonly Dictionary<IntPtr, string> _intern2strings = new();`
`13`	`13`	`const BindingFlags PyIdentifierFieldFlags = BindingFlags.Static \| BindingFlags.NonPublic;`
`14`	`14`
`@@ -37,7 +37,9 @@ public static void Initialize()`
`37`	`37`	`Type type = typeof(PyIdentifier);`
`38`	`38`	`foreach (string name in _builtinNames)`
`39`	`39`	`{`
`40`		`- var op = Runtime.PyUnicode_InternFromString(name).MoveToPyObject();`
	`40`	`+ NewReference pyStr = Runtime.PyUnicode_InternFromString(name);`
	`41`	`+ var op = new PyString(pyStr.StealOrThrow());`
	`42`	`+ Debug.Assert(name == op.ToString());`
`41`	`43`	`SetIntern(name, op);`
`42`	`44`	`var field = type.GetField("f" + name, PyIdentifierFieldFlags)!;`
`43`	`45`	`field.SetValue(null, op.rawPtr);`
`@@ -48,8 +50,8 @@ public static void Shutdown()`
`48`	`50`	`{`
`49`	`51`	`foreach (var entry in _string2interns)`
`50`	`52`	`{`
`51`		`- entry.Value.Dispose();`
`52`	`53`	`var field = typeof(PyIdentifier).GetField("f" + entry.Value, PyIdentifierFieldFlags)!;`
	`54`	`+ entry.Value.Dispose();`
`53`	`55`	`field.SetValue(null, IntPtr.Zero);`
`54`	`56`	`}`
`55`	`57`
`@@ -72,7 +74,7 @@ public static bool TryGetInterned(BorrowedReference op, out string s)`
`72`	`74`	`return _intern2strings.TryGetValue(op.DangerousGetAddress(), out s);`
`73`	`75`	`}`
`74`	`76`
`75`		`- private static void SetIntern(string s, PyObject op)`
	`77`	`+ private static void SetIntern(string s, PyString op)`
`76`	`78`	`{`
`77`	`79`	`_string2interns.Add(s, op);`
`78`	`80`	`_intern2strings.Add(op.rawPtr, s);`