chunk CreateSubType to locate crash more precisely

lostmsu · lostmsu · commit 2450cce2f8fe · 2020-12-17T16:20:53.000-08:00
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -346,18 +346,34 @@ internal static IntPtr CreateSubType(IntPtr py_name, IntPtr py_base_type, IntPtr
                 return Exceptions.RaiseTypeError("invalid base class, expected CLR class type");
             }
 
+            Type subType;
             try
             {
-                Type subType = ClassDerivedObject.CreateDerivedType(name,
+                subType = ClassDerivedObject.CreateDerivedType(name,
                     baseClass.type,
                     py_dict,
                     (string)namespaceStr,
                     (string)assembly);
+            }
+            catch (Exception e)
+            {
+                return Exceptions.RaiseTypeError("Unable to generate derived type: " + e.Message);
+            }
 
+            IntPtr py_type;
+            try
+            {
                 // create the new ManagedType and python type
                 ClassBase subClass = ClassManager.GetClass(subType);
-                IntPtr py_type = GetTypeHandle(subClass, subType);
+                py_type = GetTypeHandle(subClass, subType);
+            }
+            catch (Exception e)
+            {
+                return Exceptions.RaiseTypeError("Unable to reflect new .NET type to Python: " + e.Message);
+            }
 
+            try
+            {
                 // by default the class dict will have all the C# methods in it, but as this is a
                 // derived class we want the python overrides in there instead if they exist.
                 IntPtr cls_dict = Marshal.ReadIntPtr(py_type, TypeOffset.tp_dict);
@@ -375,7 +391,7 @@ internal static IntPtr CreateSubType(IntPtr py_name, IntPtr py_base_type, IntPtr
             }
             catch (Exception e)
             {
-                return Exceptions.RaiseTypeError(e.Message);
+                return Exceptions.RaiseTypeError("Unable to update reflected type: " + e.Message);
             }
         }
 
