Eliminate contextless PythonTuple constructor (IronLanguages#1946)

BCSharp · web-flow · commit 0c9866f80db4 · 2025-04-20T15:09:52.000-07:00
diff --git a/src/core/IronPython.Modules/IterTools.cs b/src/core/IronPython.Modules/IterTools.cs
@@ -763,7 +763,7 @@ public class product : IterBase {
             private PythonTuple[] tuples;
 
             public product(CodeContext context, [NotNone] params object[] iterables) {
-                tuples = ArrayUtils.ConvertAll(iterables, x => new PythonTuple(PythonOps.GetEnumerator(x)));
+                tuples = ArrayUtils.ConvertAll(iterables, x => new PythonTuple(context, PythonOps.GetEnumerator(x)));
                 InnerEnumerator = Yielder(tuples);
             }
 
@@ -788,7 +788,7 @@ public product(CodeContext context, [ParamDictionary] IDictionary<object, object
                 tuples = new PythonTuple[iterables.Length * iRepeat];
                 for (int i = 0; i < iRepeat; i++) {
                     for (int j = 0; j < iterables.Length; j++) {
-                        tuples[i * iterables.Length + j] = new PythonTuple(iterables[j]);
+                        tuples[i * iterables.Length + j] = new PythonTuple(context, iterables[j]);
                     }
                 }
                 InnerEnumerator = Yielder(tuples);
diff --git a/src/core/IronPython.Modules/nt.cs b/src/core/IronPython.Modules/nt.cs
@@ -1389,7 +1389,7 @@ public PythonTuple __reduce__() {
 
                 return MakeTuple(
                     DynamicHelpers.GetPythonTypeFromType(typeof(stat_result)),
-                    MakeTuple(new PythonTuple(this), timeDict)
+                    MakeTuple(new PythonTuple(DefaultContext.Default, this), timeDict)
                 );
             }
         }
diff --git a/src/core/IronPython.Modules/resource.cs b/src/core/IronPython.Modules/resource.cs
@@ -245,7 +245,7 @@ private struct_rusage(object?[] sequence) : base(sequence) {
                 throw PythonOps.TypeError("resource.struct_rusage() takes a {0}-sequence ({1}-sequence given)", n_sequence_fields, __len__());
         }
 
-        private struct_rusage(object o) : base(o) {
+        private struct_rusage(object o) : base(DefaultContext.Default, o) {
             if (__len__() != n_sequence_fields)
                 throw PythonOps.TypeError("resource.struct_rusage() takes a {0}-sequence ({1}-sequence given)", n_sequence_fields, __len__());
         }
diff --git a/src/core/IronPython.Modules/time.cs b/src/core/IronPython.Modules/time.cs
@@ -512,7 +512,7 @@ internal struct_time(int year, int month, int day, int hour, int minute, int sec
             }
 
             internal struct_time(PythonTuple sequence)
-                : base(sequence) {
+                : base(DefaultContext.Default, sequence) {
             }
 
             public static struct_time __new__(CodeContext context, [NotNone] PythonType cls, int year, int month, int day, int hour, int minute, int second, int dayOfWeek, int dayOfYear, int isDst) {
diff --git a/src/core/IronPython/Runtime/ClrModule.cs b/src/core/IronPython/Runtime/ClrModule.cs
@@ -1130,7 +1130,7 @@ private static void SortModules(List<string> modules) {
         /// All times are expressed in the same unit of measure as DateTime.Ticks
         /// </summary>
         public static PythonTuple GetProfilerData(CodeContext/*!*/ context, bool includeUnused = false) {
-            return new PythonTuple(Profiler.GetProfiler(context.LanguageContext).GetProfile(includeUnused));
+            return new PythonTuple(DefaultContext.Default, Profiler.GetProfiler(context.LanguageContext).GetProfile(includeUnused));
         }
 
         /// <summary>
diff --git a/src/core/IronPython/Runtime/Exceptions/PythonExceptions.BaseException.cs b/src/core/IronPython/Runtime/Exceptions/PythonExceptions.BaseException.cs
@@ -90,7 +90,7 @@ public static object __new__([NotNone] PythonType/*!*/ cls, [NotNone] params obj
                 } else {
                     res = (BaseException)Activator.CreateInstance(cls.UnderlyingSystemType, cls)!;
                 }
-                res._args = new PythonTuple(args);
+                res._args = new PythonTuple(DefaultContext.Default, args);
                 return res;
             }
 
diff --git a/src/core/IronPython/Runtime/Operations/PythonOps.cs b/src/core/IronPython/Runtime/Operations/PythonOps.cs
@@ -1000,7 +1000,7 @@ internal static bool TryInvokeLengthHint(CodeContext context, object? sequence,
                 List<object?> largs;
 
                 if (argsTuple != null && args.Length == names.Length) {
-                    if (!(argsTuple is PythonTuple tuple)) tuple = new PythonTuple(argsTuple);
+                    if (!(argsTuple is PythonTuple tuple)) tuple = new PythonTuple(DefaultContext.Default, argsTuple);
 
                     largs = new List<object?>(tuple);
                     largs.AddRange(args);
@@ -1813,7 +1813,7 @@ public static void DictUpdate(CodeContext context, PythonDictionary dict, object
         /// LIST_TO_TUPLE
         /// </summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public static PythonTuple ListToTuple(PythonList list) => new PythonTuple(list);
+        public static PythonTuple ListToTuple(PythonList list) => new PythonTuple(DefaultContext.Default, list);
 
         /// <summary>
         /// SET_ADD
diff --git a/src/core/IronPython/Runtime/PythonFunction.cs b/src/core/IronPython/Runtime/PythonFunction.cs
@@ -139,7 +139,7 @@ public PythonTuple __defaults__ {
             get {
                 if (_defaults.Length == 0) return null;
 
-                return new PythonTuple(_defaults);
+                return new PythonTuple(DefaultContext.Default, _defaults);
             }
             set {
                 _defaults = value == null ? [] : value.ToArray();
diff --git a/src/core/IronPython/Runtime/PythonList.cs b/src/core/IronPython/Runtime/PythonList.cs
@@ -1302,7 +1302,7 @@ int IStructuralEquatable.GetHashCode(IEqualityComparer comparer) {
             int res;
             CompareUtil.Push(this);
             try {
-                res = ((IStructuralEquatable)new PythonTuple(this)).GetHashCode(comparer);
+                res = ((IStructuralEquatable)PythonTuple.Make(GetObjectArray())).GetHashCode(comparer);
             } finally {
                 CompareUtil.Pop(this);
             }
diff --git a/src/core/IronPython/Runtime/PythonTuple.cs b/src/core/IronPython/Runtime/PythonTuple.cs
@@ -29,8 +29,8 @@ public class PythonTuple : IList, IList<object?>, ICodeFormattable, IExpressionS
 
         internal static readonly PythonTuple EMPTY = new PythonTuple();
 
-        public PythonTuple([AllowNull]object o) {
-            _data = MakeItems(o);
+        public PythonTuple(CodeContext context, [AllowNull]object o) {
+            _data = MakeItems(context, o);
         }
 
         protected PythonTuple(object?[] items) {
@@ -55,19 +55,19 @@ public static PythonTuple __new__(CodeContext context, [NotNone] PythonType cls)
             if (cls == TypeCache.PythonTuple) {
                 return EMPTY;
             } else {
-                if (!(cls.CreateInstance(context) is PythonTuple tupObj)) throw PythonOps.TypeError("{0} is not a subclass of tuple", cls);
+                if (cls.CreateInstance(context) is not PythonTuple tupObj) throw PythonOps.TypeError("{0} is not a subclass of tuple", cls);
                 return tupObj;
             }
         }
 
         public static PythonTuple __new__(CodeContext context, [NotNone] PythonType cls, object? sequence) {
-            if (sequence == null) return new PythonTuple(sequence); // this will throw the proper exception
+            if (sequence == null) return new PythonTuple(context, sequence); // this will throw the proper exception
 
             if (cls == TypeCache.PythonTuple) {
                 if (sequence.GetType() == typeof(PythonTuple)) return (PythonTuple)sequence;
-                return new PythonTuple(sequence);
+                return new PythonTuple(context, sequence);
             } else {
-                if (!(cls.CreateInstance(context, sequence) is PythonTuple tupObj)) throw PythonOps.TypeError("{0} is not a subclass of tuple", cls);
+                if (cls.CreateInstance(context, sequence) is not PythonTuple tupObj) throw PythonOps.TypeError("{0} is not a subclass of tuple", cls);
                 return tupObj;
             }
         }
@@ -115,15 +115,15 @@ public int count(object? obj) {
 
         internal static PythonTuple Make(object o) {
             if (o is PythonTuple t) return t;
-            return new PythonTuple(o);
+            return new PythonTuple(DefaultContext.Default, o);
         }
 
         internal static PythonTuple MakeTuple(params object?[] items) {
             if (items.Length == 0) return EMPTY;
-            return new PythonTuple(items);
+            return new PythonTuple(DefaultContext.Default, items);
         }
 
-        private static object?[] MakeItems(object? o) {
+        private static object?[] MakeItems(CodeContext context, object? o) {
             var t = o?.GetType();
             // Only use fast paths if we have an exact tuple/list, otherwise use iter
             if (t == typeof(PythonTuple)) {
@@ -142,7 +142,7 @@ internal static PythonTuple MakeTuple(params object?[] items) {
                 PerfTrack.NoteEvent(PerfTrack.Categories.OverAllocate, "TupleOA: " + PythonOps.GetPythonTypeName(o));
 
                 var l = new List<object?>();
-                IEnumerator i = PythonOps.GetEnumerator(o);
+                IEnumerator i = PythonOps.GetEnumerator(context, o);
                 while (i.MoveNext()) {
                     l.Add(i.Current);
                 }
@@ -315,8 +315,8 @@ public IEnumerator GetEnumerator() {
         }
 
         public object __getnewargs__() {
-            // Call "new Tuple()" to force result to be a Tuple (otherwise, it could possibly be a Tuple subclass)
-            return PythonTuple.MakeTuple(new PythonTuple(this));
+            // Call "MakeTuple()" to force result to be specifically a Tuple (otherwise, it could possibly be a Tuple subclass)
+            return PythonTuple.MakeTuple(_data);
         }
 
         #region IEnumerable<object> Members
diff --git a/src/extensions/IronPython.SQLite/Cursor.cs b/src/extensions/IronPython.SQLite/Cursor.cs
@@ -239,10 +239,10 @@ private object queryExecute(CodeContext context, bool multiple, object operation
                                     (bool?)null
                                 };
 
-                                new_description[i] = new PythonTuple(descriptor);
+                                new_description[i] = new PythonTuple(DefaultContext.Default, descriptor);
                             }
 
-                            this.description = new PythonTuple(new_description);
+                            this.description = new PythonTuple(DefaultContext.Default, new_description);
                         }
                     }
 
@@ -362,7 +362,7 @@ private object fetchOneRow(CodeContext context)
                     row[i] = converted;
                 }
 
-                return new PythonTuple(row);
+                return new PythonTuple(DefaultContext.Default, row);
             }
 
             public Cursor executescript(string operation)
diff --git a/src/extensions/IronPython.SQLite/Statement.cs b/src/extensions/IronPython.SQLite/Statement.cs
@@ -213,7 +213,7 @@ value is string ||
                 object proto = DynamicHelpers.GetPythonTypeFromType(typeof(PythonSQLite.PrepareProtocol));
                 object type = DynamicHelpers.GetPythonType(value);
 
-                object key = new PythonTuple(new[] { type, proto });
+                object key = new PythonTuple(DefaultContext.Default, new[] { type, proto });
 
                 return PythonSQLite.adapters.ContainsKey(key);
             }
@@ -228,7 +228,7 @@ private object adaptValue(CodeContext context, object value)
             object proto = DynamicHelpers.GetPythonTypeFromType(typeof(PythonSQLite.PrepareProtocol));
             object type = DynamicHelpers.GetPythonType(value);
 
-            object key = new PythonTuple(new[] { type, proto });
+            object key = new PythonTuple(DefaultContext.Default, new[] { type, proto });
 
             object adapter;
             if(PythonSQLite.adapters.TryGetValue(key, out adapter))
diff --git a/src/extensions/IronPython.SQLite/_sqlite.cs b/src/extensions/IronPython.SQLite/_sqlite.cs
@@ -59,7 +59,7 @@ public static object connect(CodeContext context,
         public static void register_adapter(CodeContext context, PythonType type, object adapter)
         {
             object proto = DynamicHelpers.GetPythonTypeFromType(typeof(PrepareProtocol));
-            object key = new PythonTuple(new object[] { type, proto });
+            object key = new PythonTuple(DefaultContext.Default, new object[] { type, proto });
             adapters[key] = adapter;
         }
 
diff --git a/tests/IronPython.Tests/EngineTest.cs b/tests/IronPython.Tests/EngineTest.cs
@@ -1682,7 +1682,7 @@ public void ScenarioEvaluateInAnonymousEngineModule() {
         [Test]
         public void ScenarioObjectOperations() {
             var ops = _pe.Operations;
-            Assert.That(ops.Format(new PythonTuple(new object[] { 1, 2, 3 })), Is.EqualTo("(1, 2, 3)"));
+            Assert.That(ops.Format(PythonTuple.Make(new object[] { 1, 2, 3 })), Is.EqualTo("(1, 2, 3)"));
 
             var scope = _pe.CreateScope();
             scope.SetVariable("ops", ops);

Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,7 @@ public class product : IterBase {`
`763`	`763`	`private PythonTuple[] tuples;`
`764`	`764`
`765`	`765`	`public product(CodeContext context, [NotNone] params object[] iterables) {`
`766`		`- tuples = ArrayUtils.ConvertAll(iterables, x => new PythonTuple(PythonOps.GetEnumerator(x)));`
	`766`	`+ tuples = ArrayUtils.ConvertAll(iterables, x => new PythonTuple(context, PythonOps.GetEnumerator(x)));`
`767`	`767`	`InnerEnumerator = Yielder(tuples);`
`768`	`768`	`}`
`769`	`769`
`@@ -788,7 +788,7 @@ public product(CodeContext context, [ParamDictionary] IDictionary<object, object`
`788`	`788`	`tuples = new PythonTuple[iterables.Length * iRepeat];`
`789`	`789`	`for (int i = 0; i < iRepeat; i++) {`
`790`	`790`	`for (int j = 0; j < iterables.Length; j++) {`
`791`		`- tuples[i * iterables.Length + j] = new PythonTuple(iterables[j]);`
	`791`	`+ tuples[i * iterables.Length + j] = new PythonTuple(context, iterables[j]);`
`792`	`792`	`}`
`793`	`793`	`}`
`794`	`794`	`InnerEnumerator = Yielder(tuples);`
Original file line number	Diff line number	Diff line change
`@@ -1389,7 +1389,7 @@ public PythonTuple __reduce__() {`
`1389`	`1389`
`1390`	`1390`	`return MakeTuple(`
`1391`	`1391`	`DynamicHelpers.GetPythonTypeFromType(typeof(stat_result)),`
`1392`		`- MakeTuple(new PythonTuple(this), timeDict)`
	`1392`	`+ MakeTuple(new PythonTuple(DefaultContext.Default, this), timeDict)`
`1393`	`1393`	`);`
`1394`	`1394`	`}`
`1395`	`1395`	`}`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ private struct_rusage(object?[] sequence) : base(sequence) {`
`245`	`245`	`throw PythonOps.TypeError("resource.struct_rusage() takes a {0}-sequence ({1}-sequence given)", n_sequence_fields, __len__());`
`246`	`246`	`}`
`247`	`247`
`248`		`- private struct_rusage(object o) : base(o) {`
	`248`	`+ private struct_rusage(object o) : base(DefaultContext.Default, o) {`
`249`	`249`	`if (__len__() != n_sequence_fields)`
`250`	`250`	`throw PythonOps.TypeError("resource.struct_rusage() takes a {0}-sequence ({1}-sequence given)", n_sequence_fields, __len__());`
`251`	`251`	`}`
Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@ internal struct_time(int year, int month, int day, int hour, int minute, int sec`
`512`	`512`	`}`
`513`	`513`
`514`	`514`	`internal struct_time(PythonTuple sequence)`
`515`		`- : base(sequence) {`
	`515`	`+ : base(DefaultContext.Default, sequence) {`
`516`	`516`	`}`
`517`	`517`
`518`	`518`	`public static struct_time __new__(CodeContext context, [NotNone] PythonType cls, int year, int month, int day, int hour, int minute, int second, int dayOfWeek, int dayOfYear, int isDst) {`
Original file line number	Diff line number	Diff line change
`@@ -1130,7 +1130,7 @@ private static void SortModules(List<string> modules) {`
`1130`	`1130`	`/// All times are expressed in the same unit of measure as DateTime.Ticks`
`1131`	`1131`	`/// </summary>`
`1132`	`1132`	`public static PythonTuple GetProfilerData(CodeContext/!/ context, bool includeUnused = false) {`
`1133`		`- return new PythonTuple(Profiler.GetProfiler(context.LanguageContext).GetProfile(includeUnused));`
	`1133`	`+ return new PythonTuple(DefaultContext.Default, Profiler.GetProfiler(context.LanguageContext).GetProfile(includeUnused));`
`1134`	`1134`	`}`
`1135`	`1135`
`1136`	`1136`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static object __new__([NotNone] PythonType/!/ cls, [NotNone] params obj`
`90`	`90`	`} else {`
`91`	`91`	`res = (BaseException)Activator.CreateInstance(cls.UnderlyingSystemType, cls)!;`
`92`	`92`	`}`
`93`		`- res._args = new PythonTuple(args);`
	`93`	`+ res._args = new PythonTuple(DefaultContext.Default, args);`
`94`	`94`	`return res;`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public PythonTuple __defaults__ {`
`139`	`139`	`get {`
`140`	`140`	`if (_defaults.Length == 0) return null;`
`141`	`141`
`142`		`- return new PythonTuple(_defaults);`
	`142`	`+ return new PythonTuple(DefaultContext.Default, _defaults);`
`143`	`143`	`}`
`144`	`144`	`set {`
`145`	`145`	`_defaults = value == null ? [] : value.ToArray();`
Original file line number	Diff line number	Diff line change
`@@ -1302,7 +1302,7 @@ int IStructuralEquatable.GetHashCode(IEqualityComparer comparer) {`
`1302`	`1302`	`int res;`
`1303`	`1303`	`CompareUtil.Push(this);`
`1304`	`1304`	`try {`
`1305`		`- res = ((IStructuralEquatable)new PythonTuple(this)).GetHashCode(comparer);`
	`1305`	`+ res = ((IStructuralEquatable)PythonTuple.Make(GetObjectArray())).GetHashCode(comparer);`
`1306`	`1306`	`} finally {`
`1307`	`1307`	`CompareUtil.Pop(this);`
`1308`	`1308`	`}`