diff --git a/src/core/IronPython/Modules/Builtin.cs b/src/core/IronPython/Modules/Builtin.cs index 3ca0efeae..89b8d68e3 100644 --- a/src/core/IronPython/Modules/Builtin.cs +++ b/src/core/IronPython/Modules/Builtin.cs @@ -316,8 +316,18 @@ public static object divmod(CodeContext/*!*/ context, object? x, object? y) { "The expression can be either be a string, bytes\n" + "or a code object returned by compile()")] [LightThrowing] - public static object eval(CodeContext/*!*/ context, [NotNone] FunctionCode code, PythonDictionary? globals = null, object? locals = null) - => code.Call(GetExecEvalScopeOptional(context, globals, locals, copyModule: false)); + public static object eval(CodeContext/*!*/ context, [NotNone] FunctionCode code, PythonDictionary? globals = null, object? locals = null) { + CodeContext evalContext = GetExecEvalScopeOptional(context, globals, locals, copyModule: false); + if (context.LanguageContext.PythonOptions.Frames) { + List stack = PythonOps.PushFrame(evalContext, code); + try { + return code.Call(evalContext); + } finally { + stack.RemoveAt(stack.Count - 1); + } + } + return code.Call(evalContext); + } [Documentation("")] // provided by first overload [LightThrowing] diff --git a/tests/suite/modules/system_related/test_sys.py b/tests/suite/modules/system_related/test_sys.py index 6b6e0b582..b22bbe87f 100644 --- a/tests/suite/modules/system_related/test_sys.py +++ b/tests/suite/modules/system_related/test_sys.py @@ -405,6 +405,33 @@ def test_settrace_exec_f_back(self): sys.settrace(None) self.assertIs(ns['back'], sys._getframe(0)) + def test_eval_frame(self): + # Code run by eval has a frame of its own, whose f_back is the frame that called eval + def depth(): + n, f = 0, sys._getframe(1) + while f: + n, f = n + 1, f.f_back + return n + + before = depth() + frame = eval("sys._getframe(0)", {'sys': sys}) + self.assertEqual(frame.f_code.co_filename, "") + self.assertEqual(frame.f_back.f_code.co_name, "test_eval_frame") + self.assertEqual(eval("depth()", {'depth': depth}), before + 1) + self.assertEqual(eval("eval('depth()', {'depth': depth})", {'depth': depth}), before + 2) + self.assertEqual(depth(), before) + + with self.assertRaises(ZeroDivisionError): + eval("1/0") + self.assertEqual(depth(), before) + + sys.settrace(lambda *args: None) + try: + self.assertEqual(eval("depth()", {'depth': depth}), before + 1) + finally: + sys.settrace(None) + self.assertEqual(depth(), before) + @skipUnlessIronPython() def test_settrace_Xtracing_module_frame(self): # With -X:Tracing, the main module has a single frame