Use TypeCache where appropriate (#1450)

Author: BCSharp

Src/IronPython/Modules/Builtin.cs

@@ -131,9 +131,9 @@ public static string bin(object? number) {
             }
         }
 
-        public static PythonType @bool => DynamicHelpers.GetPythonTypeFromType(typeof(bool));
+        public static PythonType @bool => TypeCache.Boolean;
 
-        public static PythonType bytes => DynamicHelpers.GetPythonTypeFromType(typeof(Bytes));
+        public static PythonType bytes => TypeCache.Bytes;
 
         public static PythonType bytearray => DynamicHelpers.GetPythonTypeFromType(typeof(ByteArray));
 
@@ -237,13 +237,13 @@ private static object CompileHelper(CodeContext/*!*/ context, SourceUnit sourceU
                 (object)_ast.BuildAst(context, sourceUnit, opts, mode);
         }
 
-        public static PythonType complex => DynamicHelpers.GetPythonTypeFromType(typeof(Complex));
+        public static PythonType complex => TypeCache.Complex;
 
         public static void delattr(CodeContext/*!*/ context, object? o, [NotNone] string name) {
             PythonOps.DeleteAttr(context, o, name);
         }
 
-        public static PythonType dict => DynamicHelpers.GetPythonTypeFromType(typeof(PythonDictionary));
+        public static PythonType dict => TypeCache.Dict;
 
         public static PythonList dir(CodeContext/*!*/ context) {
             PythonList res = new PythonList(context.Dict.Keys);
@@ -263,7 +263,7 @@ public static object divmod(CodeContext/*!*/ context, object? x, object? y) {
             return context.LanguageContext.DivMod(x, y);
         }
 
-        public static PythonType enumerate => DynamicHelpers.GetPythonTypeFromType(typeof(Enumerate));
+        public static PythonType enumerate => TypeCache.Enumerate;
 
         internal static PythonDictionary? GetAttrLocals(CodeContext/*!*/ context, object? locals) {
             PythonDictionary? attrLocals = null;
@@ -380,12 +380,12 @@ public static void exec(CodeContext/*!*/ context, [NotNone] IBufferProtocol code
 
         public static PythonType filter => DynamicHelpers.GetPythonTypeFromType(typeof(Filter));
 
-        public static PythonType @float => DynamicHelpers.GetPythonTypeFromType(typeof(double));
+        public static PythonType @float => TypeCache.Double;
 
         public static string format(CodeContext/*!*/ context, object? argValue, [NotNone] string formatSpec = "")
             => PythonOps.Format(context, argValue, formatSpec);
 
-        public static PythonType frozenset => DynamicHelpers.GetPythonTypeFromType(typeof(FrozenSetCollection));
+        public static PythonType frozenset => TypeCache.FrozenSet;
 
         public static object? getattr(CodeContext/*!*/ context, object? o, [NotNone] string name) {
             return PythonOps.GetBoundAttr(context, o, name);
@@ -633,7 +633,7 @@ public static object id(object? o) {
             return (BigInteger)res;
         }
 
-        public static PythonType @int => DynamicHelpers.GetPythonTypeFromType(typeof(BigInteger));
+        public static PythonType @int => TypeCache.BigInteger;
 
         public static bool isinstance(object? o, [NotNone] PythonType typeinfo) {
             return PythonOps.IsInstance(o, typeinfo);
@@ -742,9 +742,9 @@ public static object len(object? o) {
             return PythonOps.Length(o, out int res, out BigInteger bigRes) ? (object)res : bigRes;
         }
 
-        public static PythonType set => DynamicHelpers.GetPythonTypeFromType(typeof(SetCollection));
+        public static PythonType set => TypeCache.Set;
 
-        public static PythonType list => DynamicHelpers.GetPythonTypeFromType(typeof(PythonList));
+        public static PythonType list => TypeCache.PythonList;
 
         public static object locals(CodeContext/*!*/ context) {
             PythonDictionary dict = context.Dict;
@@ -1075,7 +1075,7 @@ public static object locals(CodeContext/*!*/ context) {
             }
         }
 
-        public static PythonType @object => DynamicHelpers.GetPythonTypeFromType(typeof(object));
+        public static PythonType @object => TypeCache.Object;
 
         public static string oct(object? number) {
             object index = PythonOps.Index(number);
@@ -1564,13 +1564,13 @@ public object? CurrentValue {
 
         #endregion
 
-        public static PythonType super => DynamicHelpers.GetPythonTypeFromType(typeof(Super));
+        public static PythonType super => TypeCache.Super;
 
-        public static PythonType str => DynamicHelpers.GetPythonTypeFromType(typeof(string));
+        public static PythonType str => TypeCache.String;
 
-        public static PythonType tuple => DynamicHelpers.GetPythonTypeFromType(typeof(PythonTuple));
+        public static PythonType tuple => TypeCache.PythonTuple;
 
-        public static PythonType type => DynamicHelpers.GetPythonTypeFromType(typeof(PythonType));
+        public static PythonType type => TypeCache.PythonType;
 
         [Documentation("vars([object]) -> dictionary\n\nWithout arguments, equivalent to locals().\nWith an argument, equivalent to object.__dict__.")]
         public static object vars(CodeContext/*!*/ context) {
@@ -1587,7 +1587,7 @@ public static object vars(CodeContext/*!*/ context) {
 
         public static PythonType zip => DynamicHelpers.GetPythonTypeFromType(typeof(Zip));
 
-        public static PythonType BaseException => DynamicHelpers.GetPythonTypeFromType(typeof(PythonExceptions.BaseException));
+        public static PythonType BaseException => TypeCache.BaseException;
 
         // OSError aliases
         public static PythonType EnvironmentError => PythonExceptions.OSError;

Src/IronPython/Runtime/Descriptors.cs

@@ -99,7 +99,7 @@ public object __get__(object instance, object owner = null) {
 
                 if (instance is int) {
                     // IronPython uses Int32 objects as "int" for performance reasons (GH #52)
-                    owner = DynamicHelpers.GetPythonTypeFromType(typeof(System.Numerics.BigInteger));
+                    owner = TypeCache.BigInteger;
                 } else {
                     owner = DynamicHelpers.GetPythonType(instance);
                 }

Src/IronPython/Runtime/Operations/ObjectOps.cs

@@ -136,7 +136,7 @@ public static object __new__(CodeContext/*!*/ context, PythonType cls, [ParamDic
         /// Runs the pickle protocol
         /// </summary>
         public static object? __reduce_ex__(CodeContext/*!*/ context, object self, object protocol) {
-            object objectReduce = PythonOps.GetBoundAttr(context, DynamicHelpers.GetPythonTypeFromType(typeof(object)), "__reduce__");
+            object objectReduce = PythonOps.GetBoundAttr(context, TypeCache.Object, "__reduce__");
             if (PythonOps.TryGetBoundAttr(context, DynamicHelpers.GetPythonType(self), "__reduce__", out object? myReduce)) {
                 if (!PythonOps.IsRetBool(myReduce, objectReduce)) {
                     // A derived class overrode __reduce__ but not __reduce_ex__, so call

Src/IronPython/Runtime/Operations/PythonOps.cs

@@ -1450,7 +1450,7 @@ public static object MakeClass(FunctionCode funcCode, Func<CodeContext, CodeCont
                 }
                 // this makes sure that object is a base
                 if (bases.Count == 0) {
-                    bases = PythonTuple.MakeTuple(DynamicHelpers.GetPythonTypeFromType(typeof(object)));
+                    bases = PythonTuple.MakeTuple(TypeCache.Object);
                 }
                 PythonDictionary vars = func(parentContext).Dict;
                 return PythonType.__new__(parentContext, TypeCache.PythonType, name, bases, vars, selfNames);
@@ -1479,7 +1479,7 @@ public static object MakeClass(FunctionCode funcCode, Func<CodeContext, CodeCont
 
             // Ensure the class derives from `object`
             if (obj is PythonType newType && newType.BaseTypes.Count == 0) {
-                newType.BaseTypes.Add(DynamicHelpers.GetPythonTypeFromType(typeof(object)));
+                newType.BaseTypes.Add(TypeCache.Object);
             }
 
             return obj;

Src/IronPython/Runtime/Types/EmptyType.cs

@@ -87,7 +87,7 @@ public sealed class NoneTypeOps {
 
         [StaticExtensionMethod]
         public static object? __new__(CodeContext/*!*/ context, [NotNone] PythonType cls) {
-            if (cls == DynamicHelpers.GetPythonTypeFromType(typeof(DynamicNull)))
+            if (cls == TypeCache.Null)
                 return null;
             throw PythonOps.TypeError("{0} is not a subtype of NoneType", cls.Name);
         }

Src/IronPython/Runtime/Types/ReflectedGetterSetter.cs

@@ -93,7 +93,7 @@ public virtual PythonType PropertyType {
                 if (Getter != null && Getter.Length > 0) {
                     return DynamicHelpers.GetPythonTypeFromType(Getter[0].ReturnType);
                 }
-                return DynamicHelpers.GetPythonTypeFromType(typeof(object));
+                return TypeCache.Object;
             }
         }