Remove MakeRethrowExceptionWorker

Author: slozier

Src/IronPython/Compiler/Ast/AstMethods.cs

@@ -38,7 +38,6 @@ internal static class AstMethods {
         public static readonly MethodInfo RemoveModule = GetMethod((Action<CodeContext, string, object>)PythonOps.RemoveModule);
         public static readonly MethodInfo ModuleStarted = GetMethod((Action<CodeContext, ModuleOptions>)PythonOps.ModuleStarted);
         public static readonly MethodInfo MakeRethrownException = GetMethod((Func<CodeContext, Exception>)PythonOps.MakeRethrownException);
-        public static readonly MethodInfo MakeRethrowExceptionWorker = GetMethod((Func<Exception, Exception>)PythonOps.MakeRethrowExceptionWorker);
         public static readonly MethodInfo MakeException = GetMethod((Func<CodeContext, object, Exception>)PythonOps.MakeException);
         public static readonly MethodInfo MakeExceptionWithCause = GetMethod((Func<CodeContext, object, object, Exception>)PythonOps.MakeExceptionWithCause);
         public static readonly MethodInfo MakeSlice = GetMethod((Func<object, object, object, Slice>)PythonOps.MakeSlice);

Src/IronPython/Compiler/Ast/WithStatement.cs

@@ -207,8 +207,8 @@ public override MSAst.Expression Reduce() {
                                         UpdateLineUpdated(true),
                                         Ast.Throw(
                                             Ast.Call(
-                                                AstMethods.MakeRethrowExceptionWorker,
-                                                exception
+                                                AstMethods.MakeRethrownException,
+                                                Parent.LocalContext
                                             )
                                         )
                                     )

Src/IronPython/Runtime/Operations/PythonOps.cs

@@ -2273,16 +2273,6 @@ public static Exception MakeRethrownException(CodeContext/*!*/ context) {
             PythonTuple t = GetExceptionInfo(context);
             Debug.Assert(t[1] == GetRawContextException());
             Exception e = MakeExceptionWorker(context, t[0], t[1], t[2], null, suppressContext: false, forRethrow: true);
-            return MakeRethrowExceptionWorker(e);
-        }
-
-        /// <summary>
-        /// helper function for re-raised exception.
-        /// This entry point is used by 'raise' inside 'with' statement
-        /// </summary>
-        /// <param name="e"></param>
-        /// <returns></returns>
-        public static Exception MakeRethrowExceptionWorker(Exception e) {
             e.RemoveTraceBack();
             ExceptionHelpers.UpdateForRethrow(e);
             return e;